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.69 by root, Sun Dec 31 17:17:23 2006 UTC vs.
Revision 1.92 by root, Tue Mar 6 03:06:00 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 (destroyed () || !newmap) 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 && map != newmap) 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
196 if (map != newmap && contr) 184 if (contr && map != newmap)
197 { 185 {
198 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)))
199 return; 187 return;
200 188
201 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)))
… …
206 this->y = y; 194 this->y = y;
207 map = newmap; 195 map = newmap;
208 196
209 insert_ob_in_map (this, map, 0, INS_NO_WALK_ON); 197 insert_ob_in_map (this, map, 0, INS_NO_WALK_ON);
210 198
211 enemy = NULL; 199 enemy = 0;
212 200
213 if (contr) 201 if (contr)
214 { 202 {
215 strcpy (contr->maplevel, newmap->path); 203 contr->maplevel = newmap->path;
216 contr->count = 0; 204 contr->count = 0;
217 } 205 }
218 206
219 /* Update any golems */ 207 /* Update any golems */
220 if (type == PLAYER && contr->ranges[range_golem]) 208 if (type == PLAYER && contr->ranges[range_golem])
221 { 209 {
222 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);
223 x, y, 1, SIZEOFFREE);
224 211
225 contr->ranges[range_golem]->remove ();
226
227 if (i == -1) 212 if (i < 0)
228 { 213 {
229 remove_friendly_object (contr->ranges[range_golem]);
230 contr->ranges[range_golem]->destroy (); 214 contr->ranges[range_golem]->destroy ();
231 contr->ranges[range_golem] = 0; 215 contr->ranges[range_golem] = 0;
232 } 216 }
233 else 217 else
234 { 218 {
235 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]);
236 {
237 tmp->x = x + freearr_x[i] + (tmp->arch == NULL ? 0 : tmp->arch->clone.x);
238 tmp->y = y + freearr_y[i] + (tmp->arch == NULL ? 0 : tmp->arch->clone.y);
239 tmp->map = newmap;
240 }
241 220
242 insert_ob_in_map (contr->ranges[range_golem], newmap, NULL, 0);
243 contr->ranges[range_golem]->direction = 221 contr->ranges[range_golem]->direction =
244 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);
245 } 223 }
246 } 224 }
247
248 direction = 0;
249 225
250 /* 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
251 * about pending objects. 227 * about pending objects.
252 */ 228 */
253 remove_all_pets (newmap); 229 remove_all_pets (newmap);
… …
271 flag = 0; 247 flag = 0;
272 for_all_players (pl) 248 for_all_players (pl)
273 { 249 {
274 pl->refcnt_chk (); 250 pl->refcnt_chk ();
275 251
276 if (!pl->ob || !pl->ns || !pl->ob->active ()) 252 if (!pl->ob || !pl->ns || !pl->ob->active)
277 continue; 253 continue;
278 254
279 if (pl->ob->speed_left > 0) 255 if (pl->ob->speed_left > 0 && pl->ns)
280 if (handle_newcs_player (pl->ob)) 256 if (handle_newcs_player (pl->ob))
281 flag = 1; 257 flag = 1;
282 258
283 /* If the player is not actively playing, don't make a 259 /* If the player is not actively playing, don't make a
284 * backup save - nothing to save anyway. Plus, the 260 * backup save - nothing to save anyway. Plus, the
… …
286 * player quits - they exist for purposes of tracking on the map, 262 * player quits - they exist for purposes of tracking on the map,
287 * but don't actually reside on any actual map. 263 * but don't actually reside on any actual map.
288 */ 264 */
289 if (QUERY_FLAG (pl->ob, FLAG_REMOVED)) 265 if (QUERY_FLAG (pl->ob, FLAG_REMOVED))
290 continue; 266 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 }
301#endif
302 } /* end of for loop for all the players */ 267 } /* end of for loop for all the players */
303 } /* for flag */ 268 } /* for flag */
304 269
305 for_all_players (pl) 270 for_all_players (pl)
306 { 271 {
307 if (!pl->ob || !pl->ns || !pl->ob->active ()) 272 if (!pl->ob || !pl->ns || !pl->ob->active)
308 continue; 273 continue;
309 274
310 if (settings.casting_time) 275 if (settings.casting_time)
311 { 276 {
312 if (pl->ob->casting_time > 0) 277 if (pl->ob->casting_time > 0)
… …
352} 317}
353 318
354void 319void
355process_events () 320process_events ()
356{ 321{
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 (); 322 process_players1 ();
367 323
368 marker->active_next = active_objects; 324 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 { 325 {
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 */ 326 /* Now process op */
397 if (QUERY_FLAG (op, FLAG_FREED)) 327 if (QUERY_FLAG (op, FLAG_FREED))
398 { 328 {
399 LOG (llevError, "BUG: process_events(): Free object on list\n"); 329 LOG (llevError, "BUG: process_events(): Free object on list\n");
400 op->set_speed (0); 330 op->set_speed (0);
… …
440 /* Animate the object. Bug or feature that anim_speed 370 /* Animate the object. Bug or feature that anim_speed
441 * is based on ticks, and not the creatures speed? 371 * is based on ticks, and not the creatures speed?
442 */ 372 */
443 if (op->anim_speed && op->last_anim >= op->anim_speed) 373 if (op->anim_speed && op->last_anim >= op->anim_speed)
444 { 374 {
445 if ((op->type == PLAYER)) 375 animate_object (op, op->type == PLAYER ? op->facing : op->direction);
446 animate_object (op, op->facing);
447 else
448 animate_object (op, op->direction);
449 376
450 op->last_anim = 1; 377 op->last_anim = 1;
451 } 378 }
452 else 379 else
453 op->last_anim++; 380 op->last_anim++;
… …
480 407
481 if (op->speed_left <= 0) 408 if (op->speed_left <= 0)
482 op->speed_left += FABS (op->speed); 409 op->speed_left += FABS (op->speed);
483 } 410 }
484 411
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
491 process_players2 (); 412 process_players2 ();
492} 413}
493 414
494/* clean up everything before exiting */ 415/* clean up everything before exiting */
495void 416void
496emergency_save () 417emergency_save ()
497{ 418{
498 LOG (llevDebug, "emergency save begin.\n"); 419 LOG (llevDebug, "emergency save begin.\n");
499 420
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 (); 421 cfperl_emergency_save ();
510 422
511 LOG (llevDebug, "saving book archive.\n"); 423 LOG (llevDebug, "saving book archive.\n");
512 write_book_archive (); 424 write_book_archive ();
513 425
514 LOG (llevDebug, "emergency save done.\n"); 426 LOG (llevDebug, "emergency save done.\n");
515} 427}
516 428
429// send all clients some informational text
430static void
431cleanup_inform (const char *cause, bool make_core)
432{
433 int flags = NDI_UNIQUE | NDI_ALL | (make_core ? NDI_RED : NDI_GREEN);
434
435 new_draw_info_format (flags, 0, 0, "The server will now shutdown.\n");
436 new_draw_info_format (flags, 0, 0, "Cause for this shutdown: %s\n", cause);
437
438 if (make_core)
439 new_draw_info_format (flags, 0, 0, "This is considered a crash, but all maps and players have been saved.\n");
440 else
441 new_draw_info_format (flags, 0, 0, "This is considered to be a clean shutdown, and all maps and players will be saved now.\n");
442
443 new_draw_info_format (flags, 0, 0, "%s\n", CLEANUP_MESSAGE);
444
445 flush_sockets ();
446}
447
517/* clean up everything before exiting */ 448/* clean up everything before exiting */
518void 449void
519cleanup (bool make_core) 450cleanup (const char *cause, bool make_core)
520{ 451{
452 if (make_core)
453 fork_abort (cause);
454
455 LOG (llevError, "cleanup cause: %s\n", cause);
456
457 if (!make_core)
458 cleanup_inform (cause, make_core);
459
521 LOG (llevDebug, "cleanup begin.\n"); 460 LOG (llevDebug, "cleanup begin.\n");
522 461
523 if (init_done && !in_cleanup) 462 if (init_done && !in_cleanup)
524 { 463 {
525 in_cleanup = true; 464 in_cleanup = true;
… …
532 INVOKE_GLOBAL (CLEANUP); 471 INVOKE_GLOBAL (CLEANUP);
533 472
534 LOG (llevDebug, "cleanup done.\n"); 473 LOG (llevDebug, "cleanup done.\n");
535 474
536 if (make_core) 475 if (make_core)
537 abort (); 476 {
477 cleanup_inform (cause, make_core);
478 cfperl_cleanup (make_core);
479 _exit (1);
480 }
538 else 481 else
482 {
483 new_draw_info_format (NDI_UNIQUE | NDI_ALL | NDI_GREEN, 0, 0, "Maps and players successfully saved, exiting.\n");
484 new_draw_info_format (NDI_UNIQUE | NDI_ALL | NDI_GREEN, 0, 0, "And again: " CLEANUP_MESSAGE "\n");
485 flush_sockets ();
486 cfperl_cleanup (make_core);
539 _exit (0); 487 _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 } 488 }
579} 489}
580 490
581int 491int
582forbid_play (void) 492forbid_play (void)
… …
597 507
598 while (fgets (buf, MAX_BUF, fp)) 508 while (fgets (buf, MAX_BUF, fp))
599 { 509 {
600 if (buf[0] == '#') 510 if (buf[0] == '#')
601 continue; 511 continue;
512
602 if (!strncmp (buf, "msg", 3)) 513 if (!strncmp (buf, "msg", 3))
603 { 514 {
604 if (forbit) 515 if (forbit)
605 while (fgets (buf, MAX_BUF, fp)) /* print message */ 516 while (fgets (buf, MAX_BUF, fp)) /* print message */
606 fputs (buf, logfile); 517 fputs (buf, logfile);
607 break; 518 break;
608
609 } 519 }
610 else if (sscanf (buf, "%s %d%*c%d\n", day, &start, &stop) != 3) 520 else if (sscanf (buf, "%s %d%*c%d\n", day, &start, &stop) != 3)
611 { 521 {
612 LOG (llevDebug, "Warning: Incomplete line in permission file ignored.\n"); 522 LOG (llevDebug, "Warning: Incomplete line in permission file ignored.\n");
613 continue; 523 continue;
… …
627 return 0; 537 return 0;
628#endif 538#endif
629} 539}
630 540
631/* 541/*
632 * do_specials() is a collection of functions to call from time to time. 542 * 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 543 * 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. 544 * 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 545 * 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 546 * 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 547 * which would mean on that 15,000 tick count a whole bunch of stuff gets
… …
683 attachable::check_mortals (); 593 attachable::check_mortals ();
684 594
685 ++pticks; 595 ++pticks;
686} 596}
687 597
598#if 0
599// used fro benchmarking (x86/amd64-specific)
600typedef unsigned long tval;
601typedef unsigned long long stamp64;
602
603extern inline tval
604stamp (void)
605{
606 tval tsc;
607 asm volatile ("rdtsc":"=a" (tsc)::"edx");
608
609 return tsc;
610}
611
612extern inline tval
613measure (tval t)
614{
615 tval tsc;
616 asm volatile ("rdtsc":"=a" (tsc)::"edx");
617
618 if (tsc > t)
619 return tsc - t;
620 else
621 return t - tsc;
622}
623
688int 624int
689main (int argc, char **argv) 625main (int argc, char **argv)
690{ 626{
627 rand_gen rg(0);
628 tval fastest = 0x7fffffff;
629 for (int loop = 10000; loop--; )
630 {
631 tval s = stamp ();
632 volatile int i = rg.get_int(25);
633 fastest = min (fastest, measure (s));
634 }
635
636 //printf ("fastest %d\n", fastest);
637 for (int i = 0; i < 1024*1024*3; ++i)
638 {
639 char c = rg.get_int (256);
640 write (2, &c, 1);
641 }
642}
643
644#else
645
646// normal main
647int
648main (int argc, char **argv)
649{
691 settings.argc = argc; 650 settings.argc = argc;
692 settings.argv = argv; 651 settings.argv = argv;
693 652
694 init (argc, argv); 653 init (argc, argv);
654 init_environ ();
695 655
696 initPlugins (); 656 initPlugins ();
697 657
698 for (;;) 658 for (;;)
699 cfperl_main (); 659 cfperl_main ();
700
701 cleanup (true);
702} 660}
661#endif
703 662

Diff Legend

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