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.36 by pippijn, Sat Jan 6 14:42:31 2007 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) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team
5 Copyright (C) 2002-2003 Mark Wedel & The Crossfire Development Team 5 * Copyright (C) 2002-2003 Mark Wedel & The Crossfire Development Team
6 Copyright (C) 1992 Frank Tore Johansen 6 * Copyright (C) 1992 Frank Tore Johansen
7 7 *
8 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
9 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
10 the Free Software Foundation; either version 2 of the License, or 10 * the Free Software Foundation; either version 2 of the License, or
11 (at your option) any later version. 11 * (at your option) any later version.
12 12 *
13 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,
14 but WITHOUT ANY WARRANTY; without even the implied warranty of 14 * but WITHOUT ANY WARRANTY; without even the implied warranty of
15 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
16 GNU General Public License for more details. 16 * GNU General Public License for more details.
17 17 *
18 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
19 along with this program; if not, write to the Free Software 19 * along with this program; if not, write to the Free Software
20 Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 20 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
21 21 *
22 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>
23*/ 23 */
24 24
25/** 25/**
26 * \file 26 * \file
27 * Main client/server loops. 27 * Main client/server loops.
28 * 28 *
87client::handle_command () 87client::handle_command ()
88{ 88{
89 bool skipping = false; 89 bool skipping = false;
90 90
91 while (!cmd_queue.empty () 91 while (!cmd_queue.empty ()
92 && !(state == ST_PLAYING && pl->ob && pl->ob->speed_left < 0)) 92 && !(state == ST_PLAYING && pl->ob && pl->ob->speed_left <= 0))
93 { 93 {
94 command &cmd = cmd_queue.front (); 94 command &cmd = cmd_queue.front ();
95 95
96 if (cmd.stamp + MAX_QUEUE_BACKLOG < now ()) 96 if (cmd.stamp + MAX_QUEUE_BACKLOG < now ())
97 { 97 {
136 if ((time (NULL) - cst_lst.time_start) >= CS_LOGTIME) 136 if ((time (NULL) - cst_lst.time_start) >= CS_LOGTIME)
137 write_cs_stats (); 137 write_cs_stats ();
138#endif 138#endif
139 139
140 //TODO: should not be done here, either 140 //TODO: should not be done here, either
141 for (int i = 0; i < clients.size (); ++i) 141 for (unsigned i = 0; i < clients.size (); ++i)
142 { 142 {
143 client *s = clients [i]; 143 client *s = clients [i];
144 player *pl = s->pl; 144 player *pl = s->pl;
145 145
146 if (pl && pl->ns && !pl->ns->destroyed ()) 146 if (pl && pl->ns && !pl->ns->destroyed ())
147 { 147 {
148 client *ns = pl->ns;
149
148 /* Update the players stats once per tick. More efficient than 150 /* Update the players stats once per tick. More efficient than
149 * sending them whenever they change, and probably just as useful 151 * sending them whenever they change, and probably just as useful
150 */ 152 */
151 esrv_update_stats (pl); 153 esrv_update_stats (pl);
152 154
153 if (pl->last_weight != -1 && pl->last_weight != WEIGHT (pl->ob)) 155 if (ns->last_weight != -1 && ns->last_weight != WEIGHT (pl->ob))
154 { 156 {
155 esrv_update_item (UPD_WEIGHT, pl->ob, pl->ob); 157 esrv_update_item (UPD_WEIGHT, pl->ob, pl->ob);
156 if (pl->last_weight != WEIGHT (pl->ob)) 158 if (ns->last_weight != WEIGHT (pl->ob))
157 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",
158 (unsigned long) pl->last_weight, WEIGHT (pl->ob)); 160 (unsigned long) ns->last_weight, WEIGHT (pl->ob));
159 } 161 }
160 162
161 draw_client_map (pl->ob); 163 draw_client_map (pl->ob);
162 164
163 if (s->update_look) 165 if (s->update_look)

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines