|
34 | 34 | #ifndef EBOT_INCLUDED
|
35 | 35 | #define EBOT_INCLUDED
|
36 | 36 |
|
37 |
| -#ifdef _WIN32 |
38 |
| -#define cpuid(info, x) __cpuidex(info, x, 0) |
39 |
| -#else |
40 |
| -#include <cpuid.h> |
41 |
| -void cpuid(int info[4], int InfoType) { |
42 |
| - __cpuid_count(InfoType, 0, info[0], info[1], info[2], info[3]); |
43 |
| -} |
44 |
| -#endif |
45 |
| - |
46 | 37 | #include <stdio.h>
|
47 | 38 | #include <memory.h>
|
48 | 39 | #include <xmmintrin.h>
|
@@ -763,7 +754,6 @@ class Bot
|
763 | 754 |
|
764 | 755 | PathNode* m_navNode; // pointer to current node from path
|
765 | 756 | PathNode* m_navNodeStart; // pointer to start of path finding nodes
|
766 |
| - uint8_t m_pathType; // which pathfinder to use |
767 | 757 | uint8_t m_visibility; // visibility flags
|
768 | 758 |
|
769 | 759 | int m_currentWaypointIndex; // current waypoint index
|
@@ -850,14 +840,6 @@ class Bot
|
850 | 840 |
|
851 | 841 | Vector m_moveAngles; // bot move angles
|
852 | 842 | bool m_moveToGoal; // bot currently moving to goal??
|
853 |
| - |
854 |
| - Vector m_idealAngles; // angle wanted |
855 |
| - Vector m_randomizedIdealAngles; // angle wanted with noise |
856 |
| - Vector m_angularDeviation; // angular deviation from current to ideal angles |
857 |
| - Vector m_aimSpeed; // aim speed calculated |
858 |
| - Vector m_targetOriginAngularSpeed; // target/enemy angular speed |
859 |
| - |
860 |
| - float m_randomizeAnglesTime; // time last randomized location |
861 | 843 | float m_playerTargetTime; // time last targeting
|
862 | 844 |
|
863 | 845 | float m_checkCampPointTime; // zombie stuff
|
@@ -926,7 +908,6 @@ class Bot
|
926 | 908 |
|
927 | 909 | void GetCampDirection(Vector* dest);
|
928 | 910 | int GetMessageQueue(void);
|
929 |
| - int FindGoalPost(int tactic, Array <int> defensive, Array <int> offsensive); |
930 | 911 | void FilterGoals(const Array <int>& goals, int* result);
|
931 | 912 | bool GoalIsValid(void);
|
932 | 913 | bool HeadTowardWaypoint(void);
|
@@ -1013,7 +994,7 @@ class Bot
|
1013 | 994 | int GetCampAimingWaypoint(void);
|
1014 | 995 | int GetAimingWaypoint(Vector targetOriginPos);
|
1015 | 996 | void FindShortestPath(int srcIndex, int destIndex);
|
1016 |
| - void FindPath(int srcIndex, int destIndex, uint8_t pathType = 0); |
| 997 | + void FindPath(int srcIndex, int destIndex); |
1017 | 998 | void SecondThink(void);
|
1018 | 999 |
|
1019 | 1000 | public:
|
@@ -1132,8 +1113,6 @@ class Bot
|
1132 | 1113 | int m_checkEnemyNum;
|
1133 | 1114 | float m_lookYawVel;
|
1134 | 1115 | float m_lookPitchVel;
|
1135 |
| - float m_aimstoptime; |
1136 |
| - float m_aimstopdelay; |
1137 | 1116 |
|
1138 | 1117 | int m_numFriendsLeft;
|
1139 | 1118 | int m_numEnemiesLeft;
|
@@ -1487,15 +1466,14 @@ extern void SubtractVectors(Vector first, Vector second, Vector output);
|
1487 | 1466 | extern float GetVectorDotProduct(Vector first, Vector second);
|
1488 | 1467 | extern float Sine(float X);
|
1489 | 1468 | extern float AngleDiff(float destAngle, float srcAngle);
|
1490 |
| -extern float Clamp(float a, float b, float c); |
1491 | 1469 |
|
1492 | 1470 | extern void SetGameMod(int gamemode);
|
1493 | 1471 | extern bool IsZombieMode(void);
|
1494 | 1472 | extern bool IsDeathmatchMode(void);
|
1495 | 1473 | extern bool IsValidWaypoint(int index);
|
1496 | 1474 | extern bool ChanceOf(int number);
|
1497 | 1475 | extern float Q_rsqrt(float number);
|
1498 |
| -extern float sse_rsqrt(float number); |
| 1476 | +extern float Clamp(float a, float b, float c); |
1499 | 1477 |
|
1500 | 1478 | extern int GetEntityWaypoint(edict_t* ent);
|
1501 | 1479 | extern int SetEntityWaypoint(edict_t* ent, int mode = -1);
|
@@ -1537,7 +1515,6 @@ extern void FakeClientCommand(edict_t* fakeClient, const char* format, ...);
|
1537 | 1515 | extern void strtrim(char* string);
|
1538 | 1516 | extern void CreatePath(char* path);
|
1539 | 1517 | extern void ServerCommand(const char* format, ...);
|
1540 |
| -extern void RegisterBotVariable(int variableID, const char* initialValue, int flags = FCVAR_EXTDLL | FCVAR_SERVER); |
1541 | 1518 | extern void RegisterCommand(char* command, void funcPtr(void));
|
1542 | 1519 | extern void CheckWelcomeMessage(void);
|
1543 | 1520 | extern void DetectCSVersion(void);
|
|
0 commit comments