diff options
| author | Magnus Auvinen <magnus.auvinen@gmail.com> | 2008-06-12 10:51:48 +0000 |
|---|---|---|
| committer | Magnus Auvinen <magnus.auvinen@gmail.com> | 2008-06-12 10:51:48 +0000 |
| commit | f6c67c29cd10d41b877ee1319801edc01b625e72 (patch) | |
| tree | 6ca26c44ac0218a57d078a6f72034f2924b44104 /src/game/g_game.h | |
| parent | 0d3b988c1aed8f6b91879a801253db81a251a532 (diff) | |
| download | zcatch-f6c67c29cd10d41b877ee1319801edc01b625e72.tar.gz zcatch-f6c67c29cd10d41b877ee1319801edc01b625e72.zip | |
large commit with loads of clean up. more is comming
Diffstat (limited to 'src/game/g_game.h')
| -rw-r--r-- | src/game/g_game.h | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/src/game/g_game.h b/src/game/g_game.h index 9803d6a2..414dfdbf 100644 --- a/src/game/g_game.h +++ b/src/game/g_game.h @@ -9,9 +9,9 @@ #include "g_collision.h" #include "g_protocol.h" -struct tuning_params +struct TUNING_PARAMS { - tuning_params() + TUNING_PARAMS() { const float ticks_per_second = 50.0f; #define MACRO_TUNING_PARAM(name,value) name.set((int)(value*100.0f)); @@ -25,7 +25,7 @@ struct tuning_params #include "g_tuning.h" #undef MACRO_TUNING_PARAM - static int num() { return sizeof(tuning_params)/sizeof(int); } + static int num() { return sizeof(TUNING_PARAMS)/sizeof(int); } bool set(int index, float value); bool set(const char *name, float value); bool get(int index, float *value); @@ -109,22 +109,22 @@ enum COREEVENT_HOOK_RETRACT=0x20, }; -class world_core +class WORLD_CORE { public: - world_core() + WORLD_CORE() { mem_zero(players, sizeof(players)); } - tuning_params tuning; - class player_core *players[MAX_CLIENTS]; + TUNING_PARAMS tuning; + class PLAYER_CORE *players[MAX_CLIENTS]; }; -class player_core +class PLAYER_CORE { public: - world_core *world; + WORLD_CORE *world; vec2 pos; vec2 vel; |