From 6c362f91ebdd4e32e75f747c9f6fbe71eb84fd56 Mon Sep 17 00:00:00 2001 From: Magnus Auvinen Date: Tue, 29 Jan 2008 21:55:13 +0000 Subject: more cleanups --- src/game/g_protocol.h | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) (limited to 'src/game/g_protocol.h') diff --git a/src/game/g_protocol.h b/src/game/g_protocol.h index 32ddb971..e63da143 100644 --- a/src/game/g_protocol.h +++ b/src/game/g_protocol.h @@ -81,10 +81,10 @@ enum enum { - STATE_UNKNOWN=0, - STATE_PLAYING, - STATE_IN_MENU, - STATE_CHATTING, + PLAYERSTATE_UNKNOWN=0, + PLAYERSTATE_PLAYING, + PLAYERSTATE_IN_MENU, + PLAYERSTATE_CHATTING, GAMETYPE_DM=0, GAMETYPE_TDM, @@ -103,7 +103,8 @@ struct player_input int fire; int hook; int blink; - int state; + + int player_state; int wanted_weapon; int next_weapon; @@ -193,7 +194,7 @@ struct obj_player_core // info about the player that is only needed when it's on screen struct obj_player_character : public obj_player_core { - int state; + int player_state; int health; int armor; -- cgit 1.4.1