diff options
| author | Magnus Auvinen <magnus.auvinen@gmail.com> | 2008-07-06 11:21:21 +0000 |
|---|---|---|
| committer | Magnus Auvinen <magnus.auvinen@gmail.com> | 2008-07-06 11:21:21 +0000 |
| commit | 9d632dd826c8a312095de0f56df66b2580d336cb (patch) | |
| tree | 3fdde543c94323d6c698d278a58bf18e3c385776 /src/game/client/gc_client.hpp | |
| parent | 3705064b109580103a3d13f44693503da9927281 (diff) | |
| download | zcatch-9d632dd826c8a312095de0f56df66b2580d336cb.tar.gz zcatch-9d632dd826c8a312095de0f56df66b2580d336cb.zip | |
major update. server clean up and much added documentation
Diffstat (limited to 'src/game/client/gc_client.hpp')
| -rw-r--r-- | src/game/client/gc_client.hpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/game/client/gc_client.hpp b/src/game/client/gc_client.hpp index 750154b3..f19766bf 100644 --- a/src/game/client/gc_client.hpp +++ b/src/game/client/gc_client.hpp @@ -1,5 +1,5 @@ #include <game/g_vmath.hpp> -#include <game/g_protocol.hpp> +#include <game/generated/g_protocol.hpp> #include <game/g_game.hpp> #include <game/client/gc_render.hpp> @@ -22,8 +22,8 @@ extern vec2 local_target_pos; // snap pointers struct SNAPSTATE { - const NETOBJ_PLAYER_CHARACTER *local_character; - const NETOBJ_PLAYER_CHARACTER *local_prev_character; + const NETOBJ_CHARACTER *local_character; + const NETOBJ_CHARACTER *local_prev_character; const NETOBJ_PLAYER_INFO *local_info; const NETOBJ_FLAG *flags[2]; const NETOBJ_GAME *gameobj; @@ -46,8 +46,8 @@ extern const NETOBJ_GAME *gameobj; extern TUNING_PARAMS tuning; // predicted players -extern PLAYER_CORE predicted_prev_player; -extern PLAYER_CORE predicted_player; +extern CHARACTER_CORE predicted_prev_char; +extern CHARACTER_CORE predicted_char; // input extern NETOBJ_PLAYER_INPUT input_data; @@ -148,7 +148,7 @@ struct CLIENT_DATA int team; int emoticon; int emoticon_start; - PLAYER_CORE predicted; + CHARACTER_CORE predicted; TEE_RENDER_INFO skin_info; // this is what the server reports TEE_RENDER_INFO render_info; // this is what we use |