work

1 files changed, 7 insertions, 26 deletions

diff --git a/src/players.c b/src/players.c
index 8009b79..f3c7c6e 100644
--- a/src/players.c
+++ b/src/players.c
@@ -120,7 +120,7 @@ object check_if_player_collided_with_object(platform_window* window, player p) {
 	map_info info = get_map_info(window);
 	float player_size = get_player_size(window);
 
-	for (int i = 0; i < max_objects; i++) {
+	for (int i = 0; i < MAX_OBJECTS; i++) {
 		object o = objects[i];
 		if (!o.active) continue;
 
@@ -182,36 +182,20 @@ void take_player_input(platform_window* window) {
 #endif
 
 	if (keyboard_is_key_down(KEY_W)) {
-		//if (!global_state.server) 
-		{
-			network_message message = create_protocol_user_moved(MOVE_UP, player_id);
+		network_message message = create_protocol_user_moved(MOVE_UP, player_id);
 			add_message_to_outgoing_queuex(message, *global_state.client);
-		}
-		//move_user(window, player_id, MOVE_UP, update_delta);
 	}
 	if (keyboard_is_key_down(KEY_S)) {
-		//if (!global_state.server) 
-		{
-			network_message message = create_protocol_user_moved(MOVE_DOWN, player_id);
+		network_message message = create_protocol_user_moved(MOVE_DOWN, player_id);
 			add_message_to_outgoing_queuex(message, *global_state.client);
-		}
-		//move_user(window, player_id, MOVE_DOWN, update_delta);
 	}
 	if (keyboard_is_key_down(KEY_A)) {
-		//if (!global_state.server) 
-		{
-			network_message message = create_protocol_user_moved(MOVE_LEFT, player_id);
-			add_message_to_outgoing_queuex(message, *global_state.client);
-		}
-		//move_user(window, player_id, MOVE_LEFT, update_delta);
+		network_message message = create_protocol_user_moved(MOVE_LEFT, player_id);
+		add_message_to_outgoing_queuex(message, *global_state.client);
 	}
 	if (keyboard_is_key_down(KEY_D)) {
-		//if (!global_state.server) 
-		{
-			network_message message = create_protocol_user_moved(MOVE_RIGHT, player_id);
-			add_message_to_outgoing_queuex(message, *global_state.client);
-		}
-		//move_user(window, player_id, MOVE_RIGHT, update_delta);
+		network_message message = create_protocol_user_moved(MOVE_RIGHT, player_id);
+		add_message_to_outgoing_queuex(message, *global_state.client);
 	}
 
 	// Send gun position
@@ -225,9 +209,6 @@ void take_player_input(platform_window* window) {
 		float gun_offset_x = (get_player_size_in_tile()/2) + dirx;
 		float gun_offset_y = (get_player_size_in_tile()/2) + diry;
 
-		//p->gunx = p->playerx + gun_offset_x;
-		//p->guny = p->playery + gun_offset_y;
-		
 		add_message_to_outgoing_queuex(create_protocol_user_look(player_id, gun_offset_x, gun_offset_y), *global_state.client);
 	}