ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/server/socket/loop.C
(Generate patch)

Comparing deliantra/server/socket/loop.C (file contents):
Revision 1.31 by root, Thu Dec 21 23:37:06 2006 UTC vs.
Revision 1.40 by pippijn, Thu Mar 1 12:28:17 2007 UTC

1/* 1/*
2 CrossFire, A Multiplayer game for X-windows 2 * CrossFire, A Multiplayer game for X-windows
3 3 *
4 * Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team
4 Copyright (C) 2002-2003 Mark Wedel & The Crossfire Development Team 5 * Copyright (C) 2002-2003 Mark Wedel & The Crossfire Development Team
5 Copyright (C) 1992 Frank Tore Johansen 6 * Copyright (C) 1992 Frank Tore Johansen
6 7 *
7 This program is free software; you can redistribute it and/or modify 8 * This program is free software; you can redistribute it and/or modify
8 it under the terms of the GNU General Public License as published by 9 * it under the terms of the GNU General Public License as published by
9 the Free Software Foundation; either version 2 of the License, or 10 * the Free Software Foundation; either version 2 of the License, or
10 (at your option) any later version. 11 * (at your option) any later version.
11 12 *
12 This program is distributed in the hope that it will be useful, 13 * This program is distributed in the hope that it will be useful,
13 but WITHOUT ANY WARRANTY; without even the implied warranty of 14 * but WITHOUT ANY WARRANTY; without even the implied warranty of
14 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
15 GNU General Public License for more details. 16 * GNU General Public License for more details.
16 17 *
17 You should have received a copy of the GNU General Public License 18 * You should have received a copy of the GNU General Public License
18 along with this program; if not, write to the Free Software 19 * along with this program; if not, write to the Free Software
19 Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 20 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
20 21 *
21 The author can be reached via e-mail to <crossfire@schmorp.de> 22 * The author can be reached via e-mail to <crossfire@schmorp.de>
22*/ 23 */
23 24
24/** 25/**
25 * \file 26 * \file
26 * Main client/server loops. 27 * Main client/server loops.
27 * 28 *
… …
46#include <arpa/inet.h> 47#include <arpa/inet.h>
47 48
48#include <loader.h> 49#include <loader.h>
49 50
50#define MAX_QUEUE_DEPTH 500 //TODO 51#define MAX_QUEUE_DEPTH 500 //TODO
51#define MAX_QUEUE_BACKLOG 5. //TODO 52#define MAX_QUEUE_BACKLOG 3. //TODO
52 53
53void 54void
54client::reset_state () 55client::reset_state ()
55{ 56{
56 if (!pl) 57 if (!pl)
… …
86client::handle_command () 87client::handle_command ()
87{ 88{
88 bool skipping = false; 89 bool skipping = false;
89 90
90 while (!cmd_queue.empty () 91 while (!cmd_queue.empty ()
91 && !(state == ST_PLAYING && pl->ob && pl->ob->speed_left < 0)) 92 && !(state == ST_PLAYING && pl->ob && pl->ob->speed_left <= 0))
92 { 93 {
93 command &cmd = cmd_queue.front (); 94 command &cmd = cmd_queue.front ();
94 95
95 if (cmd.stamp + MAX_QUEUE_BACKLOG < now ()) 96 if (cmd.stamp + MAX_QUEUE_BACKLOG < now ())
96 { 97 {
… …
134#ifdef CS_LOGSTATS 135#ifdef CS_LOGSTATS
135 if ((time (NULL) - cst_lst.time_start) >= CS_LOGTIME) 136 if ((time (NULL) - cst_lst.time_start) >= CS_LOGTIME)
136 write_cs_stats (); 137 write_cs_stats ();
137#endif 138#endif
138 139
139 /* Go through the players. Let the loop set the next pl value, 140 //TODO: should not be done here, either
140 * since we may remove some 141 for (unsigned i = 0; i < clients.size (); ++i)
141 */
142 //TODO: must be handled cleanly elsewhere
143 for (player *pl = first_player; pl; )
144 { 142 {
145 player *npl = pl->next;
146
147 //TODO: must be handled cleanly elsewhere
148 if (!pl->ns || pl->ns->destroyed ())
149 {
150 save_player (pl->ob, 0);
151
152 if (!QUERY_FLAG (pl->ob, FLAG_REMOVED))
153 {
154 terminate_all_pets (pl->ob);
155 pl->ob->remove ();
156 }
157
158 leave (pl, 1);
159 final_free_player (pl);
160 }
161
162 pl = npl;
163 }
164
165 for (sockvec::iterator i = clients.begin (); i != clients.end (); )
166 {
167 client *s = *i; 143 client *s = clients [i];
168
169 if (s->destroyed ())
170 {
171 clients.erase (i);
172 delete s;
173 }
174 else
175 ++i;
176 }
177
178 /* We need to do some of the processing below regardless */
179
180 /* Check for any input on the sockets */
181 for (sockvec::iterator i = clients.begin (); i != clients.end (); ++i)
182 {
183 client *s = *i;
184 player *pl = s->pl; 144 player *pl = s->pl;
185 145
186 //TODO: should not be done here, either 146 if (pl && pl->ns && !pl->ns->destroyed ())
187 if (!s->destroyed () && pl)
188 { 147 {
148 client *ns = pl->ns;
149
189 /* Update the players stats once per tick. More efficient than 150 /* Update the players stats once per tick. More efficient than
190 * sending them whenever they change, and probably just as useful 151 * sending them whenever they change, and probably just as useful
191 */ 152 */
192 esrv_update_stats (pl); 153 esrv_update_stats (pl);
193 154
194 if (pl->last_weight != -1 && pl->last_weight != WEIGHT (pl->ob)) 155 if (ns->last_weight != -1 && ns->last_weight != WEIGHT (pl->ob))
195 { 156 {
196 esrv_update_item (UPD_WEIGHT, pl->ob, pl->ob); 157 esrv_update_item (UPD_WEIGHT, pl->ob, pl->ob);
197 if (pl->last_weight != WEIGHT (pl->ob)) 158 if (ns->last_weight != WEIGHT (pl->ob))
198 LOG (llevError, "esrv_update_item(UPD_WEIGHT) did not set player weight: is %lu, should be %lu\n", 159 LOG (llevError, "esrv_update_item(UPD_WEIGHT) did not set player weight: is %lu, should be %lu\n",
199 (unsigned long) pl->last_weight, WEIGHT (pl->ob)); 160 (unsigned long) ns->last_weight, WEIGHT (pl->ob));
200 } 161 }
201 162
202 draw_client_map (pl->ob); 163 draw_client_map (pl->ob);
203 164
204 if (s->update_look) 165 if (s->update_look)
205 esrv_draw_look (pl->ob); 166 esrv_draw_look (pl->ob);
206 } 167 }
168
169 s->refcnt_chk ();
207 } 170 }
208} 171}
209 172

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines