loads of changes here and there. added flushing of packets when connection is started

5 files changed, 22 insertions, 18 deletions

diff --git a/src/game/client/gc_client.cpp b/src/game/client/gc_client.cpp
index bcacfd17..005e9026 100644
--- a/src/game/client/gc_client.cpp
+++ b/src/game/client/gc_client.cpp
@@ -442,7 +442,7 @@ void send_info(bool start)
 		msg.use_custom_color = config.player_use_custom_color;
 		msg.color_body = config.player_color_body;
 		msg.color_feet = config.player_color_feet;
-		msg.pack(MSGFLAG_VITAL);
+		msg.pack(MSGFLAG_VITAL|MSGFLAG_FLUSH);
 	}
 	else
 	{
diff --git a/src/game/client/gc_client.h b/src/game/client/gc_client.h
index bb684830..2ab558f3 100644
--- a/src/game/client/gc_client.h
+++ b/src/game/client/gc_client.h
@@ -50,9 +50,7 @@ extern player_core predicted_prev_player;
 extern player_core predicted_player;
 
 // input
-extern int picked_up_weapon;
 extern NETOBJ_PLAYER_INPUT input_data;
-extern int input_target_lock;
 
 // debug
 extern int64 debug_firedelay;
@@ -153,6 +151,8 @@ struct client_data
 	tee_render_info skin_info; // this is what the server reports
 	tee_render_info render_info; // this is what we use
 	
+	float angle;
+	
 	void update_render_info();
 };
 
diff --git a/src/game/client/gc_hooks.cpp b/src/game/client/gc_hooks.cpp
index 72c94abc..81090ca4 100644
--- a/src/game/client/gc_hooks.cpp
+++ b/src/game/client/gc_hooks.cpp
@@ -386,18 +386,11 @@ extern "C" int modc_snap_input(int *data)
 		return sizeof(input_data);
 	}
 	
-	picked_up_weapon = -1;
-
-	if(!input_target_lock)
-	{
-		input_data.target_x = (int)mouse_pos.x;
-		input_data.target_y = (int)mouse_pos.y;
-		
-		if(!input_data.target_x && !input_data.target_y)
-			input_data.target_y = 1;
-	}
-
-	input_target_lock = 0;
+	input_data.target_x = (int)mouse_pos.x;
+	input_data.target_y = (int)mouse_pos.y;
+	if(!input_data.target_x && !input_data.target_y)
+		input_data.target_y = 1;
+	
 
 	// stress testing
 	if(config.dbg_stress)
@@ -518,6 +511,7 @@ extern "C" void modc_message(int msgtype)
 			
 		// apply new tuning
 		tuning = new_tuning;
+		return;
 	}
 	
 	// normal 
@@ -663,6 +657,7 @@ extern "C" void modc_connected()
 		client_datas[i].name[0] = 0;
 		client_datas[i].skin_id = 0;
 		client_datas[i].team = 0;
+		client_datas[i].angle = 0;
 		client_datas[i].emoticon = 0;
 		client_datas[i].emoticon_start = -1;
 		client_datas[i].skin_info.texture = skin_get(0)->color_texture;
diff --git a/src/game/client/gc_render_obj.cpp b/src/game/client/gc_render_obj.cpp
index 0bfb902c..580ca259 100644
--- a/src/game/client/gc_render_obj.cpp
+++ b/src/game/client/gc_render_obj.cpp
@@ -312,6 +312,17 @@ void render_player(
 	if(player.health < 0) // dont render dead players
 		return;
 
+	//float angle = mix((float)prev.angle, (float)player.angle, intratick)/256.0f;
+	
+	// TODO: fix this good!
+	float mixspeed = 0.05f;
+	if(player.attacktick != prev.attacktick)
+		mixspeed = 0.1f;
+	
+	float angle = mix(client_datas[info.cid].angle, player.angle/256.0f, mixspeed);
+	client_datas[info.cid].angle = angle;
+	vec2 direction = get_direction((int)(angle*256.0f));
+	
 	if(info.local && config.cl_predict)
 	{
 		if(!netobjects.local_character || (netobjects.local_character->health < 0) || (netobjects.gameobj && netobjects.gameobj->game_over))
@@ -326,8 +337,6 @@ void render_player(
 		}
 	}
 
-	vec2 direction = get_direction(player.angle);
-	float angle = player.angle/256.0f;
 	vec2 position = mix(vec2(prev.x, prev.y), vec2(player.x, player.y), intratick);
 	vec2 vel = mix(vec2(prev.vx/256.0f, prev.vy/256.0f), vec2(player.vx/256.0f, player.vy/256.0f), intratick);
 	
diff --git a/src/game/server/gs_server.cpp b/src/game/server/gs_server.cpp
index e46001ee..78ad3f9f 100644
--- a/src/game/server/gs_server.cpp
+++ b/src/game/server/gs_server.cpp
@@ -2189,7 +2189,7 @@ void mods_message(int msgtype, int client_id)
 			
 			//
 			NETMSG_SV_READY_TO_ENTER m;
-			m.pack(MSGFLAG_VITAL);
+			m.pack(MSGFLAG_VITAL|MSGFLAG_FLUSH);
 			server_send_msg(client_id);			
 		}