diff options
| author | Magnus Auvinen <magnus.auvinen@gmail.com> | 2008-08-30 22:38:56 +0000 |
|---|---|---|
| committer | Magnus Auvinen <magnus.auvinen@gmail.com> | 2008-08-30 22:38:56 +0000 |
| commit | cd7a3519a7a4e9914906d96b603cefdbf3a58a0e (patch) | |
| tree | 75d5121c24bc6f449e399a227fcf7553f73e811f /src/game/client/components/controls.cpp | |
| parent | 432602c4ca5d47aee91d25271fa57ad0f6d67250 (diff) | |
| download | zcatch-cd7a3519a7a4e9914906d96b603cefdbf3a58a0e.tar.gz zcatch-cd7a3519a7a4e9914906d96b603cefdbf3a58a0e.zip | |
added the loading screen again
Diffstat (limited to 'src/game/client/components/controls.cpp')
| -rw-r--r-- | src/game/client/components/controls.cpp | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/src/game/client/components/controls.cpp b/src/game/client/components/controls.cpp index 15bb1388..0cf8b861 100644 --- a/src/game/client/components/controls.cpp +++ b/src/game/client/components/controls.cpp @@ -3,6 +3,8 @@ #include <game/collision.hpp> #include <game/client/gameclient.hpp> #include <game/client/component.hpp> +#include <game/client/components/chat.hpp> +#include <game/client/components/menus.hpp> #include "controls.hpp" @@ -69,17 +71,16 @@ int CONTROLS::snapinput(int *data) static int64 last_send_time = 0; // update player state - /*if(chat_mode != CHATMODE_NONE) // TODO: repair me + if(gameclient.chat->is_active()) input_data.player_state = PLAYERSTATE_CHATTING; - else if(menu_active) + else if(gameclient.menus->is_active()) input_data.player_state = PLAYERSTATE_IN_MENU; else - input_data.player_state = PLAYERSTATE_PLAYING;*/ + input_data.player_state = PLAYERSTATE_PLAYING; last_data.player_state = input_data.player_state; // we freeze the input if chat or menu is activated - /* repair me - if(menu_active || chat_mode != CHATMODE_NONE || console_active()) + if(input_data.player_state != PLAYERSTATE_PLAYING) { last_data.direction = 0; last_data.hook = 0; @@ -89,7 +90,7 @@ int CONTROLS::snapinput(int *data) mem_copy(data, &input_data, sizeof(input_data)); return sizeof(input_data); - }*/ + } input_data.target_x = (int)mouse_pos.x; input_data.target_y = (int)mouse_pos.y; |