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.124 by root, Tue Apr 15 14:21:04 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 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>
… …
37}; 37};
38 38
39void 39void
40version (object *op) 40version (object *op)
41{ 41{
42 new_draw_info_format (NDI_UNIQUE, 0, op, "This is Crossfire+ v%s", VERSION); 42 new_draw_info_format (NDI_UNIQUE, 0, op, "This is Deliantra v%s", VERSION);
43 43
44#if 0
44 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:");
45 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>");
46 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>");
47 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>");
48 new_draw_info (NDI_UNIQUE, 0, op, ""); 49 new_draw_info (NDI_UNIQUE, 0, op, "");
… …
94 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>");
95 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>");
96 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>");
97 new_draw_info (NDI_UNIQUE, 0, op, ""); 98 new_draw_info (NDI_UNIQUE, 0, op, "");
98 new_draw_info (NDI_UNIQUE, 0, op, "And many more!"); 99 new_draw_info (NDI_UNIQUE, 0, op, "And many more!");
100#endif
99} 101}
100 102
101/* This is a basic little function to put the player back to his 103/* This is a basic little function to put the player back to his
102 * savebed. We do some error checking - its possible that the 104 * savebed. We do some error checking - its possible that the
103 * savebed map may no longer exist, so we make sure the player 105 * savebed map may no longer exist, so we make sure the player
… …
122 * the function that calls this should figure them out. 124 * the function that calls this should figure them out.
123 */ 125 */
124void 126void
125object::enter_map (maptile *newmap, int x, int y) 127object::enter_map (maptile *newmap, int x, int y)
126{ 128{
127 if (destroyed () || !newmap || newmap->in_memory != MAP_IN_MEMORY) 129 if (destroyed () || !newmap || newmap->in_memory != MAP_ACTIVE)
128 return; 130 return;
129 131
130 if (out_of_map (newmap, x, y)) 132 if (out_of_map (newmap, x, y))
131 { 133 {
132 LOG (llevError, "enter_map: supplied coordinates are not within the map! (%s: %d, %d)\n", &newmap->path, x, y); 134 LOG (llevError, "enter_map: supplied coordinates are not within the map! (%s: %d, %d)\n", &newmap->path, x, y);
… …
384 386
385 LOG (llevDebug, "running cleanup handlers.\n"); 387 LOG (llevDebug, "running cleanup handlers.\n");
386 INVOKE_GLOBAL (CLEANUP); 388 INVOKE_GLOBAL (CLEANUP);
387 389
388 LOG (llevDebug, "cleanup done.\n"); 390 LOG (llevDebug, "cleanup done.\n");
391
392 log_cleanup ();
389 393
390 if (make_core) 394 if (make_core)
391 { 395 {
392 cleanup_inform (cause, make_core); 396 cleanup_inform (cause, make_core);
393 cfperl_cleanup (make_core); 397 cfperl_cleanup (make_core);
… …
417 * doing the various things. 421 * doing the various things.
418 */ 422 */
419void 423void
420do_specials (void) 424do_specials (void)
421{ 425{
426 shstr::gc ();
427
422 if (expect_false (!(pticks % TICKS_PER_HOUR))) 428 if (expect_false (!(pticks % TICKS_PER_HOUR)))
423 adjust_daylight (); 429 adjust_daylight ();
424
425 if (expect_false (!(pticks % 7)))
426 shstr::gc ();
427 430
428 if (expect_false (!(pticks % 2503))) 431 if (expect_false (!(pticks % 2503)))
429 fix_weight (); /* Hack to fix weightproblems caused by bugs */ 432 fix_weight (); /* Hack to fix weightproblems caused by bugs */
430 433
431 if (expect_false (!(pticks % 5003))) 434 if (expect_false (!(pticks % 5003)))
… …
511 settings.argc = argc; 514 settings.argc = argc;
512 settings.argv = argv; 515 settings.argv = argv;
513 516
514 init (argc, argv); 517 init (argc, argv);
515 518
516 initPlugins ();
517
518 for (;;) 519 for (;;)
519 cfperl_main (); 520 cfperl_main ();
520} 521}
521#endif 522#endif
522 523

Diff Legend

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