more cleanups

3 files changed, 7 insertions, 21 deletions

diff --git a/src/game/client/gc_client.cpp b/src/game/client/gc_client.cpp
index 4cc8ba29..27021c1f 100644
--- a/src/game/client/gc_client.cpp
+++ b/src/game/client/gc_client.cpp
@@ -5,8 +5,8 @@
 #include <string.h>
 
 extern "C" {
-	#include <engine/e_config.h>
-	#include <engine/client/ec_font.h>
+	#include <engine/e_config.h> // TODO: this shouldn't be here
+	#include <engine/client/ec_font.h> // TODO: this shouldn't be here
 	#include <engine/e_client_interface.h>
 };
 
@@ -24,8 +24,6 @@ extern "C" {
 #include "gc_anim.h"
 #include "gc_console.h"
 
-#include <GL/gl.h>
-
 struct data_container *data = 0;
 static int64 debug_firedelay = 0;
 
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())
diff --git a/src/game/client/gc_render_obj.cpp b/src/game/client/gc_render_obj.cpp
index 3ee1704d..00f54c89 100644
--- a/src/game/client/gc_render_obj.cpp
+++ b/src/game/client/gc_render_obj.cpp
@@ -434,7 +434,7 @@ void render_player(
 	// render the tee
 	render_tee(&state, &render_info, player.emote, direction, position);
 
-	if(player.state == STATE_CHATTING)
+	if(player.player_state == PLAYERSTATE_CHATTING)
 	{
 		gfx_texture_set(data->images[IMAGE_EMOTICONS].id);
 		gfx_quads_begin();