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.83 by root, Tue Jan 9 21:32:42 2007 UTC vs.
Revision 1.87 by root, Thu Jan 18 19:32:37 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) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team
5 Copyright (C) 2001-2003 Mark Wedel & Crossfire Development Team 5 * Copyright (C) 2001-2003 Mark Wedel & Crossfire Development Team
6 Copyright (C) 1992 Frank Tore Johansen 6 * Copyright (C) 1992 Frank Tore Johansen
7 7 *
8 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
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 2 of the License, or 10 * the Free Software Foundation; either version 2 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,
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 GNU General Public License
19 along with this program; if not, write to the Free Software 19 * along with this program; if not, write to the Free Software
20 Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 20 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
21 21 *
22 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>
23*/ 23 */
24 24
25#include <global.h> 25#include <global.h>
26#include <object.h> 26#include <object.h>
27#include <tod.h> 27#include <tod.h>
28
29#ifdef HAVE_DES_H
30# include <des.h>
31#else
32# ifdef HAVE_CRYPT_H
33# include <crypt.h>
34# endif
35#endif
36 28
37#include <sproto.h> 29#include <sproto.h>
38#include <time.h> 30#include <time.h>
39 31
40#include <../random_maps/random_map.h> 32#include <../random_maps/random_map.h>
… …
55 47
56 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:");
57 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>");
58 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>");
59 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:");
60 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>");
61 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>");
62 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>");
63 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>");
64 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>");
… …
95 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>");
96 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>");
97 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>");
98 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>");
99 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");
100 94 new_draw_info (NDI_UNIQUE, 0, op, "");
101 new_draw_info (NDI_UNIQUE, 0, op, "Images and art:"); 95 new_draw_info (NDI_UNIQUE, 0, op, "Images and art:");
102 new_draw_info (NDI_UNIQUE, 0, op, "Peter Gardner"); 96 new_draw_info (NDI_UNIQUE, 0, op, "Peter Gardner");
103 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>");
104 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>");
105 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>");
106 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, "");
107 new_draw_info (NDI_UNIQUE, 0, op, "And many more!"); 102 new_draw_info (NDI_UNIQUE, 0, op, "And many more!");
108} 103}
109 104
110/* 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
111 * savebed. We do some error checking - its possible that the 106 * savebed. We do some error checking - its possible that the
… …
210 } 205 }
211 206
212 /* Update any golems */ 207 /* Update any golems */
213 if (type == PLAYER && contr->ranges[range_golem]) 208 if (type == PLAYER && contr->ranges[range_golem])
214 { 209 {
215 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);
216 x, y, 1, SIZEOFFREE);
217 211
218 if (i == -1) 212 if (i < 0)
219 { 213 {
220 contr->ranges[range_golem]->destroy (); 214 contr->ranges[range_golem]->destroy ();
221 contr->ranges[range_golem] = 0; 215 contr->ranges[range_golem] = 0;
222 } 216 }
223 else 217 else
224 { 218 {
225 for (object *tmp = contr->ranges[range_golem]; tmp; tmp = tmp->more) 219 newmap->insert (contr->ranges[range_golem], x + freearr_x[i], y + freearr_y[i]);
226 {
227 tmp->x = x + freearr_x[i] + (tmp->arch ? 0 : tmp->arch->clone.x);
228 tmp->y = y + freearr_y[i] + (tmp->arch ? 0 : tmp->arch->clone.y);
229 tmp->map = newmap;
230 }
231 220
232 insert_ob_in_map (contr->ranges[range_golem], newmap, NULL, 0);
233 contr->ranges[range_golem]->direction = 221 contr->ranges[range_golem]->direction =
234 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);
235 } 223 }
236 } 224 }
237 225
… …
446cleanup_inform (const char *cause, bool make_core) 434cleanup_inform (const char *cause, bool make_core)
447{ 435{
448 int flags = NDI_UNIQUE | NDI_ALL | (make_core ? NDI_RED : NDI_GREEN); 436 int flags = NDI_UNIQUE | NDI_ALL | (make_core ? NDI_RED : NDI_GREEN);
449 437
450 new_draw_info_format (flags, 0, 0, "The server will now shutdown.\n"); 438 new_draw_info_format (flags, 0, 0, "The server will now shutdown.\n");
451 new_draw_info_format (flags, 0, 0, "Cause for this shtudown: %s\n", cause); 439 new_draw_info_format (flags, 0, 0, "Cause for this shutdown: %s\n", cause);
452 440
453 if (make_core) 441 if (make_core)
454 new_draw_info_format (flags, 0, 0, "This is considered a crash.\n"); 442 new_draw_info_format (flags, 0, 0, "This is considered a crash, but all maps and players have been saved.\n");
455 else 443 else
456 new_draw_info_format (flags, 0, 0, "This is considered to be a clean shutdown.\n"); 444 new_draw_info_format (flags, 0, 0, "This is considered to be a clean shutdown, and all maps and players have been saved.\n");
457 445
458 new_draw_info_format (flags, 0, 0, "%s\n", CLEANUP_MESSAGE); 446 new_draw_info_format (flags, 0, 0, "%s\n", CLEANUP_MESSAGE);
459 447
460 flush_sockets (); 448 flush_sockets ();
461} 449}
462 450
463/* clean up everything before exiting */ 451/* clean up everything before exiting */
464void 452void
465cleanup (const char *cause, bool make_core) 453cleanup (const char *cause, bool make_core)
466{ 454{
455 if (make_core)
456 fork_abort (cause);
457
467 LOG (llevError, "cleanup cause: %s\n", cause); 458 LOG (llevError, "cleanup cause: %s\n", cause);
468 459
469 if (!make_core) 460 if (!make_core)
470 cleanup_inform (cause, make_core); 461 cleanup_inform (cause, make_core);
471 462
… …
485 LOG (llevDebug, "cleanup done.\n"); 476 LOG (llevDebug, "cleanup done.\n");
486 477
487 if (make_core) 478 if (make_core)
488 { 479 {
489 cleanup_inform (cause, make_core); 480 cleanup_inform (cause, make_core);
490 abort (); 481 _exit (1);
491 } 482 }
492 else 483 else
493 _exit (0); 484 _exit (0);
494} 485}
495 486
… …
598 attachable::check_mortals (); 589 attachable::check_mortals ();
599 590
600 ++pticks; 591 ++pticks;
601} 592}
602 593
594#if 0
595// used fro benchmarking (x86/amd64-specific)
596typedef unsigned long tval;
597typedef unsigned long long stamp64;
598
599extern inline tval
600stamp (void)
601{
602 tval tsc;
603 asm volatile ("rdtsc":"=a" (tsc)::"edx");
604
605 return tsc;
606}
607
608extern inline tval
609measure (tval t)
610{
611 tval tsc;
612 asm volatile ("rdtsc":"=a" (tsc)::"edx");
613
614 if (tsc > t)
615 return tsc - t;
616 else
617 return t - tsc;
618}
619
603int 620int
604main (int argc, char **argv) 621main (int argc, char **argv)
605{ 622{
623 rand_gen rg(0);
624 tval fastest = 0x7fffffff;
625 for (int loop = 10000; loop--; )
626 {
627 tval s = stamp ();
628 volatile int i = rg.get_int(25);
629 fastest = min (fastest, measure (s));
630 }
631
632 //printf ("fastest %d\n", fastest);
633 for (int i = 0; i < 1024*1024*3; ++i)
634 {
635 char c = rg.get_int (256);
636 write (2, &c, 1);
637 }
638}
639
640#else
641
642// normal main
643int
644main (int argc, char **argv)
645{
606 settings.argc = argc; 646 settings.argc = argc;
607 settings.argv = argv; 647 settings.argv = argv;
608 648
609 init (argc, argv); 649 init (argc, argv);
610 650
611 initPlugins (); 651 initPlugins ();
612 652
613 for (;;) 653 for (;;)
614 cfperl_main (); 654 cfperl_main ();
615} 655}
656#endif
616 657

Diff Legend

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