diff options
Diffstat (limited to 'src/game/gamecore.h')
| -rw-r--r-- | src/game/gamecore.h | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/src/game/gamecore.h b/src/game/gamecore.h index 9e9ccf4d..611f5ed7 100644 --- a/src/game/gamecore.h +++ b/src/game/gamecore.h @@ -35,11 +35,11 @@ public: } static const char *m_apNames[]; - + #define MACRO_TUNING_PARAM(Name,ScriptName,Value) CTuneParam m_##Name; #include "tuning.h" #undef MACRO_TUNING_PARAM - + static int Num() { return sizeof(CTuningParams)/sizeof(int); } bool Set(int Index, float Value); bool Set(const char *pName, float Value); @@ -81,7 +81,7 @@ inline void StrToInts(int *pInts, int Num, const char *pStr) pInts++; Num--; } - + // null terminate pInts[-1] &= 0xffffff00; } @@ -98,7 +98,7 @@ inline void IntsToStr(const int *pInts, int Num, char *pStr) pInts++; Num--; } - + // null terminate pStr[-1] = 0; } @@ -150,7 +150,7 @@ enum HOOK_RETRACT_END=3, HOOK_FLYING, HOOK_GRABBED, - + COREEVENT_GROUND_JUMP=0x01, COREEVENT_AIR_JUMP=0x02, COREEVENT_HOOK_LAUNCH=0x04, @@ -167,7 +167,7 @@ public: { mem_zero(m_apCharacters, sizeof(m_apCharacters)); } - + CTuningParams m_Tuning; class CCharacterCore *m_apCharacters[MAX_CLIENTS]; }; @@ -179,26 +179,26 @@ class CCharacterCore public: vec2 m_Pos; vec2 m_Vel; - + vec2 m_HookPos; vec2 m_HookDir; int m_HookTick; int m_HookState; int m_HookedPlayer; - + int m_Jumped; - + int m_Direction; int m_Angle; CNetObj_PlayerInput m_Input; - + int m_TriggeredEvents; - + void Init(CWorldCore *pWorld, CCollision *pCollision); void Reset(); void Tick(bool UseInput); void Move(); - + void Read(const CNetObj_CharacterCore *pObjCore); void Write(CNetObj_CharacterCore *pObjCore); void Quantize(); |