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.81 by root, Sun Jan 7 02:39:14 2007 UTC vs.
Revision 1.92 by root, Tue Mar 6 03:06:00 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
… …
152 147
153 if (contr && map != newmap && map) 148 if (contr && map != newmap && map)
154 if (INVOKE_MAP (LEAVE, map, ARG_PLAYER (contr))) 149 if (INVOKE_MAP (LEAVE, map, ARG_PLAYER (contr)))
155 return; 150 return;
156 151
157 /* If it is a player login, he has yet to be inserted anyplace. 152 // remove, so stupid ob_locked does not trigger a failure
158 * otherwise, we need to deal with removing the player here.
159 */
160 remove (); 153 remove ();
161 154
162 /* try to find a spot for the player */ 155 /* try to find a spot for the player */
163 if (ob_blocked (this, newmap, x, y)) 156 if (ob_blocked (this, newmap, x, y))
164 { /* First choice blocked */ 157 { /* First choice blocked */
… …
201 this->y = y; 194 this->y = y;
202 map = newmap; 195 map = newmap;
203 196
204 insert_ob_in_map (this, map, 0, INS_NO_WALK_ON); 197 insert_ob_in_map (this, map, 0, INS_NO_WALK_ON);
205 198
206 enemy = NULL; 199 enemy = 0;
207 200
208 if (contr) 201 if (contr)
209 { 202 {
210 contr->maplevel = newmap->path; 203 contr->maplevel = newmap->path;
211 contr->count = 0; 204 contr->count = 0;
212 } 205 }
213 206
214 /* Update any golems */ 207 /* Update any golems */
215 if (type == PLAYER && contr->ranges[range_golem]) 208 if (type == PLAYER && contr->ranges[range_golem])
216 { 209 {
217 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);
218 x, y, 1, SIZEOFFREE);
219 211
220 contr->ranges[range_golem]->remove ();
221
222 if (i == -1) 212 if (i < 0)
223 { 213 {
224 remove_friendly_object (contr->ranges[range_golem]);
225 contr->ranges[range_golem]->destroy (); 214 contr->ranges[range_golem]->destroy ();
226 contr->ranges[range_golem] = 0; 215 contr->ranges[range_golem] = 0;
227 } 216 }
228 else 217 else
229 { 218 {
230 for (object *tmp = contr->ranges[range_golem]; tmp != NULL; tmp = tmp->more) 219 newmap->insert (contr->ranges[range_golem], x + freearr_x[i], y + freearr_y[i]);
231 {
232 tmp->x = x + freearr_x[i] + (tmp->arch ? 0 : tmp->arch->clone.x);
233 tmp->y = y + freearr_y[i] + (tmp->arch ? 0 : tmp->arch->clone.y);
234 tmp->map = newmap;
235 }
236 220
237 insert_ob_in_map (contr->ranges[range_golem], newmap, NULL, 0);
238 contr->ranges[range_golem]->direction = 221 contr->ranges[range_golem]->direction =
239 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);
240 } 223 }
241 } 224 }
242 225
… …
267 pl->refcnt_chk (); 250 pl->refcnt_chk ();
268 251
269 if (!pl->ob || !pl->ns || !pl->ob->active) 252 if (!pl->ob || !pl->ns || !pl->ob->active)
270 continue; 253 continue;
271 254
272 if (pl->ob->speed_left > 0) 255 if (pl->ob->speed_left > 0 && pl->ns)
273 if (handle_newcs_player (pl->ob)) 256 if (handle_newcs_player (pl->ob))
274 flag = 1; 257 flag = 1;
275 258
276 /* If the player is not actively playing, don't make a 259 /* If the player is not actively playing, don't make a
277 * backup save - nothing to save anyway. Plus, the 260 * backup save - nothing to save anyway. Plus, the
… …
387 /* Animate the object. Bug or feature that anim_speed 370 /* Animate the object. Bug or feature that anim_speed
388 * is based on ticks, and not the creatures speed? 371 * is based on ticks, and not the creatures speed?
389 */ 372 */
390 if (op->anim_speed && op->last_anim >= op->anim_speed) 373 if (op->anim_speed && op->last_anim >= op->anim_speed)
391 { 374 {
392 if ((op->type == PLAYER)) 375 animate_object (op, op->type == PLAYER ? op->facing : op->direction);
393 animate_object (op, op->facing);
394 else
395 animate_object (op, op->direction);
396 376
397 op->last_anim = 1; 377 op->last_anim = 1;
398 } 378 }
399 else 379 else
400 op->last_anim++; 380 op->last_anim++;
… …
436void 416void
437emergency_save () 417emergency_save ()
438{ 418{
439 LOG (llevDebug, "emergency save begin.\n"); 419 LOG (llevDebug, "emergency save begin.\n");
440 420
441 maptile::emergency_save (); 421 cfperl_emergency_save ();
442 422
443 LOG (llevDebug, "saving book archive.\n"); 423 LOG (llevDebug, "saving book archive.\n");
444 write_book_archive (); 424 write_book_archive ();
445 425
446 LOG (llevDebug, "emergency save done.\n"); 426 LOG (llevDebug, "emergency save done.\n");
… …
448 428
449// send all clients some informational text 429// send all clients some informational text
450static void 430static void
451cleanup_inform (const char *cause, bool make_core) 431cleanup_inform (const char *cause, bool make_core)
452{ 432{
433 int flags = NDI_UNIQUE | NDI_ALL | (make_core ? NDI_RED : NDI_GREEN);
434
453 new_draw_info_format (NDI_UNIQUE | NDI_ALL | NDI_RED, 0, 0, "The server will now shutdown.\n"); 435 new_draw_info_format (flags, 0, 0, "The server will now shutdown.\n");
454 new_draw_info_format (NDI_UNIQUE | NDI_ALL | NDI_RED, 0, 0, "Cause for this shtudown: %s\n", cause); 436 new_draw_info_format (flags, 0, 0, "Cause for this shutdown: %s\n", cause);
455 437
456 if (make_core) 438 if (make_core)
457 new_draw_info_format (NDI_UNIQUE | NDI_ALL | NDI_RED, 0, 0, "This is considered a crash.\n"); 439 new_draw_info_format (flags, 0, 0, "This is considered a crash, but all maps and players have been saved.\n");
458 else 440 else
459 new_draw_info_format (NDI_UNIQUE | NDI_ALL | NDI_RED, 0, 0, "This is considered to be a clean shutdown.\n"); 441 new_draw_info_format (flags, 0, 0, "This is considered to be a clean shutdown, and all maps and players will be saved now.\n");
460 442
461 new_draw_info_format (NDI_UNIQUE | NDI_ALL | NDI_RED, 0, 0, "%s\n", CLEANUP_MESSAGE); 443 new_draw_info_format (flags, 0, 0, "%s\n", CLEANUP_MESSAGE);
462 444
463 flush_sockets (); 445 flush_sockets ();
464} 446}
465 447
466/* clean up everything before exiting */ 448/* clean up everything before exiting */
467void 449void
468cleanup (const char *cause, bool make_core) 450cleanup (const char *cause, bool make_core)
469{ 451{
452 if (make_core)
453 fork_abort (cause);
454
470 LOG (llevError, "cleanup cause: %s\n", cause); 455 LOG (llevError, "cleanup cause: %s\n", cause);
471 456
472 if (!make_core) 457 if (!make_core)
473 cleanup_inform (cause, make_core); 458 cleanup_inform (cause, make_core);
474 459
… …
488 LOG (llevDebug, "cleanup done.\n"); 473 LOG (llevDebug, "cleanup done.\n");
489 474
490 if (make_core) 475 if (make_core)
491 { 476 {
492 cleanup_inform (cause, make_core); 477 cleanup_inform (cause, make_core);
493 abort (); 478 cfperl_cleanup (make_core);
479 _exit (1);
494 } 480 }
495 else 481 else
482 {
483 new_draw_info_format (NDI_UNIQUE | NDI_ALL | NDI_GREEN, 0, 0, "Maps and players successfully saved, exiting.\n");
484 new_draw_info_format (NDI_UNIQUE | NDI_ALL | NDI_GREEN, 0, 0, "And again: " CLEANUP_MESSAGE "\n");
485 flush_sockets ();
486 cfperl_cleanup (make_core);
496 _exit (0); 487 _exit (0);
488 }
497} 489}
498 490
499int 491int
500forbid_play (void) 492forbid_play (void)
501{ 493{
… …
601 attachable::check_mortals (); 593 attachable::check_mortals ();
602 594
603 ++pticks; 595 ++pticks;
604} 596}
605 597
598#if 0
599// used fro benchmarking (x86/amd64-specific)
600typedef unsigned long tval;
601typedef unsigned long long stamp64;
602
603extern inline tval
604stamp (void)
605{
606 tval tsc;
607 asm volatile ("rdtsc":"=a" (tsc)::"edx");
608
609 return tsc;
610}
611
612extern inline tval
613measure (tval t)
614{
615 tval tsc;
616 asm volatile ("rdtsc":"=a" (tsc)::"edx");
617
618 if (tsc > t)
619 return tsc - t;
620 else
621 return t - tsc;
622}
623
606int 624int
607main (int argc, char **argv) 625main (int argc, char **argv)
608{ 626{
627 rand_gen rg(0);
628 tval fastest = 0x7fffffff;
629 for (int loop = 10000; loop--; )
630 {
631 tval s = stamp ();
632 volatile int i = rg.get_int(25);
633 fastest = min (fastest, measure (s));
634 }
635
636 //printf ("fastest %d\n", fastest);
637 for (int i = 0; i < 1024*1024*3; ++i)
638 {
639 char c = rg.get_int (256);
640 write (2, &c, 1);
641 }
642}
643
644#else
645
646// normal main
647int
648main (int argc, char **argv)
649{
609 settings.argc = argc; 650 settings.argc = argc;
610 settings.argv = argv; 651 settings.argv = argv;
611 652
612 init (argc, argv); 653 init (argc, argv);
654 init_environ ();
613 655
614 initPlugins (); 656 initPlugins ();
615 657
616 for (;;) 658 for (;;)
617 cfperl_main (); 659 cfperl_main ();
618} 660}
661#endif
619 662

Diff Legend

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