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.66 by elmex, Sat Dec 30 21:07:46 2006 UTC vs.
Revision 1.87 by root, Thu Jan 18 19:32:37 2007 UTC

1/* 1/*
2 CrossFire, A Multiplayer game for X-windows 2 * CrossFire, A Multiplayer game
3 3 *
4 * Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team
4 Copyright (C) 2001-2003 Mark Wedel & Crossfire Development Team 5 * Copyright (C) 2001-2003 Mark Wedel & 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 authors can be reached via e-mail at <crossfire@schmorp.de> 22 * The authors can be reached via e-mail at <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) 43 if (op)
51 clear_win_info (op); 44 clear_win_info (op);
52 45
53 new_draw_info_format (NDI_UNIQUE, 0, op, "This is Crossfire v%s", VERSION); 46 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 47
61 new_draw_info (NDI_UNIQUE, 0, op, "Authors and contributors to this program:"); 48 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>"); 49 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>"); 50 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>"); 51 new_draw_info (NDI_UNIQUE, 0, op, "Pippijn van Steenhoven <pip88nl@gmail.com>");
52 new_draw_info (NDI_UNIQUE, 0, op, "");
53 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>"); 54 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>"); 55 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>"); 56 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>"); 57 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>"); 58 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>"); 59 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>"); 60 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>"); 61 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>"); 62 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>"); 63 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>"); 64 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>"); 65 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>"); 66 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>"); 67 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>"); 89 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>"); 90 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>"); 91 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>"); 92 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"); 93 new_draw_info (NDI_UNIQUE, 0, op, "Chachkoff Yann <yann.chachkoff@mailandnews.com>\n");
105 94 new_draw_info (NDI_UNIQUE, 0, op, "");
106 new_draw_info (NDI_UNIQUE, 0, op, "Images and art:"); 95 new_draw_info (NDI_UNIQUE, 0, op, "Images and art:");
107 new_draw_info (NDI_UNIQUE, 0, op, "Peter Gardner"); 96 new_draw_info (NDI_UNIQUE, 0, op, "Peter Gardner");
108 new_draw_info (NDI_UNIQUE, 0, op, "David Gervais <david_eg@mail.com>"); 97 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>"); 98 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>"); 99 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>"); 100 new_draw_info (NDI_UNIQUE, 0, op, "Mårten Woxberg <maxmc@telia.com>");
101 new_draw_info (NDI_UNIQUE, 0, op, "");
112 new_draw_info (NDI_UNIQUE, 0, op, "And many more!"); 102 new_draw_info (NDI_UNIQUE, 0, op, "And many more!");
113} 103}
114 104
115/* This is a basic little function to put the player back to his 105/* This is a basic little function to put the player back to his
116 * savebed. We do some error checking - its possible that the 106 * savebed. We do some error checking - its possible that the
… …
136 * the function that calls this should figure them out. 126 * the function that calls this should figure them out.
137 */ 127 */
138void 128void
139object::enter_map (maptile *newmap, int x, int y) 129object::enter_map (maptile *newmap, int x, int y)
140{ 130{
141 if (!newmap->load ()) 131 if (destroyed () || !newmap || newmap->in_memory != MAP_IN_MEMORY)
142 return; 132 return;
143 133
144 if (out_of_map (newmap, x, y)) 134 if (out_of_map (newmap, x, y))
145 { 135 {
146 LOG (llevError, "enter_map: supplied coordinates are not within the map! (%s: %d, %d)\n", &newmap->path, x, y); 136 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"); 143 new_draw_info (NDI_UNIQUE, 0, this, "The exit is closed");
154 return; 144 return;
155 } 145 }
156 } 146 }
157 147
158 if (map) 148 if (contr && map != newmap && map)
159 if (INVOKE_MAP (LEAVE, map, ARG_PLAYER (contr))) 149 if (INVOKE_MAP (LEAVE, map, ARG_PLAYER (contr)))
160 return; 150 return;
161 151
162 /* If it is a player login, he has yet to be inserted anyplace. 152 // remove, so stupid ob_locked does not trigger a failure
163 * otherwise, we need to deal with removing the player here.
164 */
165 remove (); 153 remove ();
166 154
167 /* try to find a spot for the player */ 155 /* try to find a spot for the player */
168 if (ob_blocked (this, newmap, x, y)) 156 if (ob_blocked (this, newmap, x, y))
169 { /* First choice blocked */ 157 { /* First choice blocked */
… …
191 else 179 else
192 /* not much we can do in this case. */ 180 /* 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); 181 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 } 182 }
195 183
184 if (contr && map != newmap)
185 {
196 if (INVOKE_PLAYER (MAP_CHANGE, contr, ARG_MAP (newmap), ARG_INT (x), ARG_INT (y))) 186 if (INVOKE_PLAYER (MAP_CHANGE, contr, ARG_MAP (newmap), ARG_INT (x), ARG_INT (y)))
197 return; 187 return;
198 188
199 if (INVOKE_MAP (ENTER, newmap, ARG_PLAYER (contr), ARG_INT (x), ARG_INT (y))) 189 if (INVOKE_MAP (ENTER, newmap, ARG_PLAYER (contr), ARG_INT (x), ARG_INT (y)))
200 return; 190 return;
191 }
201 192
202 this->x = x; 193 this->x = x;
203 this->y = y; 194 this->y = y;
204 map = newmap; 195 map = newmap;
205 196
206 insert_ob_in_map (this, map, 0, INS_NO_WALK_ON); 197 insert_ob_in_map (this, map, 0, INS_NO_WALK_ON);
207 198
208 newmap->timeout = 0;
209 enemy = NULL; 199 enemy = 0;
210 200
211 if (contr) 201 if (contr)
212 { 202 {
213 strcpy (contr->maplevel, newmap->path); 203 contr->maplevel = newmap->path;
214 contr->count = 0; 204 contr->count = 0;
215 } 205 }
216 206
217 /* Update any golems */ 207 /* Update any golems */
218 if (type == PLAYER && contr->ranges[range_golem]) 208 if (type == PLAYER && contr->ranges[range_golem])
219 { 209 {
220 int i = find_free_spot (contr->ranges[range_golem], newmap, 210 int i = find_free_spot (contr->ranges[range_golem], newmap, x, y, 1, SIZEOFFREE);
221 x, y, 1, SIZEOFFREE);
222 211
223 contr->ranges[range_golem]->remove ();
224
225 if (i == -1) 212 if (i < 0)
226 { 213 {
227 remove_friendly_object (contr->ranges[range_golem]);
228 contr->ranges[range_golem]->destroy (); 214 contr->ranges[range_golem]->destroy ();
229 contr->ranges[range_golem] = 0; 215 contr->ranges[range_golem] = 0;
230 } 216 }
231 else 217 else
232 { 218 {
233 for (object *tmp = contr->ranges[range_golem]; tmp != NULL; tmp = tmp->more) 219 newmap->insert (contr->ranges[range_golem], x + freearr_x[i], y + freearr_y[i]);
234 {
235 tmp->x = x + freearr_x[i] + (tmp->arch == NULL ? 0 : tmp->arch->clone.x);
236 tmp->y = y + freearr_y[i] + (tmp->arch == NULL ? 0 : tmp->arch->clone.y);
237 tmp->map = newmap;
238 }
239 220
240 insert_ob_in_map (contr->ranges[range_golem], newmap, NULL, 0);
241 contr->ranges[range_golem]->direction = 221 contr->ranges[range_golem]->direction =
242 find_dir_2 (x - contr->ranges[range_golem]->x, y - contr->ranges[range_golem]->y); 222 find_dir_2 (x - contr->ranges[range_golem]->x, y - contr->ranges[range_golem]->y);
243 } 223 }
244 } 224 }
245
246 direction = 0;
247 225
248 /* since the players map is already loaded, we don't need to worry 226 /* since the players map is already loaded, we don't need to worry
249 * about pending objects. 227 * about pending objects.
250 */ 228 */
251 remove_all_pets (newmap); 229 remove_all_pets (newmap);
… …
269 flag = 0; 247 flag = 0;
270 for_all_players (pl) 248 for_all_players (pl)
271 { 249 {
272 pl->refcnt_chk (); 250 pl->refcnt_chk ();
273 251
274 if (!pl->ob || !pl->ns) 252 if (!pl->ob || !pl->ns || !pl->ob->active)
275 continue; 253 continue;
276 254
277 if (pl->ob->speed_left > 0) 255 if (pl->ob->speed_left > 0)
278 if (handle_newcs_player (pl->ob)) 256 if (handle_newcs_player (pl->ob))
279 flag = 1; 257 flag = 1;
… …
284 * player quits - they exist for purposes of tracking on the map, 262 * player quits - they exist for purposes of tracking on the map,
285 * but don't actually reside on any actual map. 263 * but don't actually reside on any actual map.
286 */ 264 */
287 if (QUERY_FLAG (pl->ob, FLAG_REMOVED)) 265 if (QUERY_FLAG (pl->ob, FLAG_REMOVED))
288 continue; 266 continue;
289
290#ifdef AUTOSAVE
291 /* check for ST_PLAYING state so that we don't try to save off when
292 * the player is logging in.
293 */
294 if ((pl->last_save_tick + AUTOSAVE) < (uint32) pticks && pl->ns->state == ST_PLAYING)
295 {
296 pl->ob->contr->save ();
297 pl->last_save_tick = pticks;
298 }
299#endif
300 } /* end of for loop for all the players */ 267 } /* end of for loop for all the players */
301 } /* for flag */ 268 } /* for flag */
302 269
303 for_all_players (pl) 270 for_all_players (pl)
304 { 271 {
305 if (!pl->ob || !pl->ns) 272 if (!pl->ob || !pl->ns || !pl->ob->active)
306 continue; 273 continue;
307 274
308 if (settings.casting_time) 275 if (settings.casting_time)
309 { 276 {
310 if (pl->ob->casting_time > 0) 277 if (pl->ob->casting_time > 0)
… …
350} 317}
351 318
352void 319void
353process_events () 320process_events ()
354{ 321{
355 object *op;
356
357 static object_ptr marker_;
358
359 if (!marker_)
360 marker_ = object::create ();
361
362 object *marker = marker_;
363
364 process_players1 (); 322 process_players1 ();
365 323
366 marker->active_next = active_objects; 324 for_all_actives (op)
367
368 if (marker->active_next)
369 marker->active_next->active_prev = marker;
370
371 marker->active_prev = 0;
372 active_objects = marker;
373
374 while (marker->active_next)
375 { 325 {
376 op = marker->active_next;
377
378 /* Move marker forward - swap op and marker */
379 op->active_prev = marker->active_prev;
380
381 if (op->active_prev)
382 op->active_prev->active_next = op;
383 else
384 active_objects = op;
385
386 marker->active_next = op->active_next;
387
388 if (marker->active_next)
389 marker->active_next->active_prev = marker;
390
391 marker->active_prev = op;
392 op->active_next = marker;
393
394 /* Now process op */ 326 /* Now process op */
395 if (QUERY_FLAG (op, FLAG_FREED)) 327 if (QUERY_FLAG (op, FLAG_FREED))
396 { 328 {
397 LOG (llevError, "BUG: process_events(): Free object on list\n"); 329 LOG (llevError, "BUG: process_events(): Free object on list\n");
398 op->set_speed (0); 330 op->set_speed (0);
… …
478 410
479 if (op->speed_left <= 0) 411 if (op->speed_left <= 0)
480 op->speed_left += FABS (op->speed); 412 op->speed_left += FABS (op->speed);
481 } 413 }
482 414
483 /* Remove marker object from active list */
484 if (marker->active_prev != NULL)
485 marker->active_prev->active_next = NULL;
486 else
487 active_objects = NULL;
488
489 process_players2 (); 415 process_players2 ();
490} 416}
491 417
492/* clean up everything before exiting */ 418/* clean up everything before exiting */
493void 419void
494emergency_save () 420emergency_save ()
495{ 421{
496 LOG (llevDebug, "emergency save begin.\n"); 422 LOG (llevDebug, "emergency save begin.\n");
497 423
498 LOG (llevDebug, "saving players.\n");
499 for_all_players (pl)
500 pl->save (1);
501
502// for_all_players (pl)
503// if (pl->ob)
504// pl->ob->remove ();
505
506 LOG (llevDebug, "saving maps.\n");
507 maptile::emergency_save (); 424 cfperl_emergency_save ();
508 425
509 LOG (llevDebug, "saving book archive.\n"); 426 LOG (llevDebug, "saving book archive.\n");
510 write_book_archive (); 427 write_book_archive ();
511 428
512 LOG (llevDebug, "emergency save done.\n"); 429 LOG (llevDebug, "emergency save done.\n");
513} 430}
514 431
432// send all clients some informational text
433static void
434cleanup_inform (const char *cause, bool make_core)
435{
436 int flags = NDI_UNIQUE | NDI_ALL | (make_core ? NDI_RED : NDI_GREEN);
437
438 new_draw_info_format (flags, 0, 0, "The server will now shutdown.\n");
439 new_draw_info_format (flags, 0, 0, "Cause for this shutdown: %s\n", cause);
440
441 if (make_core)
442 new_draw_info_format (flags, 0, 0, "This is considered a crash, but all maps and players have been saved.\n");
443 else
444 new_draw_info_format (flags, 0, 0, "This is considered to be a clean shutdown, and all maps and players have been saved.\n");
445
446 new_draw_info_format (flags, 0, 0, "%s\n", CLEANUP_MESSAGE);
447
448 flush_sockets ();
449}
450
515/* clean up everything before exiting */ 451/* clean up everything before exiting */
516void 452void
517cleanup (bool make_core) 453cleanup (const char *cause, bool make_core)
518{ 454{
455 if (make_core)
456 fork_abort (cause);
457
458 LOG (llevError, "cleanup cause: %s\n", cause);
459
460 if (!make_core)
461 cleanup_inform (cause, make_core);
462
519 LOG (llevDebug, "cleanup begin.\n"); 463 LOG (llevDebug, "cleanup begin.\n");
520 464
521 in_cleanup = true;
522
523 if (init_done && !in_cleanup) 465 if (init_done && !in_cleanup)
466 {
467 in_cleanup = true;
524 emergency_save (); 468 emergency_save ();
469 }
470 else
471 in_cleanup = true;
525 472
526 LOG (llevDebug, "running cleanup handlers.\n"); 473 LOG (llevDebug, "running cleanup handlers.\n");
527 INVOKE_GLOBAL (CLEANUP); 474 INVOKE_GLOBAL (CLEANUP);
528 475
529 LOG (llevDebug, "cleanup done.\n"); 476 LOG (llevDebug, "cleanup done.\n");
530 477
531 if (make_core) 478 if (make_core)
532 abort (); 479 {
480 cleanup_inform (cause, make_core);
481 _exit (1);
482 }
533 else 483 else
534 _exit (0); 484 _exit (0);
535}
536
537void
538leave (player *pl, int draw_exit)
539{
540 if (pl)
541 {
542 if (pl->ob->type != DEAD_OBJECT)
543 {
544 /* If a hidden dm dropped connection do not create
545 * inconsistencies by showing that they have left the game
546 */
547 if (!(QUERY_FLAG (pl->ob, FLAG_WIZ) && pl->ob->contr->hidden)
548 && draw_exit)
549 {
550 if (pl->ob->map)
551 {
552 INVOKE_PLAYER (LOGOUT, pl);
553 LOG (llevInfo, "LOGOUT: Player named %s from ip %s\n", &pl->ob->name, pl->ns->host);
554 }
555
556 char buf[MAX_BUF];
557
558 sprintf (buf, "%s left the game.", &pl->ob->name);
559 new_draw_info (NDI_UNIQUE | NDI_ALL | NDI_DK_ORANGE, 5, 0, buf);
560 }
561
562 pl->ob->remove ();
563 pl->ob->type = DEAD_OBJECT; /* To avoid problems with inventory window */
564 }
565
566 /* We do this so that the socket handling routine can do the final
567 * cleanup. We also leave that loop to actually handle the freeing
568 * of the data.
569 */
570 if (pl->ns)
571 pl->ns->destroy ();
572
573 }
574} 485}
575 486
576int 487int
577forbid_play (void) 488forbid_play (void)
578{ 489{
… …
592 503
593 while (fgets (buf, MAX_BUF, fp)) 504 while (fgets (buf, MAX_BUF, fp))
594 { 505 {
595 if (buf[0] == '#') 506 if (buf[0] == '#')
596 continue; 507 continue;
508
597 if (!strncmp (buf, "msg", 3)) 509 if (!strncmp (buf, "msg", 3))
598 { 510 {
599 if (forbit) 511 if (forbit)
600 while (fgets (buf, MAX_BUF, fp)) /* print message */ 512 while (fgets (buf, MAX_BUF, fp)) /* print message */
601 fputs (buf, logfile); 513 fputs (buf, logfile);
602 break; 514 break;
603
604 } 515 }
605 else if (sscanf (buf, "%s %d%*c%d\n", day, &start, &stop) != 3) 516 else if (sscanf (buf, "%s %d%*c%d\n", day, &start, &stop) != 3)
606 { 517 {
607 LOG (llevDebug, "Warning: Incomplete line in permission file ignored.\n"); 518 LOG (llevDebug, "Warning: Incomplete line in permission file ignored.\n");
608 continue; 519 continue;
… …
622 return 0; 533 return 0;
623#endif 534#endif
624} 535}
625 536
626/* 537/*
627 * do_specials() is a collection of functions to call from time to time. 538 * do_specials() is a collection of functions to call from time to time.
628 * Modified 2000-1-14 MSW to use the global pticks count to determine how 539 * Modified 2000-1-14 MSW to use the global pticks count to determine how
629 * often to do things. This will allow us to spred them out more often. 540 * often to do things. This will allow us to spred them out more often.
630 * I use prime numbers for the factor count - in that way, it is less likely 541 * I use prime numbers for the factor count - in that way, it is less likely
631 * these actions will fall on the same tick (compared to say using 500/2500/15000 542 * these actions will fall on the same tick (compared to say using 500/2500/15000
632 * which would mean on that 15,000 tick count a whole bunch of stuff gets 543 * which would mean on that 15,000 tick count a whole bunch of stuff gets
… …
678 attachable::check_mortals (); 589 attachable::check_mortals ();
679 590
680 ++pticks; 591 ++pticks;
681} 592}
682 593
594#if 0
595// used fro benchmarking (x86/amd64-specific)
596typedef unsigned long tval;
597typedef unsigned long long stamp64;
598
599extern inline tval
600stamp (void)
601{
602 tval tsc;
603 asm volatile ("rdtsc":"=a" (tsc)::"edx");
604
605 return tsc;
606}
607
608extern inline tval
609measure (tval t)
610{
611 tval tsc;
612 asm volatile ("rdtsc":"=a" (tsc)::"edx");
613
614 if (tsc > t)
615 return tsc - t;
616 else
617 return t - tsc;
618}
619
683int 620int
684main (int argc, char **argv) 621main (int argc, char **argv)
685{ 622{
623 rand_gen rg(0);
624 tval fastest = 0x7fffffff;
625 for (int loop = 10000; loop--; )
626 {
627 tval s = stamp ();
628 volatile int i = rg.get_int(25);
629 fastest = min (fastest, measure (s));
630 }
631
632 //printf ("fastest %d\n", fastest);
633 for (int i = 0; i < 1024*1024*3; ++i)
634 {
635 char c = rg.get_int (256);
636 write (2, &c, 1);
637 }
638}
639
640#else
641
642// normal main
643int
644main (int argc, char **argv)
645{
686 settings.argc = argc; 646 settings.argc = argc;
687 settings.argv = argv; 647 settings.argv = argv;
688 648
689 init (argc, argv); 649 init (argc, argv);
690 650
691 initPlugins (); 651 initPlugins ();
692 652
693 for (;;) 653 for (;;)
694 cfperl_main (); 654 cfperl_main ();
695
696 cleanup (true);
697} 655}
656#endif
698 657

Diff Legend

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