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.117 by root, Wed Sep 12 11:10:11 2007 UTC vs.
Revision 1.132 by root, Mon Sep 29 10:20:49 2008 UTC

1/* 1/*
2 * This file is part of Crossfire TRT, the Roguelike Realtime MORPG. 2 * This file is part of Deliantra, the Roguelike Realtime MMORPG.
3 * 3 *
4 * Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Crossfire TRT team 4 * Copyright (©) 2005,2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5 * Copyright (©) 2001-2003,2007 Mark Wedel & Crossfire Development Team 5 * Copyright (©) 2001-2003,2007 Mark Wedel & Crossfire Development Team
6 * Copyright (©) 1992,2007 Frank Tore Johansen 6 * Copyright (©) 1992,2007 Frank Tore Johansen
7 * 7 *
8 * Crossfire TRT is free software: you can redistribute it and/or modify 8 * Deliantra 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 3 of the License, or 10 * the Free Software Foundation, either version 3 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,
… …
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, see <http://www.gnu.org/licenses/>. 19 * along with this program. If not, see <http://www.gnu.org/licenses/>.
20 * 20 *
21 * The authors can be reached via e-mail to <crossfire@schmorp.de> 21 * The authors can be reached via e-mail to <support@deliantra.net>
22 */ 22 */
23 23
24#include <global.h> 24#include <global.h>
25#include <object.h> 25#include <object.h>
26#include <tod.h> 26#include <tod.h>
27 27
28#include <sproto.h> 28#include <sproto.h>
29#include <time.h> 29#include <time.h>
30 30
31#include <glib.h>
32
31#include <../random_maps/random_map.h> 33#include <../random_maps/random_map.h>
32#include <../random_maps/rproto.h> 34#include <../random_maps/rproto.h>
33#include "path.h" 35#include "path.h"
34 36
35static char days[7][4] = { 37static char days[7][4] = {
… …
37}; 39};
38 40
39void 41void
40version (object *op) 42version (object *op)
41{ 43{
42 new_draw_info_format (NDI_UNIQUE, 0, op, "This is Crossfire+ v%s", VERSION); 44 new_draw_info_format (NDI_UNIQUE, 0, op, "This is Deliantra v%s", VERSION);
43 45
46#if 0
44 new_draw_info (NDI_UNIQUE, 0, op, "Authors and contributors to this program:"); 47 new_draw_info (NDI_UNIQUE, 0, op, "Authors and contributors to this program:");
45 new_draw_info (NDI_UNIQUE, 0, op, "Marc A. Lehmann <pcg@goof.com>"); 48 new_draw_info (NDI_UNIQUE, 0, op, "Marc A. Lehmann <pcg@goof.com>");
46 new_draw_info (NDI_UNIQUE, 0, op, "Robin Redeker <elmex@x-paste.de>"); 49 new_draw_info (NDI_UNIQUE, 0, op, "Robin Redeker <elmex@x-paste.de>");
47 new_draw_info (NDI_UNIQUE, 0, op, "Pippijn van Steenhoven <pip88nl@gmail.com>"); 50 new_draw_info (NDI_UNIQUE, 0, op, "Pippijn van Steenhoven <pip88nl@gmail.com>");
48 new_draw_info (NDI_UNIQUE, 0, op, ""); 51 new_draw_info (NDI_UNIQUE, 0, op, "");
… …
94 new_draw_info (NDI_UNIQUE, 0, op, "Mitsuhiro Itakura <ita@gold.koma.jaeri.go.jp>"); 97 new_draw_info (NDI_UNIQUE, 0, op, "Mitsuhiro Itakura <ita@gold.koma.jaeri.go.jp>");
95 new_draw_info (NDI_UNIQUE, 0, op, "Hansjoerg Malthaner <hansjoerg.malthaner@danet.de>"); 98 new_draw_info (NDI_UNIQUE, 0, op, "Hansjoerg Malthaner <hansjoerg.malthaner@danet.de>");
96 new_draw_info (NDI_UNIQUE, 0, op, "Mårten Woxberg <maxmc@telia.com>"); 99 new_draw_info (NDI_UNIQUE, 0, op, "Mårten Woxberg <maxmc@telia.com>");
97 new_draw_info (NDI_UNIQUE, 0, op, ""); 100 new_draw_info (NDI_UNIQUE, 0, op, "");
98 new_draw_info (NDI_UNIQUE, 0, op, "And many more!"); 101 new_draw_info (NDI_UNIQUE, 0, op, "And many more!");
102#endif
99} 103}
100 104
101/* 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
102 * savebed. We do some error checking - its possible that the 106 * savebed. We do some error checking - its possible that the
103 * savebed map may no longer exist, so we make sure the player 107 * savebed map may no longer exist, so we make sure the player
104 * goes someplace. 108 * goes someplace.
105 */ 109 */
106void 110void
107enter_player_savebed (object *op) 111enter_player_savebed (object *op)
108{ 112{
109 object *tmp = object::create (); 113 op->player_goto (op->contr->savebed_map, op->contr->bed_x, op->contr->bed_y);
110 EXIT_PATH (tmp) = op->contr->savebed_map;
111 EXIT_X (tmp) = op->contr->bed_x;
112 EXIT_Y (tmp) = op->contr->bed_y;
113 op->enter_exit (tmp);
114 tmp->destroy ();
115} 114}
116 115
117/* 116/*
118 * enter_map(): Moves the player and pets from current map (if any) to 117 * enter_map(): Moves the player and pets from current map (if any) to
119 * new map. map, x, y must be set. map is the map we are moving the 118 * new map. map, x, y must be set. map is the map we are moving the
… …
122 * the function that calls this should figure them out. 121 * the function that calls this should figure them out.
123 */ 122 */
124void 123void
125object::enter_map (maptile *newmap, int x, int y) 124object::enter_map (maptile *newmap, int x, int y)
126{ 125{
127 if (destroyed () || !newmap || newmap->in_memory != MAP_IN_MEMORY) 126 if (destroyed () || !newmap || newmap->in_memory != MAP_ACTIVE)
128 return; 127 return;
129 128
130 if (out_of_map (newmap, x, y)) 129 if (out_of_map (newmap, x, y))
131 { 130 {
132 LOG (llevError, "enter_map: supplied coordinates are not within the map! (%s: %d, %d)\n", &newmap->path, x, y); 131 LOG (llevError, "enter_map: supplied coordinates are not within the map! (%s: %d, %d)\n", &newmap->path, x, y);
… …
205 if (object *golem = contr->golem) 204 if (object *golem = contr->golem)
206 { 205 {
207 int i = find_free_spot (golem, newmap, x, y, 1, SIZEOFFREE); 206 int i = find_free_spot (golem, newmap, x, y, 1, SIZEOFFREE);
208 207
209 if (i < 0) 208 if (i < 0)
209 {
210 golem->destroy_inv (true); // be explicit about dropping
210 golem->destroy (); 211 golem->destroy (true);
212 }
211 else 213 else
212 { 214 {
213 newmap->insert (golem, x + freearr_x[i], y + freearr_y[i]); 215 newmap->insert (golem, x + freearr_x[i], y + freearr_y[i]);
214 golem->direction = find_dir_2 (x - golem->x, y - golem->y); 216 golem->direction = find_dir_2 (x - golem->x, y - golem->y);
215 } 217 }
… …
309 op->last_anim = 1; 311 op->last_anim = 1;
310 } 312 }
311 else 313 else
312 ++op->last_anim; 314 ++op->last_anim;
313 315
314 if (op->speed_left > 0.f) 316 if (expect_false (op->speed_left > 0.f))
315 { 317 {
316 --op->speed_left; 318 --op->speed_left;
317 process_object (op); 319 process_object (op);
318
319 if (op->destroyed ())
320 continue;
321 } 320 }
322 321
323 if (!op->contr) 322 if (expect_true (!op->contr))
324 op->speed_left = min (abs (op->speed), op->speed_left + abs (op->speed)); 323 op->speed_left = min (abs (op->speed), op->speed_left + abs (op->speed));
325 } 324 }
326 325
327 process_players2 (); 326 process_players2 ();
328} 327}
… …
385 LOG (llevDebug, "running cleanup handlers.\n"); 384 LOG (llevDebug, "running cleanup handlers.\n");
386 INVOKE_GLOBAL (CLEANUP); 385 INVOKE_GLOBAL (CLEANUP);
387 386
388 LOG (llevDebug, "cleanup done.\n"); 387 LOG (llevDebug, "cleanup done.\n");
389 388
389 log_cleanup ();
390
390 if (make_core) 391 if (make_core)
391 {
392 cleanup_inform (cause, make_core); 392 cleanup_inform (cause, make_core);
393 cfperl_cleanup (make_core);
394 _exit (1);
395 }
396 else 393 else
397 { 394 {
398 new_draw_info_format (NDI_REPLY | NDI_UNIQUE | NDI_ALL | NDI_GREEN, 0, 0, "Maps and players successfully saved, exiting."); 395 new_draw_info_format (NDI_REPLY | NDI_UNIQUE | NDI_ALL | NDI_GREEN, 0, 0, "Maps and players successfully saved, exiting.");
399 new_draw_info_format (NDI_REPLY | NDI_UNIQUE | NDI_ALL | NDI_GREEN, 0, 0, "And again: " CLEANUP_MESSAGE); 396 new_draw_info_format (NDI_REPLY | NDI_UNIQUE | NDI_ALL | NDI_GREEN, 0, 0, "And again: " CLEANUP_MESSAGE);
400 client::flush_sockets (); 397 client::flush_sockets ();
398 }
399
401 cfperl_cleanup (make_core); 400 cfperl_cleanup (make_core);
402 _exit (0); 401 _exit (make_core);
403 }
404} 402}
405 403
406/* 404/*
407 * do_specials() is a collection of functions to call from time to time. 405 * do_specials() is a collection of functions to call from time to time.
408 * Modified 2000-1-14 MSW to use the global pticks count to determine how 406 * Modified 2000-1-14 MSW to use the global pticks count to determine how
… …
417 * doing the various things. 415 * doing the various things.
418 */ 416 */
419void 417void
420do_specials (void) 418do_specials (void)
421{ 419{
420 shstr::gc ();
421 archetype::gc ();
422
422 if (expect_false (!(pticks % TICKS_PER_HOUR))) 423 if (expect_false (!(pticks % TICKS_PER_HOUR)))
423 adjust_daylight (); 424 adjust_daylight ();
424
425 if (expect_false (!(pticks % 7)))
426 shstr::gc ();
427 425
428 if (expect_false (!(pticks % 2503))) 426 if (expect_false (!(pticks % 2503)))
429 fix_weight (); /* Hack to fix weightproblems caused by bugs */ 427 fix_weight (); /* Hack to fix weightproblems caused by bugs */
430 428
431 if (expect_false (!(pticks % 5003))) 429 if (expect_false (!(pticks % 5003)))
… …
502 } 500 }
503} 501}
504 502
505#else 503#else
506 504
505#if 0 // just goofing around, look elsewhere
506
507#include <malloc.h>
508#include <execinfo.h>
509
510static void tr_on ();
511static void tr_off ();
512
513static SMUTEX(tr_mutex);
514
515#define ltr_off() SMUTEX_LOCK (tr_mutex); tr_off ()
516#define ltr_on() tr_on (); SMUTEX_UNLOCK (tr_mutex);
517
518static void *
519tr_malloc (size_t size, const void *caller)
520{
521 ltr_off ();
522
523 void *bt [8];
524 backtrace (bt, 8);
525
526 void *ptr = malloc (size);
527
528 ltr_on ();
529 return (char *)ptr;
530}
531
532static void
533tr_free (void *ptr, const void *caller)
534{
535 ltr_off ();
536
537 free (ptr);
538
539 ltr_on ();
540}
541
542void static *
543tr_realloc (void *ptr, size_t size, const void *caller)
544{
545 ltr_off ();
546
547 void *nptr = realloc (ptr, size);
548
549 ltr_on ();
550 return nptr;
551}
552
553static void *
554tr_memalign (size_t size, size_t alignment, const void *caller)
555{
556 ltr_off ();
557
558 void *ptr = memalign (size, alignment < 16 ? 16 : alignment);
559
560 ltr_on ();
561 return ptr;
562}
563
564static void
565tr_on ()
566{
567 __malloc_hook = tr_malloc;
568 __realloc_hook = tr_realloc;
569 __free_hook = tr_free;
570 __memalign_hook = tr_memalign;
571}
572
573static void
574tr_off ()
575{
576 __malloc_hook = 0;
577 __realloc_hook = 0;
578 __free_hook = 0;
579 __memalign_hook = 0;
580}
581
582void (*__malloc_initialize_hook)(void) = tr_on;
583
584#endif
585
507// normal main 586// normal main
508int 587int
509main (int argc, char **argv) 588main (int argc, char **argv)
510{ 589{
511 settings.argc = argc; 590 settings.argc = argc;
512 settings.argv = argv; 591 settings.argv = argv;
513 592
593 g_thread_init (0); // for the slice allocator only
594
514 init (argc, argv); 595 init (argc, argv);
515
516 initPlugins ();
517 596
518 for (;;) 597 for (;;)
519 cfperl_main (); 598 cfperl_main ();
520} 599}
521#endif 600#endif

Diff Legend

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