--- deliantra/server/socket/loop.C 2007/07/30 02:03:03 1.66
+++ deliantra/server/socket/loop.C 2008/03/13 12:20:52 1.72
@@ -1,11 +1,11 @@
/*
- * This file is part of Crossfire TRT, the Roguelike Realtime MORPG.
+ * This file is part of Deliantra, the Roguelike Realtime MMORPG.
*
- * Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Crossfire TRT team
+ * Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
* Copyright (©) 2002-2003,2007 Mark Wedel & The Crossfire Development Team
* Copyright (©) 1992,2007 Frank Tore Johansen
*
- * Crossfire TRT is free software: you can redistribute it and/or modify
+ * Deliantra is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
@@ -18,7 +18,7 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see .
*
- * The authors can be reached via e-mail to
+ * The authors can be reached via e-mail to
*/
/**
@@ -52,7 +52,7 @@
#define MAX_QUEUE_BACKLOG 3.
// disconnect a socket after this many seconds without an ack
-#define SOCKET_TIMEOUT 8.
+#define SOCKET_TIMEOUT 16.
void
client::reset_state ()
@@ -77,7 +77,7 @@
}
else
{
- cmd_queue.push_back (command ());
+ cmd_queue.resize (cmd_queue.size () + 1);
command &cmd = cmd_queue.back ();
cmd.stamp = stamp;
cmd.handler = handler;
@@ -103,6 +103,7 @@
else
execute (cmd.handler, cmd.data, cmd.datalen);
+ sfree (cmd.data, cmd.datalen + 1);
cmd_queue.pop_front ();
return true;
}
@@ -134,6 +135,8 @@
if (update_look)
esrv_draw_look (pl);
+ mapinfo_queue_run ();
+
#if HAVE_TCP_INFO
// check time of last ack, and, if too old, kill connection
socklen_t len = sizeof (tcpi);
@@ -155,6 +158,7 @@
tcpi.tcpi_snd_cwnd - (tcpi.tcpi_unacked - tcpi.tcpi_sacked));
#endif
+ // fast-time-out a player by checking for missign acks
// do this only when player is active
if (pl && pl->active
&& tcpi.tcpi_last_ack_recv > int (SOCKET_TIMEOUT * 1000))
@@ -191,7 +195,7 @@
if (!faces_sent [scrub_idx])
if (faceinfo *f = face_info (scrub_idx))
- if (f->type == FT_FACE) // only scrub faces for now
+ if (f->type == FT_FACE || f->type == FT_SOUND) // only scrub faces and sounds for now
{
send_face (scrub_idx, -120);
flush_fx ();