about summary refs log tree commit diff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/engine/server/es_server.c7
-rw-r--r--src/game/server/gs_server.cpp15
2 files changed, 20 insertions, 2 deletions
diff --git a/src/engine/server/es_server.c b/src/engine/server/es_server.c
index 00100b10..de58f970 100644
--- a/src/engine/server/es_server.c
+++ b/src/engine/server/es_server.c
@@ -820,8 +820,13 @@ static int server_run()
 				/* progress game */
 				{
 					int64 start = time_get();
+					int64 delta;
 					mods_tick();
-					simulationtime += time_get()-start;
+					delta = time_get()-start;
+					simulationtime += delta;
+					
+					if(config.debug && delta > time_freq()/10)
+						dbg_msg("server", "hitch warning! %.2f ms", delta/(float)time_freq());
 				}
 	
 				/* snap game */
diff --git a/src/game/server/gs_server.cpp b/src/game/server/gs_server.cpp
index dc05208f..26a3959d 100644
--- a/src/game/server/gs_server.cpp
+++ b/src/game/server/gs_server.cpp
@@ -251,10 +251,24 @@ void game_world::tick()
 	{
 		// update all objects
 		for(entity *ent = first_entity; ent; ent = ent->next_entity)
+		{
+			int64 start = time_get();
 			ent->tick();
+			int64 delta = time_get()-start;
+			
+			if(config.debug && delta > time_freq()/10)
+				dbg_msg("world", "entity tick hitch warning! %.2f ms objtype=%d", delta/(float)time_freq(), ent->objtype);
+		}
 
 		for(entity *ent = first_entity; ent; ent = ent->next_entity)
+		{
+			int64 start = time_get();
 			ent->tick_defered();
+			int64 delta = time_get()-start;
+			
+			if(config.debug && delta > time_freq()/10)
+				dbg_msg("world", "entity defered tick hitch warning! %.2f ms objtype=%d", delta/(float)time_freq(), ent->objtype);
+		}
 	}
 
 	remove_entities();
@@ -1095,7 +1109,6 @@ void player::tick_defered()
 				*((unsigned *)&start_pos.x), *((unsigned *)&start_pos.y),
 				*((unsigned *)&start_vel.x), *((unsigned *)&start_vel.y));
 		}
-		
 
 		int events = core.triggered_events;
 		int mask = cmask_all_except_one(client_id);