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

Comparing deliantra/server/server/main.C (file contents):
Revision 1.70 by root, Sun Dec 31 21:02:05 2006 UTC vs.
Revision 1.111 by root, Sun Jun 24 04:09:29 2007 UTC

1/* 1/*
2 CrossFire, A Multiplayer game for X-windows 2 * This file is part of Crossfire TRT, the Roguelike Realtime MORPG.
3 3 *
4 * Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Crossfire TRT team
4 Copyright (C) 2001-2003 Mark Wedel & Crossfire Development Team 5 * Copyright (©) 2001-2003,2007 Mark Wedel & Crossfire Development Team
5 Copyright (C) 1992 Frank Tore Johansen 6 * Copyright (©) 1992,2007 Frank Tore Johansen
6 7 *
7 This program is free software; you can redistribute it and/or modify 8 * Crossfire TRT is free software; you can redistribute it and/or modify it
8 it under the terms of the GNU General Public License as published by 9 * under the terms of the GNU General Public License as published by the Free
9 the Free Software Foundation; either version 2 of the License, or 10 * Software Foundation; either version 2 of the License, or (at your option)
10 (at your option) any later version. 11 * 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, but
13 but WITHOUT ANY WARRANTY; without even the implied warranty of 14 * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
14 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 15 * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
15 GNU General Public License for more details. 16 * 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 along
18 along with this program; if not, write to the Free Software 19 * with Crossfire TRT; if not, write to the Free Software Foundation, Inc. 51
19 Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 20 * Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
20 21 *
21 The authors can be reached via e-mail at <crossfire@schmorp.de> 22 * The authors can be reached via e-mail to <crossfire@schmorp.de>
22*/ 23 */
23 24
24#include <global.h> 25#include <global.h>
25#include <object.h> 26#include <object.h>
26#include <tod.h> 27#include <tod.h>
27 28
28#ifdef HAVE_DES_H
29# include <des.h>
30#else
31# ifdef HAVE_CRYPT_H
32# include <crypt.h>
33# endif
34#endif
35
36#include <sproto.h> 29#include <sproto.h>
37#include <time.h> 30#include <time.h>
38 31
39#include <../random_maps/random_map.h> 32#include <../random_maps/random_map.h>
40#include <../random_maps/rproto.h> 33#include <../random_maps/rproto.h>
… …
45}; 38};
46 39
47void 40void
48version (object *op) 41version (object *op)
49{ 42{
50 if (op != NULL)
51 clear_win_info (op);
52
53 new_draw_info_format (NDI_UNIQUE, 0, op, "This is Crossfire v%s", VERSION); 43 new_draw_info_format (NDI_UNIQUE, 0, op, "This is Crossfire+ v%s", VERSION);
54
55/* If in a socket, don't print out the list of authors. It confuses the
56 * crossclient program.
57 */
58 if (op == NULL)
59 return;
60 44
61 new_draw_info (NDI_UNIQUE, 0, op, "Authors and contributors to this program:"); 45 new_draw_info (NDI_UNIQUE, 0, op, "Authors and contributors to this program:");
62 new_draw_info (NDI_UNIQUE, 0, op, "Marc A. Lehmann <pcg@goof.com>"); 46 new_draw_info (NDI_UNIQUE, 0, op, "Marc A. Lehmann <pcg@goof.com>");
63 new_draw_info (NDI_UNIQUE, 0, op, "Robin Redeker <elmex@x-paste.de>"); 47 new_draw_info (NDI_UNIQUE, 0, op, "Robin Redeker <elmex@x-paste.de>");
64 new_draw_info (NDI_UNIQUE, 0, op, "Pippijn van Steenhoven <pip88nl@gmail.com>"); 48 new_draw_info (NDI_UNIQUE, 0, op, "Pippijn van Steenhoven <pip88nl@gmail.com>");
49 new_draw_info (NDI_UNIQUE, 0, op, "");
50 new_draw_info (NDI_UNIQUE, 0, op, "Authors and contributors to the original Crossfire:");
65 new_draw_info (NDI_UNIQUE, 0, op, "Mark Wedel <mwedel@sonic.net>"); 51 new_draw_info (NDI_UNIQUE, 0, op, "Mark Wedel <mwedel@sonic.net>");
66 new_draw_info (NDI_UNIQUE, 0, op, "Frank Tore Johansen <frankj@ifi.uio.no>"); 52 new_draw_info (NDI_UNIQUE, 0, op, "Frank Tore Johansen <frankj@ifi.uio.no>");
67 new_draw_info (NDI_UNIQUE, 0, op, "Kjetil Torgrim Homme <kjetilho@ifi.uio.no>"); 53 new_draw_info (NDI_UNIQUE, 0, op, "Kjetil Torgrim Homme <kjetilho@ifi.uio.no>");
68 new_draw_info (NDI_UNIQUE, 0, op, "Tyler Van Gorder <tvangod@ecst.csuchico.edu>"); 54 new_draw_info (NDI_UNIQUE, 0, op, "Tyler Van Gorder <tvangod@ecst.csuchico.edu>");
69 new_draw_info (NDI_UNIQUE, 0, op, "Tony Elmroth <elmroth@cd.chalmers.se>"); 55 new_draw_info (NDI_UNIQUE, 0, op, "Tony Elmroth <elmroth@cd.chalmers.se>");
70 new_draw_info (NDI_UNIQUE, 0, op, "Dougal Scott <dougal.scott@fcit.monasu.edu.au>"); 56 new_draw_info (NDI_UNIQUE, 0, op, "Dougal Scott <dougal.scott@fcit.monasu.edu.au>");
71 new_draw_info (NDI_UNIQUE, 0, op, "William <wchuang@athena.mit.edu>"); 57 new_draw_info (NDI_UNIQUE, 0, op, "William <wchuang@athena.mit.edu>");
72 new_draw_info (NDI_UNIQUE, 0, op, "Geoff Bailey <ftww@cs.su.oz.au>"); 58 new_draw_info (NDI_UNIQUE, 0, op, "Geoff Bailey <ftww@cs.su.oz.au>");
73 new_draw_info (NDI_UNIQUE, 0, op, "Kjetil Wiekhorst Jxrgensen <jorgens@flipper.pvv.unit.no>"); 59 new_draw_info (NDI_UNIQUE, 0, op, "Kjetil Wiekhorst Jørgensen <jorgens@flipper.pvv.unit.no>");
74 new_draw_info (NDI_UNIQUE, 0, op, "Cameron Blackwood <c.blackwood@rdt.monash.edu.au>"); 60 new_draw_info (NDI_UNIQUE, 0, op, "Cameron Blackwood <c.blackwood@rdt.monash.edu.au>");
75 new_draw_info (NDI_UNIQUE, 0, op, "Joseph L. Traub <jtraub+@cmu.edu>"); 61 new_draw_info (NDI_UNIQUE, 0, op, "Joseph L. Traub <jtraub+@cmu.edu>");
76 new_draw_info (NDI_UNIQUE, 0, op, "Rupert G. Goldie <rgg@aaii.oz.au>"); 62 new_draw_info (NDI_UNIQUE, 0, op, "Rupert G. Goldie <rgg@aaii.oz.au>");
77 new_draw_info (NDI_UNIQUE, 0, op, "Eric A. Anderson <eanders+@cmu.edu>"); 63 new_draw_info (NDI_UNIQUE, 0, op, "Eric A. Anderson <eanders+@cmu.edu>");
78 new_draw_info (NDI_UNIQUE, 0, op, "Rickard Eneqvist <eneq@Prag.DoCS.UU.SE>"); 64 new_draw_info (NDI_UNIQUE, 0, op, "Rickard Eneqvist <eneq@Prag.DoCS.UU.SE>");
… …
100 new_draw_info (NDI_UNIQUE, 0, op, "Laurent Wacrenier <Wacren@Gin.ObsPM.Fr>"); 86 new_draw_info (NDI_UNIQUE, 0, op, "Laurent Wacrenier <Wacren@Gin.ObsPM.Fr>");
101 new_draw_info (NDI_UNIQUE, 0, op, "Brian Thomas <thomas@astro.psu.edu>"); 87 new_draw_info (NDI_UNIQUE, 0, op, "Brian Thomas <thomas@astro.psu.edu>");
102 new_draw_info (NDI_UNIQUE, 0, op, "John Steven Moerk <jsm@axon.ksc.nasa.gov>"); 88 new_draw_info (NDI_UNIQUE, 0, op, "John Steven Moerk <jsm@axon.ksc.nasa.gov>");
103 new_draw_info (NDI_UNIQUE, 0, op, "Delbecq David <david.delbecq@mailandnews.com>"); 89 new_draw_info (NDI_UNIQUE, 0, op, "Delbecq David <david.delbecq@mailandnews.com>");
104 new_draw_info (NDI_UNIQUE, 0, op, "Chachkoff Yann <yann.chachkoff@mailandnews.com>\n"); 90 new_draw_info (NDI_UNIQUE, 0, op, "Chachkoff Yann <yann.chachkoff@mailandnews.com>\n");
105 91 new_draw_info (NDI_UNIQUE, 0, op, "");
106 new_draw_info (NDI_UNIQUE, 0, op, "Images and art:"); 92 new_draw_info (NDI_UNIQUE, 0, op, "Images and art:");
107 new_draw_info (NDI_UNIQUE, 0, op, "Peter Gardner"); 93 new_draw_info (NDI_UNIQUE, 0, op, "Peter Gardner");
108 new_draw_info (NDI_UNIQUE, 0, op, "David Gervais <david_eg@mail.com>"); 94 new_draw_info (NDI_UNIQUE, 0, op, "David Gervais <david_eg@mail.com>");
109 new_draw_info (NDI_UNIQUE, 0, op, "Mitsuhiro Itakura <ita@gold.koma.jaeri.go.jp>"); 95 new_draw_info (NDI_UNIQUE, 0, op, "Mitsuhiro Itakura <ita@gold.koma.jaeri.go.jp>");
110 new_draw_info (NDI_UNIQUE, 0, op, "Hansjoerg Malthaner <hansjoerg.malthaner@danet.de>"); 96 new_draw_info (NDI_UNIQUE, 0, op, "Hansjoerg Malthaner <hansjoerg.malthaner@danet.de>");
111 new_draw_info (NDI_UNIQUE, 0, op, "Mårten Woxberg <maxmc@telia.com>"); 97 new_draw_info (NDI_UNIQUE, 0, op, "Mårten Woxberg <maxmc@telia.com>");
98 new_draw_info (NDI_UNIQUE, 0, op, "");
112 new_draw_info (NDI_UNIQUE, 0, op, "And many more!"); 99 new_draw_info (NDI_UNIQUE, 0, op, "And many more!");
113} 100}
114 101
115/* This is a basic little function to put the player back to his 102/* This is a basic little function to put the player back to his
116 * savebed. We do some error checking - its possible that the 103 * savebed. We do some error checking - its possible that the
… …
136 * the function that calls this should figure them out. 123 * the function that calls this should figure them out.
137 */ 124 */
138void 125void
139object::enter_map (maptile *newmap, int x, int y) 126object::enter_map (maptile *newmap, int x, int y)
140{ 127{
141 if (destroyed () || !newmap) 128 if (destroyed () || !newmap || newmap->in_memory != MAP_IN_MEMORY)
142 return; 129 return;
143 130
144 if (out_of_map (newmap, x, y)) 131 if (out_of_map (newmap, x, y))
145 { 132 {
146 LOG (llevError, "enter_map: supplied coordinates are not within the map! (%s: %d, %d)\n", &newmap->path, x, y); 133 LOG (llevError, "enter_map: supplied coordinates are not within the map! (%s: %d, %d)\n", &newmap->path, x, y);
… …
153 new_draw_info (NDI_UNIQUE, 0, this, "The exit is closed"); 140 new_draw_info (NDI_UNIQUE, 0, this, "The exit is closed");
154 return; 141 return;
155 } 142 }
156 } 143 }
157 144
158 if (map && map != newmap) 145 if (contr && map != newmap && map)
159 if (INVOKE_MAP (LEAVE, map, ARG_PLAYER (contr))) 146 if (INVOKE_MAP (LEAVE, map, ARG_PLAYER (contr)))
160 return; 147 return;
161 148
162 /* If it is a player login, he has yet to be inserted anyplace. 149 // remove, so stupid ob_locked does not trigger a failure
163 * otherwise, we need to deal with removing the player here.
164 */
165 remove (); 150 remove ();
166 151
167 /* try to find a spot for the player */ 152 /* try to find a spot for the player */
168 if (ob_blocked (this, newmap, x, y)) 153 if (ob_blocked (this, newmap, x, y))
169 { /* First choice blocked */ 154 { /* First choice blocked */
… …
191 else 176 else
192 /* not much we can do in this case. */ 177 /* not much we can do in this case. */
193 LOG (llevInfo, "enter_map: Could not find free spot for player - will dump on top of object (%s: %d, %d)\n", &newmap->path, x, y); 178 LOG (llevInfo, "enter_map: Could not find free spot for player - will dump on top of object (%s: %d, %d)\n", &newmap->path, x, y);
194 } 179 }
195 180
196 if (map != newmap && contr) 181 if (contr && map != newmap)
197 { 182 {
198 if (INVOKE_PLAYER (MAP_CHANGE, contr, ARG_MAP (newmap), ARG_INT (x), ARG_INT (y))) 183 if (INVOKE_PLAYER (MAP_CHANGE, contr, ARG_MAP (newmap), ARG_INT (x), ARG_INT (y)))
199 return; 184 return;
200 185
201 if (INVOKE_MAP (ENTER, newmap, ARG_PLAYER (contr), ARG_INT (x), ARG_INT (y))) 186 if (INVOKE_MAP (ENTER, newmap, ARG_PLAYER (contr), ARG_INT (x), ARG_INT (y)))
… …
206 this->y = y; 191 this->y = y;
207 map = newmap; 192 map = newmap;
208 193
209 insert_ob_in_map (this, map, 0, INS_NO_WALK_ON); 194 insert_ob_in_map (this, map, 0, INS_NO_WALK_ON);
210 195
211 enemy = NULL; 196 enemy = 0;
212 197
213 if (contr) 198 if (contr)
214 { 199 {
215 contr->maplevel = newmap->path; 200 contr->maplevel = newmap->path;
216 contr->count = 0; 201 contr->count = 0;
217 } 202 }
218 203
219 /* Update any golems */ 204 /* Update any golems */
220 if (type == PLAYER && contr->ranges[range_golem]) 205 if (type == PLAYER)
221 { 206 if (object *golem = contr->golem)
222 int i = find_free_spot (contr->ranges[range_golem], newmap,
223 x, y, 1, SIZEOFFREE);
224
225 contr->ranges[range_golem]->remove ();
226
227 if (i == -1)
228 { 207 {
229 remove_friendly_object (contr->ranges[range_golem]); 208 int i = find_free_spot (golem, newmap, x, y, 1, SIZEOFFREE);
230 contr->ranges[range_golem]->destroy (); 209
231 contr->ranges[range_golem] = 0; 210 if (i < 0)
232 } 211 golem->destroy ();
233 else 212 else
234 {
235 for (object *tmp = contr->ranges[range_golem]; tmp != NULL; tmp = tmp->more)
236 { 213 {
237 tmp->x = x + freearr_x[i] + (tmp->arch == NULL ? 0 : tmp->arch->clone.x); 214 newmap->insert (golem, x + freearr_x[i], y + freearr_y[i]);
238 tmp->y = y + freearr_y[i] + (tmp->arch == NULL ? 0 : tmp->arch->clone.y); 215 golem->direction = find_dir_2 (x - golem->x, y - golem->y);
239 tmp->map = newmap;
240 } 216 }
241
242 insert_ob_in_map (contr->ranges[range_golem], newmap, NULL, 0);
243 contr->ranges[range_golem]->direction =
244 find_dir_2 (x - contr->ranges[range_golem]->x, y - contr->ranges[range_golem]->y);
245 } 217 }
246 }
247
248 direction = 0;
249 218
250 /* since the players map is already loaded, we don't need to worry 219 /* since the players map is already loaded, we don't need to worry
251 * about pending objects. 220 * about pending objects.
252 */ 221 */
253 remove_all_pets (newmap); 222 remove_all_pets (newmap);
… …
261 * is needed after the players have been updated. 230 * is needed after the players have been updated.
262 */ 231 */
263static void 232static void
264process_players1 () 233process_players1 ()
265{ 234{
266 int flag;
267
268 /* Basically, we keep looping until all the players have done their actions. */ 235 /* Basically, we keep looping until all the players have done their actions. */
269 for (flag = 1; flag != 0;) 236 for (int flag = 1; flag != 0;)
270 { 237 {
271 flag = 0; 238 flag = 0;
272 for_all_players (pl) 239 for_all_players (pl)
273 { 240 {
274 pl->refcnt_chk (); 241 pl->refcnt_chk ();
275 242
276 if (!pl->ob || !pl->ns || !pl->ob->active ()) 243 if (expect_false (!pl->ob || !pl->ns || !pl->ob->active))
277 continue; 244 continue;
278 245
279 if (pl->ob->speed_left > 0)
280 if (handle_newcs_player (pl->ob)) 246 if (handle_newcs_player (pl->ob))
281 flag = 1; 247 flag = 1;
282
283 /* If the player is not actively playing, don't make a
284 * backup save - nothing to save anyway. Plus, the
285 * map may not longer be valid. This can happen when the
286 * player quits - they exist for purposes of tracking on the map,
287 * but don't actually reside on any actual map.
288 */
289 if (QUERY_FLAG (pl->ob, FLAG_REMOVED))
290 continue;
291
292#ifdef AUTOSAVE
293 /* check for ST_PLAYING state so that we don't try to save off when
294 * the player is logging in.
295 */
296 if ((pl->last_save_tick + AUTOSAVE) < (uint32) pticks && pl->ns->state == ST_PLAYING)
297 {
298 pl->ob->contr->save ();
299 pl->last_save_tick = pticks;
300 } 248 }
301#endif 249 }
302 } /* end of for loop for all the players */
303 } /* for flag */
304 250
305 for_all_players (pl) 251 for_all_players (pl)
306 { 252 {
253 object *ob = pl->ob;
254
307 if (!pl->ob || !pl->ns || !pl->ob->active ()) 255 if (expect_false (!ob || !pl->ns || !ob->active))
308 continue; 256 continue;
309 257
310 if (settings.casting_time)
311 {
312 if (pl->ob->casting_time > 0)
313 {
314 pl->ob->casting_time--;
315 pl->ob->start_holding = 1;
316 }
317
318 /* set spell_state so we can update the range in stats field */
319 if ((pl->ob->casting_time == 0) && (pl->ob->start_holding == 1))
320 pl->ob->start_holding = 0;
321 }
322
323 do_some_living (pl->ob); 258 do_some_living (ob);
324 } 259 }
325} 260}
326 261
327static void 262static void
328process_players2 () 263process_players2 ()
329{ 264{
330 /* Then check if any players should use weapon-speed instead of speed */ 265 /* Then check if any players should use weapon-speed instead of speed */
331 for_all_players (pl) 266 for_all_players (pl)
332 { 267 {
333 /* The code that did weapon_sp handling here was out of place - 268 pl->weapon_sp_left = min (pl->weapon_sp, pl->weapon_sp_left + pl->weapon_sp);
334 * this isn't called until after the player has finished there 269 pl->ob->speed_left = min (pl->ob->speed, pl->ob->speed_left + pl->ob->speed);
335 * actions, and is thus out of place. All we do here is bounds
336 * checking.
337 */
338 if (pl->has_hit)
339 {
340 if (pl->ob->speed_left > pl->weapon_sp)
341 pl->ob->speed_left = pl->weapon_sp;
342
343 /* This needs to be here - if the player is running, we need to
344 * clear this each tick, but new commands are not being received
345 * so execute_newserver_command() is never called
346 */
347 pl->has_hit = 0;
348 }
349 else if (pl->ob->speed_left > pl->ob->speed)
350 pl->ob->speed_left = pl->ob->speed;
351 } 270 }
352} 271}
353 272
354void 273void
355process_events () 274process_events ()
356{ 275{
357 object *op;
358
359 static object_ptr marker_;
360
361 if (!marker_)
362 marker_ = object::create ();
363
364 object *marker = marker_;
365
366 process_players1 (); 276 process_players1 ();
367 277
368 marker->active_next = active_objects; 278 for_all_actives (op)
369
370 if (marker->active_next)
371 marker->active_next->active_prev = marker;
372
373 marker->active_prev = 0;
374 active_objects = marker;
375
376 while (marker->active_next)
377 { 279 {
378 op = marker->active_next;
379
380 /* Move marker forward - swap op and marker */
381 op->active_prev = marker->active_prev;
382
383 if (op->active_prev)
384 op->active_prev->active_next = op;
385 else
386 active_objects = op;
387
388 marker->active_next = op->active_next;
389
390 if (marker->active_next)
391 marker->active_next->active_prev = marker;
392
393 marker->active_prev = op;
394 op->active_next = marker;
395
396 /* Now process op */ 280 /* Now process op */
397 if (QUERY_FLAG (op, FLAG_FREED)) 281 if (expect_false (QUERY_FLAG (op, FLAG_FREED)))
398 { 282 {
399 LOG (llevError, "BUG: process_events(): Free object on list\n"); 283 LOG (llevError, "BUG: process_events(): Free object on list\n");
400 op->set_speed (0); 284 op->set_speed (0);
401 continue; 285 continue;
402 } 286 }
403 287
404 /* I've seen occasional crashes due to this - the object is removed,
405 * and thus the map it points to (last map it was on) may be bogus
406 * The real bug is to try to find out the cause of this - someone
407 * is probably calling remove_ob without either an insert_ob or
408 * free_object afterwards, leaving an object dangling. But I'd
409 * rather log this and continue on instead of crashing.
410 * Don't remove players - when a player quits, the object is in
411 * sort of a limbo, of removed, but something we want to keep
412 * around.
413 */
414 if (QUERY_FLAG (op, FLAG_REMOVED) && op->type != PLAYER && op->map && op->map->in_memory != MAP_IN_MEMORY)
415 {
416 LOG (llevError, "BUG: process_events(): Removed object on list\n");
417 char *dump = dump_object (op);
418 LOG (llevError, dump);
419 free (dump);
420 op->destroy ();
421 continue;
422 }
423
424 if (!op->has_active_speed ()) 288 if (expect_false (!op->has_active_speed ()))
425 { 289 {
426 LOG (llevError, "BUG: process_events(): Object %s has no speed (%f), " 290 LOG (llevError, "BUG: process_events(): Object %s has no speed (%f), "
427 "but is on active list\n", op->debug_desc (), op->speed); 291 "but is on active list\n", op->debug_desc (), op->speed);
428 op->set_speed (0); 292 op->set_speed (0);
429 continue; 293 continue;
430 } 294 }
431 295
432 if (op->map == NULL && op->env == NULL && op->name && op->type != MAP) 296 if (expect_false (op->flag [FLAG_REMOVED]))
433 { 297 {
434 LOG (llevError, "BUG: process_events(): Object without map or " 298 LOG (llevError, "BUG: process_events(): removed object is on active list: %s\n",
435 "inventory is on active list: %s (%d)\n", &op->name, op->count); 299 op->debug_desc ());
436 op->set_speed (0); 300 op->set_speed (0);
437 continue; 301 continue;
438 } 302 }
439 303
440 /* Animate the object. Bug or feature that anim_speed 304 /* Animate the object. Bug or feature that anim_speed
441 * is based on ticks, and not the creatures speed? 305 * is based on ticks, and not the creatures speed?
442 */ 306 */
443 if (op->anim_speed && op->last_anim >= op->anim_speed) 307 if (op->anim_speed && op->last_anim >= op->anim_speed)
444 { 308 {
445 if ((op->type == PLAYER))
446 animate_object (op, op->facing);
447 else
448 animate_object (op, op->direction); 309 animate_object (op, op->contr ? op->facing : op->direction);
449
450 op->last_anim = 1; 310 op->last_anim = 1;
451 } 311 }
452 else 312 else
453 op->last_anim++; 313 ++op->last_anim;
454 314
455 if (op->speed_left > 0) 315 if (op->speed_left > 0.f)
456 {
457#if 0
458 /* I've seen occasional crashes in move_symptom() with it
459 * crashing because op is removed - add some debugging to
460 * track if it is removed at this point.
461 * This unfortunately is a bit too verbose it seems - not sure
462 * why - I think what happens is a map is freed or something and
463 * some objects get 'lost' - removed never to be reclaimed.
464 * removed objects generally shouldn't exist.
465 */
466 if (QUERY_FLAG (op, FLAG_REMOVED))
467 { 316 {
468 LOG (llevDebug, "process_events: calling process_object with removed object %s\n", op->name ? op->name : "null");
469 }
470#endif
471 --op->speed_left; 317 --op->speed_left;
472 process_object (op); 318 process_object (op);
473 319
474 if (op->destroyed ()) 320 if (op->destroyed ())
475 continue; 321 continue;
476 } 322 }
477 323
478 if (settings.casting_time == TRUE && op->casting_time > 0) 324 if (!op->contr)
479 op->casting_time--; 325 op->speed_left = min (abs (op->speed), op->speed_left + abs (op->speed));
480
481 if (op->speed_left <= 0)
482 op->speed_left += FABS (op->speed);
483 } 326 }
484
485 /* Remove marker object from active list */
486 if (marker->active_prev != NULL)
487 marker->active_prev->active_next = NULL;
488 else
489 active_objects = NULL;
490 327
491 process_players2 (); 328 process_players2 ();
492} 329}
493 330
494/* clean up everything before exiting */ 331/* clean up everything before exiting */
495void 332void
496emergency_save () 333emergency_save ()
497{ 334{
498 LOG (llevDebug, "emergency save begin.\n"); 335 LOG (llevDebug, "emergency save begin.\n");
499 336
500 LOG (llevDebug, "saving players.\n");
501 for_all_players (pl)
502 pl->save (1);
503
504// for_all_players (pl)
505// if (pl->ob)
506// pl->ob->remove ();
507
508 LOG (llevDebug, "saving maps.\n");
509 maptile::emergency_save (); 337 cfperl_emergency_save ();
510 338
511 LOG (llevDebug, "saving book archive.\n"); 339 LOG (llevDebug, "saving book archive.\n");
512 write_book_archive (); 340 write_book_archive ();
513 341
514 LOG (llevDebug, "emergency save done.\n"); 342 LOG (llevDebug, "emergency save done.\n");
515} 343}
516 344
345// send all clients some informational text
346static void
347cleanup_inform (const char *cause, bool make_core)
348{
349 int flags = NDI_UNIQUE | NDI_ALL | (make_core ? NDI_RED : NDI_GREEN);
350
351 new_draw_info_format (flags, 0, 0, "The server will now shutdown.");
352 new_draw_info_format (flags, 0, 0, "Cause for this shutdown: %s", cause);
353
354 if (make_core)
355 new_draw_info_format (flags, 0, 0, "This is considered a crash, but all maps and players have been saved.");
356 else
357 new_draw_info_format (flags, 0, 0, "This is considered to be a clean shutdown, and all maps and players will be saved now.");
358
359 new_draw_info_format (flags, 0, 0, "%s", CLEANUP_MESSAGE);
360
361 flush_sockets ();
362}
363
517/* clean up everything before exiting */ 364/* clean up everything before exiting */
518void 365void
519cleanup (bool make_core) 366cleanup (const char *cause, bool make_core)
520{ 367{
368 if (make_core)
369 fork_abort (cause);
370
371 LOG (llevError, "cleanup cause: %s\n", cause);
372
373 if (!make_core)
374 cleanup_inform (cause, make_core);
375
521 LOG (llevDebug, "cleanup begin.\n"); 376 LOG (llevDebug, "cleanup begin.\n");
522 377
523 if (init_done && !in_cleanup) 378 if (init_done && !in_cleanup)
524 { 379 {
525 in_cleanup = true; 380 in_cleanup = true;
… …
532 INVOKE_GLOBAL (CLEANUP); 387 INVOKE_GLOBAL (CLEANUP);
533 388
534 LOG (llevDebug, "cleanup done.\n"); 389 LOG (llevDebug, "cleanup done.\n");
535 390
536 if (make_core) 391 if (make_core)
537 abort (); 392 {
393 cleanup_inform (cause, make_core);
394 cfperl_cleanup (make_core);
395 _exit (1);
396 }
538 else 397 else
398 {
399 new_draw_info_format (NDI_UNIQUE | NDI_ALL | NDI_GREEN, 0, 0, "Maps and players successfully saved, exiting.");
400 new_draw_info_format (NDI_UNIQUE | NDI_ALL | NDI_GREEN, 0, 0, "And again: " CLEANUP_MESSAGE);
401 flush_sockets ();
402 cfperl_cleanup (make_core);
539 _exit (0); 403 _exit (0);
540}
541
542void
543leave (player *pl, int draw_exit)
544{
545 if (pl)
546 {
547 if (pl->ob->type != DEAD_OBJECT)
548 {
549 /* If a hidden dm dropped connection do not create
550 * inconsistencies by showing that they have left the game
551 */
552 if (!(QUERY_FLAG (pl->ob, FLAG_WIZ) && pl->ob->contr->hidden)
553 && draw_exit)
554 {
555 if (pl->ob->map)
556 {
557 INVOKE_PLAYER (LOGOUT, pl);
558 LOG (llevInfo, "LOGOUT: Player named %s from ip %s\n", &pl->ob->name, pl->ns->host);
559 }
560
561 char buf[MAX_BUF];
562
563 sprintf (buf, "%s left the game.", &pl->ob->name);
564 new_draw_info (NDI_UNIQUE | NDI_ALL | NDI_DK_ORANGE, 5, 0, buf);
565 }
566
567 pl->ob->remove ();
568 pl->ob->type = DEAD_OBJECT; /* To avoid problems with inventory window */
569 }
570
571 /* We do this so that the socket handling routine can do the final
572 * cleanup. We also leave that loop to actually handle the freeing
573 * of the data.
574 */
575 if (pl->ns)
576 pl->ns->destroy ();
577
578 } 404 }
579} 405}
580 406
581int 407int
582forbid_play (void) 408forbid_play (void)
… …
597 423
598 while (fgets (buf, MAX_BUF, fp)) 424 while (fgets (buf, MAX_BUF, fp))
599 { 425 {
600 if (buf[0] == '#') 426 if (buf[0] == '#')
601 continue; 427 continue;
428
602 if (!strncmp (buf, "msg", 3)) 429 if (!strncmp (buf, "msg", 3))
603 { 430 {
604 if (forbit) 431 if (forbit)
605 while (fgets (buf, MAX_BUF, fp)) /* print message */ 432 while (fgets (buf, MAX_BUF, fp)) /* print message */
606 fputs (buf, logfile); 433 fputs (buf, logfile);
607 break; 434 break;
608
609 } 435 }
610 else if (sscanf (buf, "%s %d%*c%d\n", day, &start, &stop) != 3) 436 else if (sscanf (buf, "%s %d%*c%d\n", day, &start, &stop) != 3)
611 { 437 {
612 LOG (llevDebug, "Warning: Incomplete line in permission file ignored.\n"); 438 LOG (llevDebug, "Warning: Incomplete line in permission file ignored.\n");
613 continue; 439 continue;
… …
627 return 0; 453 return 0;
628#endif 454#endif
629} 455}
630 456
631/* 457/*
632 * do_specials() is a collection of functions to call from time to time. 458 * do_specials() is a collection of functions to call from time to time.
633 * Modified 2000-1-14 MSW to use the global pticks count to determine how 459 * Modified 2000-1-14 MSW to use the global pticks count to determine how
634 * often to do things. This will allow us to spred them out more often. 460 * often to do things. This will allow us to spred them out more often.
635 * I use prime numbers for the factor count - in that way, it is less likely 461 * I use prime numbers for the factor count - in that way, it is less likely
636 * these actions will fall on the same tick (compared to say using 500/2500/15000 462 * these actions will fall on the same tick (compared to say using 500/2500/15000
637 * which would mean on that 15,000 tick count a whole bunch of stuff gets 463 * which would mean on that 15,000 tick count a whole bunch of stuff gets
… …
639 * done on the same tick, but that will happen very infrequently 465 * done on the same tick, but that will happen very infrequently
640 * 466 *
641 * I also think this code makes it easier to see how often we really are 467 * I also think this code makes it easier to see how often we really are
642 * doing the various things. 468 * doing the various things.
643 */ 469 */
644
645extern unsigned long todtick;
646
647void 470void
648do_specials (void) 471do_specials (void)
649{ 472{
650 if (!(pticks % PTICKS_PER_CLOCK)) 473 if (expect_false (!(pticks % TICKS_PER_HOUR)))
651 tick_the_clock (); 474 adjust_daylight ();
652 475
653 if (!(pticks % 7)) 476 if (expect_false (!(pticks % 7)))
654 shstr::gc (); 477 shstr::gc ();
655 478
656 if (!(pticks % 2503)) 479 if (expect_false (!(pticks % 2503)))
657 fix_weight (); /* Hack to fix weightproblems caused by bugs */ 480 fix_weight (); /* Hack to fix weightproblems caused by bugs */
658 481
659 if (!(pticks % 5003)) 482 if (expect_false (!(pticks % 5003)))
660 write_book_archive (); 483 write_book_archive ();
661 484
662 if (!(pticks % 5009)) 485 if (expect_false (!(pticks % 5009)))
663 clean_friendly_list (); 486 clean_friendly_list ();
664 487
665 if (!(pticks % 5011)) 488 if (expect_false (!(pticks % 5011)))
666 obsolete_parties (); 489 obsolete_parties ();
667 490
668 if (!(pticks % 12503)) 491 if (expect_false (!(pticks % 12503)))
669 fix_luck (); 492 fix_luck ();
670} 493}
671 494
672void 495void
673server_tick () 496server_tick ()
… …
683 attachable::check_mortals (); 506 attachable::check_mortals ();
684 507
685 ++pticks; 508 ++pticks;
686} 509}
687 510
511#if 0
512// used fro benchmarking (x86/amd64-specific)
513typedef unsigned long tval;
514typedef unsigned long long stamp64;
515
516extern inline tval
517stamp (void)
518{
519 tval tsc;
520 asm volatile ("rdtsc":"=a" (tsc)::"edx");
521
522 return tsc;
523}
524
525extern inline tval
526measure (tval t)
527{
528 tval tsc;
529 asm volatile ("rdtsc":"=a" (tsc)::"edx");
530
531 if (tsc > t)
532 return tsc - t;
533 else
534 return t - tsc;
535}
536
688int 537int
689main (int argc, char **argv) 538main (int argc, char **argv)
690{ 539{
540 rand_gen rg(0);
541 tval fastest = 0x7fffffff;
542 for (int loop = 10000; loop--; )
543 {
544 tval s = stamp ();
545 volatile int i = rg.get_int(25);
546 fastest = min (fastest, measure (s));
547 }
548
549 //printf ("fastest %d\n", fastest);
550 for (int i = 0; i < 1024*1024*3; ++i)
551 {
552 char c = rg.get_int (256);
553 write (2, &c, 1);
554 }
555}
556
557#else
558
559// normal main
560int
561main (int argc, char **argv)
562{
691 settings.argc = argc; 563 settings.argc = argc;
692 settings.argv = argv; 564 settings.argv = argv;
693 565
694 init (argc, argv); 566 init (argc, argv);
695 567
696 initPlugins (); 568 initPlugins ();
697 569
698 for (;;) 570 for (;;)
699 cfperl_main (); 571 cfperl_main ();
700
701 cleanup (true);
702} 572}
573#endif
703 574

Diff Legend

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