--- deliantra/server/socket/init.C 2007/07/24 04:55:35 1.50
+++ deliantra/server/socket/init.C 2007/11/08 19:43:29 1.53
@@ -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 (©) 2001,2007 Mark Wedel
* 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
*/
/**
@@ -62,8 +62,7 @@
*/
client::client (int fd, const char *peername)
: fd (fd), host (strdup (peername)),
- socket_ev (this, &client::socket_cb),
- cmd_ev (this, &client::cmd_cb)
+ socket_ev (this, &client::socket_cb)
{
refcnt_inc (); // the socket is an external reference
@@ -167,12 +166,10 @@
faces_sent[0] = true;
fx_want [FT_FACE] = true; // all clients must support image faces
- socket_ev.prio (PE_PRIO_NORMAL);
+ socket_ev.prio (PE_PRIO_HIGH);
socket_ev.fd (fd);
socket_ev.poll (PE_R);
- cmd_ev.prio (PE_PRIO_NORMAL);
-
// initialisation done, kick it!
send_packet_printf ("version %d %d %s\n", VERSION_CS, VERSION_SC, VERSION_INFO);
flush ();
@@ -186,6 +183,7 @@
{
clients.erase (this);
+ mapinfo_queue_clear ();
free (stats.range);
free (stats.title);
free (host);
@@ -210,7 +208,6 @@
state = ST_DEAD;
socket_ev.suspend ();
- cmd_ev.suspend ();
refcnt_dec (); // socket no longer open
}