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.139 by root, Mon Oct 12 14:00:59 2009 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 it under
9 * it under the terms of the GNU General Public License as published by 9 * the terms of the Affero GNU General Public License as published by the
10 * the Free Software Foundation, either version 3 of the License, or 10 * Free Software Foundation, either version 3 of the License, or (at your
11 * (at your option) any later version. 11 * 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,
14 * but WITHOUT ANY WARRANTY; without even the implied warranty of 14 * but WITHOUT ANY WARRANTY; without even the implied warranty of
15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
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 Affero GNU General Public License
19 * along with this program. If not, see <http://www.gnu.org/licenses/>. 19 * and the GNU General Public License along with this program. If not, see
20 * <http://www.gnu.org/licenses/>.
20 * 21 *
21 * The authors can be reached via e-mail to <crossfire@schmorp.de> 22 * The authors can be reached via e-mail to <support@deliantra.net>
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#include <sproto.h> 29#include <sproto.h>
29#include <time.h> 30#include <time.h>
30 31
32#include <glib.h>
33
31#include <../random_maps/random_map.h> 34#include <../random_maps/random_map.h>
32#include <../random_maps/rproto.h> 35#include <../random_maps/rproto.h>
33#include "path.h" 36#include "path.h"
34 37
35static char days[7][4] = { 38static char days[7][4] = {
… …
37}; 40};
38 41
39void 42void
40version (object *op) 43version (object *op)
41{ 44{
42 new_draw_info_format (NDI_UNIQUE, 0, op, "This is Crossfire+ v%s", VERSION); 45 new_draw_info_format (NDI_UNIQUE, 0, op, "This is Deliantra v%s", VERSION);
43 46
47#if 0
44 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:");
45 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>");
46 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>");
47 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>");
48 new_draw_info (NDI_UNIQUE, 0, op, ""); 52 new_draw_info (NDI_UNIQUE, 0, op, "");
… …
94 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>");
95 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>");
96 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>");
97 new_draw_info (NDI_UNIQUE, 0, op, ""); 101 new_draw_info (NDI_UNIQUE, 0, op, "");
98 new_draw_info (NDI_UNIQUE, 0, op, "And many more!"); 102 new_draw_info (NDI_UNIQUE, 0, op, "And many more!");
103#endif
99} 104}
100 105
101/* This is a basic little function to put the player back to his 106/* This is a basic little function to put the player back to his
102 * savebed. We do some error checking - its possible that the 107 * savebed. We do some error checking - its possible that the
103 * savebed map may no longer exist, so we make sure the player 108 * savebed map may no longer exist, so we make sure the player
104 * goes someplace. 109 * goes someplace.
105 */ 110 */
106void 111void
107enter_player_savebed (object *op) 112enter_player_savebed (object *op)
108{ 113{
109 object *tmp = object::create (); 114 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} 115}
116 116
117/* 117/*
118 * enter_map(): Moves the player and pets from current map (if any) to 118 * 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 119 * 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. 122 * the function that calls this should figure them out.
123 */ 123 */
124void 124void
125object::enter_map (maptile *newmap, int x, int y) 125object::enter_map (maptile *newmap, int x, int y)
126{ 126{
127 if (destroyed () || !newmap || newmap->in_memory != MAP_IN_MEMORY) 127 if (destroyed () || !newmap || newmap->in_memory != MAP_ACTIVE)
128 return; 128 return;
129 129
130 if (out_of_map (newmap, x, y)) 130 if (out_of_map (newmap, x, y))
131 { 131 {
132 LOG (llevError, "enter_map: supplied coordinates are not within the map! (%s: %d, %d)\n", &newmap->path, x, y); 132 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) 205 if (object *golem = contr->golem)
206 { 206 {
207 int i = find_free_spot (golem, newmap, x, y, 1, SIZEOFFREE); 207 int i = find_free_spot (golem, newmap, x, y, 1, SIZEOFFREE);
208 208
209 if (i < 0) 209 if (i < 0)
210 golem->destroy (); 210 golem->drop_and_destroy ();
211 else 211 else
212 { 212 {
213 newmap->insert (golem, x + freearr_x[i], y + freearr_y[i]); 213 newmap->insert (golem, x + freearr_x[i], y + freearr_y[i]);
214 golem->direction = find_dir_2 (x - golem->x, y - golem->y); 214 golem->direction = find_dir_2 (x - golem->x, y - golem->y);
215 } 215 }
… …
309 op->last_anim = 1; 309 op->last_anim = 1;
310 } 310 }
311 else 311 else
312 ++op->last_anim; 312 ++op->last_anim;
313 313
314 if (op->speed_left > 0.f) 314 if (expect_false (op->speed_left > 0.f))
315 { 315 {
316 --op->speed_left; 316 --op->speed_left;
317 process_object (op); 317 process_object (op);
318
319 if (op->destroyed ())
320 continue;
321 } 318 }
322 319
323 if (!op->contr) 320 if (expect_true (!op->contr))
324 op->speed_left = min (abs (op->speed), op->speed_left + abs (op->speed)); 321 op->speed_left = min (abs (op->speed), op->speed_left + abs (op->speed));
325 } 322 }
326 323
327 process_players2 (); 324 process_players2 ();
328} 325}
… …
385 LOG (llevDebug, "running cleanup handlers.\n"); 382 LOG (llevDebug, "running cleanup handlers.\n");
386 INVOKE_GLOBAL (CLEANUP); 383 INVOKE_GLOBAL (CLEANUP);
387 384
388 LOG (llevDebug, "cleanup done.\n"); 385 LOG (llevDebug, "cleanup done.\n");
389 386
387 log_cleanup ();
388
390 if (make_core) 389 if (make_core)
391 {
392 cleanup_inform (cause, make_core); 390 cleanup_inform (cause, make_core);
393 cfperl_cleanup (make_core);
394 _exit (1);
395 }
396 else 391 else
397 { 392 {
398 new_draw_info_format (NDI_REPLY | NDI_UNIQUE | NDI_ALL | NDI_GREEN, 0, 0, "Maps and players successfully saved, exiting."); 393 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); 394 new_draw_info_format (NDI_REPLY | NDI_UNIQUE | NDI_ALL | NDI_GREEN, 0, 0, "And again: " CLEANUP_MESSAGE);
400 client::flush_sockets (); 395 client::flush_sockets ();
396 }
397
401 cfperl_cleanup (make_core); 398 cfperl_cleanup (make_core);
402 _exit (0); 399 _exit (make_core);
403 }
404} 400}
405 401
406/* 402/*
407 * do_specials() is a collection of functions to call from time to time. 403 * 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 404 * Modified 2000-1-14 MSW to use the global pticks count to determine how
… …
417 * doing the various things. 413 * doing the various things.
418 */ 414 */
419void 415void
420do_specials (void) 416do_specials (void)
421{ 417{
418 shstr::gc ();
419 archetype::gc ();
420
422 if (expect_false (!(pticks % TICKS_PER_HOUR))) 421 if (expect_false (!(pticks % TICKS_PER_HOUR)))
423 adjust_daylight (); 422 maptile::adjust_daylight ();
424
425 if (expect_false (!(pticks % 7)))
426 shstr::gc ();
427 423
428 if (expect_false (!(pticks % 2503))) 424 if (expect_false (!(pticks % 2503)))
429 fix_weight (); /* Hack to fix weightproblems caused by bugs */ 425 fix_weight (); /* Hack to fix weightproblems caused by bugs */
430 426
431 if (expect_false (!(pticks % 5003))) 427 if (expect_false (!(pticks % 5003)))
… …
454 attachable::check_mortals (); 450 attachable::check_mortals ();
455 451
456 ++pticks; 452 ++pticks;
457} 453}
458 454
459#if 0
460// used fro benchmarking (x86/amd64-specific)
461typedef unsigned long tval;
462typedef unsigned long long stamp64;
463
464extern inline tval
465stamp (void)
466{
467 tval tsc;
468 asm volatile ("rdtsc":"=a" (tsc)::"edx");
469
470 return tsc;
471}
472
473extern inline tval
474measure (tval t)
475{
476 tval tsc;
477 asm volatile ("rdtsc":"=a" (tsc)::"edx");
478
479 if (tsc > t)
480 return tsc - t;
481 else
482 return t - tsc;
483}
484
485int
486main (int argc, char **argv)
487{
488 rand_gen rg(0);
489 tval fastest = 0x7fffffff;
490 for (int loop = 10000; loop--; )
491 {
492 tval s = stamp ();
493 volatile int i = rg.get_int(25);
494 fastest = min (fastest, measure (s));
495 }
496
497 //printf ("fastest %d\n", fastest);
498 for (int i = 0; i < 1024*1024*3; ++i)
499 {
500 char c = rg.get_int (256);
501 write (2, &c, 1);
502 }
503}
504
505#else
506
507// normal main 455// normal main
508int 456int
509main (int argc, char **argv) 457main (int argc, char **argv)
510{ 458{
511 settings.argc = argc; 459 settings.argc = argc;
512 settings.argv = argv; 460 settings.argv = argv;
461
462 rndm.seed (time (0));
463 g_thread_init (0); // for the slice allocator only
513 464
514 init (argc, argv); 465 init (argc, argv);
515
516 initPlugins ();
517 466
518 for (;;) 467 for (;;)
519 cfperl_main (); 468 cfperl_main ();
520} 469}
521#endif
522 470
523#if 0
524int xyzzy ()
525{
526 return rndm(8);
527}
528
529void xyzzy (object_ptr &a, object_ptr &o)
530{
531 asm volatile ("int3");
532 a = o;
533 asm volatile ("int3");
534}
535#endif
536

Diff Legend

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