diff options
| author | Magnus Auvinen <magnus.auvinen@gmail.com> | 2008-01-29 21:55:13 +0000 |
|---|---|---|
| committer | Magnus Auvinen <magnus.auvinen@gmail.com> | 2008-01-29 21:55:13 +0000 |
| commit | 6c362f91ebdd4e32e75f747c9f6fbe71eb84fd56 (patch) | |
| tree | cdd3fd9db9f40444a9fd965af8e066f530721c8a /src/game/client/gc_hooks.cpp | |
| parent | 5d1cb86943ce9425ba5f42b1caf1fcbda65981df (diff) | |
| download | zcatch-6c362f91ebdd4e32e75f747c9f6fbe71eb84fd56.tar.gz zcatch-6c362f91ebdd4e32e75f747c9f6fbe71eb84fd56.zip | |
more cleanups
Diffstat (limited to 'src/game/client/gc_hooks.cpp')
| -rw-r--r-- | src/game/client/gc_hooks.cpp | 20 |
1 files changed, 4 insertions, 16 deletions
diff --git a/src/game/client/gc_hooks.cpp b/src/game/client/gc_hooks.cpp index c16923b8..a31b7201 100644 --- a/src/game/client/gc_hooks.cpp +++ b/src/game/client/gc_hooks.cpp @@ -298,28 +298,16 @@ extern "C" void modc_render() render_game(); if (console_active()) console_render(); - - // handle team switching - // TODO: FUGLY!!! - /* - if(config.cl_team != -10) - { - - }*/ } - else // if (client_state() != CLIENTSTATE_CONNECTING && client_state() != CLIENTSTATE_LOADING) + else { menu_render(); if (console_active()) console_render(); return; } - - // - //config.cl_team = -10; } - extern "C" int modc_snap_input(int *data) { picked_up_weapon = -1; @@ -335,12 +323,12 @@ extern "C" int modc_snap_input(int *data) input_target_lock = 0; if(chat_mode != CHATMODE_NONE) - input_data.state = STATE_CHATTING; + input_data.player_state = PLAYERSTATE_CHATTING; else if(menu_active) - input_data.state = STATE_IN_MENU; + input_data.player_state = PLAYERSTATE_IN_MENU; else { - input_data.state = STATE_PLAYING; + input_data.player_state = PLAYERSTATE_PLAYING; // TODO: this doesn't feel too pretty... look into it? if (console_active()) |