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.127 by root, Sat May 3 15:24:34 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>
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
… …
122 * the function that calls this should figure them out. 126 * the function that calls this should figure them out.
123 */ 127 */
124void 128void
125object::enter_map (maptile *newmap, int x, int y) 129object::enter_map (maptile *newmap, int x, int y)
126{ 130{
127 if (destroyed () || !newmap || newmap->in_memory != MAP_IN_MEMORY) 131 if (destroyed () || !newmap || newmap->in_memory != MAP_ACTIVE)
128 return; 132 return;
129 133
130 if (out_of_map (newmap, x, y)) 134 if (out_of_map (newmap, x, y))
131 { 135 {
132 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);
… …
309 op->last_anim = 1; 313 op->last_anim = 1;
310 } 314 }
311 else 315 else
312 ++op->last_anim; 316 ++op->last_anim;
313 317
314 if (op->speed_left > 0.f) 318 if (expect_false (op->speed_left > 0.f))
315 { 319 {
316 --op->speed_left; 320 --op->speed_left;
317 process_object (op); 321 process_object (op);
318
319 if (op->destroyed ())
320 continue;
321 } 322 }
322 323
323 if (!op->contr) 324 if (expect_true (!op->contr))
324 op->speed_left = min (abs (op->speed), op->speed_left + abs (op->speed)); 325 op->speed_left = min (abs (op->speed), op->speed_left + abs (op->speed));
325 } 326 }
326 327
327 process_players2 (); 328 process_players2 ();
328} 329}
… …
384 385
385 LOG (llevDebug, "running cleanup handlers.\n"); 386 LOG (llevDebug, "running cleanup handlers.\n");
386 INVOKE_GLOBAL (CLEANUP); 387 INVOKE_GLOBAL (CLEANUP);
387 388
388 LOG (llevDebug, "cleanup done.\n"); 389 LOG (llevDebug, "cleanup done.\n");
390
391 log_cleanup ();
389 392
390 if (make_core) 393 if (make_core)
391 { 394 {
392 cleanup_inform (cause, make_core); 395 cleanup_inform (cause, make_core);
393 cfperl_cleanup (make_core); 396 cfperl_cleanup (make_core);
… …
417 * doing the various things. 420 * doing the various things.
418 */ 421 */
419void 422void
420do_specials (void) 423do_specials (void)
421{ 424{
425 shstr::gc ();
426 archetype::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)))
… …
509main (int argc, char **argv) 512main (int argc, char **argv)
510{ 513{
511 settings.argc = argc; 514 settings.argc = argc;
512 settings.argv = argv; 515 settings.argv = argv;
513 516
517 g_thread_init (0); // for the slice allocator only
518
514 init (argc, argv); 519 init (argc, argv);
515
516 initPlugins ();
517 520
518 for (;;) 521 for (;;)
519 cfperl_main (); 522 cfperl_main ();
520} 523}
521#endif 524#endif

Diff Legend

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