about summary refs log tree commit diff
path: root/src/engine/server
diff options
context:
space:
mode:
authorMagnus Auvinen <magnus.auvinen@gmail.com>2007-12-12 19:52:57 +0000
committerMagnus Auvinen <magnus.auvinen@gmail.com>2007-12-12 19:52:57 +0000
commitf7ea0b2ba8851e4c0ceaef0a8b2361adfc218443 (patch)
tree123f26bfb4ad7c053dd0ed660eea0c793762c837 /src/engine/server
parent182c77721e60c6a3b68cc3f1f83e485374d85096 (diff)
downloadzcatch-f7ea0b2ba8851e4c0ceaef0a8b2361adfc218443.tar.gz
zcatch-f7ea0b2ba8851e4c0ceaef0a8b2361adfc218443.zip
loads of minor stuff
Diffstat (limited to 'src/engine/server')
-rw-r--r--src/engine/server/server.c8
1 files changed, 5 insertions, 3 deletions
diff --git a/src/engine/server/server.c b/src/engine/server/server.c
index 33bea042..b723e1b9 100644
--- a/src/engine/server/server.c
+++ b/src/engine/server/server.c
@@ -45,7 +45,7 @@ typedef struct
 {
 	short next;
 	short state; /* 0 = free, 1 = alloced, 2 = timed */
-	int timeout_tick;
+	int timeout;
 } SNAP_ID;
 
 static const int MAX_IDS = 16*1024; /* should be lowered */
@@ -133,10 +133,12 @@ static void snap_remove_first_timeout()
 int snap_new_id()
 {
 	int id;
+	int64 now = time_get();
 	dbg_assert(snap_id_inited == 1, "requesting id too soon");
 	
+	
 	/* process timed ids */
-	while(snap_first_timed_id != -1 && snap_ids[snap_first_timed_id].timeout_tick < server_tick())
+	while(snap_first_timed_id != -1 && snap_ids[snap_first_timed_id].timeout < now)
 		snap_remove_first_timeout();
 	
 	id = snap_first_free_id;
@@ -161,7 +163,7 @@ void snap_free_id(int id)
 
 	snap_id_inusage--;
 	snap_ids[id].state = 2;
-	snap_ids[id].timeout_tick = server_tick() + server_tickspeed()*5;
+	snap_ids[id].timeout = time_get()+time_freq()*5;
 	snap_ids[id].next = -1;
 	
 	if(snap_last_timed_id != -1)