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.152 by root, Sun Apr 18 12:50:07 2010 UTC vs.
Revision 1.171 by root, Tue May 3 11:23:48 2011 UTC

1/* 1/*
2 * This file is part of Deliantra, the Roguelike Realtime MMORPG. 2 * This file is part of Deliantra, the Roguelike Realtime MMORPG.
3 * 3 *
4 * Copyright (©) 2005,2006,2007,2008,2009,2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team 4 * Copyright (©) 2005,2006,2007,2008,2009,2010,2011 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5 * Copyright (©) 2001-2003 Mark Wedel & Crossfire Development Team 5 * Copyright (©) 2001-2003 Mark Wedel & Crossfire Development Team
6 * Copyright (©) 1992 Frank Tore Johansen 6 * Copyright (©) 1992 Frank Tore Johansen
7 * 7 *
8 * Deliantra is free software: you can redistribute it and/or modify it under 8 * Deliantra is free software: you can redistribute it and/or modify it under
9 * the terms of the Affero GNU General Public License as published by the 9 * the terms of the Affero GNU General Public License as published by the
… …
29#include <sproto.h> 29#include <sproto.h>
30#include <time.h> 30#include <time.h>
31 31
32#include <glib.h> 32#include <glib.h>
33 33
34#include <../random_maps/random_map.h> 34#include <rmg.h>
35#include <../random_maps/rproto.h> 35#include <rproto.h>
36#include "path.h" 36#include "path.h"
37 37
38void 38void
39version (object *op) 39version (object *op)
40{ 40{
41 new_draw_info_format (NDI_UNIQUE, 0, op, "This is Deliantra v%s", VERSION); 41 new_draw_info_format (NDI_UNIQUE, 0, op, "This is Deliantra v%s", VERSION);
42} 42}
43 43
44/* This is a basic little function to put the player back to his 44/* This is a basic little function to put the player back to his
45 * savebed. We do some error checking - its possible that the 45 * savebed.
46 * savebed map may no longer exist, so we make sure the player
47 * goes someplace.
48 */ 46 */
49void 47void
50enter_player_savebed (object *op) 48enter_player_savebed (object *op)
51{ 49{
52 op->player_goto (op->contr->savebed_map, op->contr->bed_x, op->contr->bed_y); 50 op->player_goto (op->contr->savebed_map, op->contr->bed_x, op->contr->bed_y);
… …
57 * new map. map, x, y must be set. map is the map we are moving the 55 * new map. map, x, y must be set. map is the map we are moving the
58 * player to - it could be the map he just came from if the load failed for 56 * player to - it could be the map he just came from if the load failed for
59 * whatever reason. If default map coordinates are to be used, then 57 * whatever reason. If default map coordinates are to be used, then
60 * the function that calls this should figure them out. 58 * the function that calls this should figure them out.
61 */ 59 */
62void 60bool
63object::enter_map (maptile *newmap, int x, int y) 61object::enter_map (maptile *newmap, int x, int y)
64{ 62{
65 if (destroyed () || !newmap || newmap->in_memory != MAP_ACTIVE) 63 if (destroyed () || !newmap || newmap->in_memory != MAP_ACTIVE)
66 return; 64 return false;
67 65
68 if (out_of_map (newmap, x, y)) 66 if (out_of_map (newmap, x, y))
69 { 67 {
70 LOG (llevError, "enter_map: supplied coordinates are not within the map! (%s: %d, %d)\n", &newmap->path, x, y); 68 LOG (llevError, "enter_map: supplied coordinates are not within the map! (%s: %d, %d)\n", &newmap->path, x, y);
71 x = newmap->enter_x; 69 x = newmap->enter_x;
… …
73 if (out_of_map (newmap, x, y)) 71 if (out_of_map (newmap, x, y))
74 { 72 {
75 LOG (llevError, "enter_map: map %s provides invalid default enter location (%d, %d) > (%d, %d)\n", 73 LOG (llevError, "enter_map: map %s provides invalid default enter location (%d, %d) > (%d, %d)\n",
76 &newmap->path, x, y, newmap->width, newmap->height); 74 &newmap->path, x, y, newmap->width, newmap->height);
77 new_draw_info (NDI_UNIQUE, 0, this, "The exit is closed"); 75 new_draw_info (NDI_UNIQUE, 0, this, "The exit is closed");
78 return; 76 return false;
79 } 77 }
80 } 78 }
81 79
82 if (contr && map != newmap && map) 80 if (contr && map != newmap && map)
83 if (INVOKE_MAP (LEAVE, map, ARG_PLAYER (contr))) 81 if (INVOKE_MAP (LEAVE, map, ARG_PLAYER (contr)))
84 return; 82 return false;
85 83
86 // remove, so stupid ob_locked does not trigger a failure 84 // remove, so stupid blocked does not trigger a failure
87 remove (); 85 remove ();
88 86
89 /* try to find a spot for the player */ 87 /* try to find a spot for the player */
90 if (blocked (newmap, x, y)) 88 if (blocked (newmap, x, y))
91 { /* First choice blocked */ 89 { /* First choice blocked */
… …
96 * Note that for the second and third calls, we could start at a position other 94 * Note that for the second and third calls, we could start at a position other
97 * than one, but then we could end up on the other side of walls and so forth. 95 * than one, but then we could end up on the other side of walls and so forth.
98 */ 96 */
99 int i = find_free_spot (this, newmap, x, y, 1, SIZEOFFREE1 + 1); 97 int i = find_free_spot (this, newmap, x, y, 1, SIZEOFFREE1 + 1);
100 98
101 if (i == -1) 99 if (i < 0)
102 { 100 {
103 i = find_free_spot (this, newmap, x, y, 1, SIZEOFFREE2 + 1); 101 i = find_free_spot (this, newmap, x, y, 1, SIZEOFFREE2 + 1);
104 if (i == -1) 102 if (i < 0)
105 i = find_free_spot (this, newmap, x, y, 1, SIZEOFFREE); 103 i = find_free_spot (this, newmap, x, y, 1, SIZEOFFREE);
106 } 104 }
107 105
108 if (i != -1) 106 if (i >= 0)
107 {
108 maptile *m = newmap;
109 sint16 nx = x + freearr_x[i];
110 sint16 ny = y + freearr_y[i];
111
112 if (xy_normalise (m, nx, ny))
109 { 113 {
110 x += freearr_x[i]; 114 newmap = m;
111 y += freearr_y[i]; 115 x = nx;
116 y = ny;
117 }
112 } 118 }
113 else 119 else
114 /* not much we can do in this case. */ 120 /* not much we can do in this case. */
115 LOG (llevInfo, "enter_map: Could not find free spot for player - will dump on top of object (%s: %d, %d)\n", &newmap->path, x, y); 121 LOG (llevInfo, "enter_map: Could not find free spot for player - will dump on top of object (%s: %d, %d)\n", &newmap->path, x, y);
116 } 122 }
117 123
118 if (contr && map != newmap) 124 if (contr && map != newmap)
119 { 125 {
120 if (INVOKE_PLAYER (MAP_CHANGE, contr, ARG_MAP (newmap), ARG_INT (x), ARG_INT (y))) 126 if (INVOKE_PLAYER (MAP_CHANGE, contr, ARG_MAP (newmap), ARG_INT (x), ARG_INT (y)))
121 return; 127 return false;
122 128
123 if (INVOKE_MAP (ENTER, newmap, ARG_PLAYER (contr), ARG_INT (x), ARG_INT (y))) 129 if (INVOKE_MAP (ENTER, newmap, ARG_PLAYER (contr), ARG_INT (x), ARG_INT (y)))
124 return; 130 return false;
125 } 131 }
126
127 this->x = x;
128 this->y = y;
129 map = newmap;
130
131 insert_ob_in_map (this, map, 0, INS_NO_WALK_ON);
132 132
133 enemy = 0; 133 enemy = 0;
134 134
135 //newmap->insert (this, x, y);
136 newmap->insert (this, x, y, 0, INS_NO_AUTO_EXIT);
137 prefetch_surrounding_maps ();
138
139 if (map == newmap) // see if we actually arrived there - insert might trigger a teleport
140 {
135 if (contr) 141 if (contr)
136 { 142 {
137 contr->maplevel = newmap->path; 143 contr->maplevel = newmap->path;
138 contr->count = 0; 144 contr->count = 0;
139 }
140 145
141 /* Update any golems */ 146 /* Update any golems */
142 if (type == PLAYER)
143 if (object *golem = contr->golem) 147 if (object *golem = contr->golem)
144 { 148 {
145 int i = find_free_spot (golem, newmap, x, y, 1, SIZEOFFREE); 149 int i = find_free_spot (golem, newmap, x, y, 1, SIZEOFFREE);
146 150
147 if (i < 0) 151 if (i < 0)
148 golem->drop_and_destroy (); 152 golem->drop_and_destroy ();
149 else 153 else
150 { 154 {
151 newmap->insert (golem, x + freearr_x[i], y + freearr_y[i]); 155 newmap->insert (golem, x + freearr_x[i], y + freearr_y[i]);
152 golem->direction = find_dir_2 (golem->x - x, golem->y - y); 156 golem->direction = find_dir_2 (golem->x - x, golem->y - y);
157 }
153 } 158 }
154 } 159 }
155 160
156 /* since the players map is already loaded, we don't need to worry 161 /* since the players map is already loaded, we don't need to worry
157 * about pending objects. 162 * about pending objects.
158 */ 163 */
159 remove_all_pets (newmap); 164 move_all_pets ();
165
166 return true;
167 }
168
169 return false;
160} 170}
161 171
162/* process_players1 and process_players2 do all the player related stuff. 172/* process_players1 and process_players2 do all the player related stuff.
163 * I moved it out of process events and process_map. This was to some 173 * I moved it out of process events and process_map. This was to some
164 * extent for debugging as well as to get a better idea of the time used 174 * extent for debugging as well as to get a better idea of the time used
… …
235 } 245 }
236 246
237 /* Now process op */ 247 /* Now process op */
238 if (expect_false (op->flag [FLAG_FREED])) 248 if (expect_false (op->flag [FLAG_FREED]))
239 { 249 {
240 LOG (llevError, "BUG: process_events(): Free object on list\n"); 250 LOG (llevError, "BUG: process_events(): Free object on list (%s)\n", op->debug_desc ());
241 op->set_speed (0); 251 op->set_speed (0);
242 continue; 252 continue;
243 } 253 }
244 254
245 if (expect_false (!op->has_active_speed ())) 255 if (expect_false (!op->has_active_speed ()))
… …
286 296
287/* clean up everything before exiting */ 297/* clean up everything before exiting */
288void 298void
289emergency_save () 299emergency_save ()
290{ 300{
291 LOG (llevDebug, "emergency save begin.\n"); 301 LOG (llevInfo, "emergency_save: enter\n");
302
303 LOG (llevInfo, "emergency_save: saving book archive\n");
304 write_book_archive ();
292 305
293 cfperl_emergency_save (); 306 cfperl_emergency_save ();
294 307
295 LOG (llevDebug, "saving book archive.\n");
296 write_book_archive ();
297
298 LOG (llevDebug, "emergency save done.\n"); 308 LOG (llevInfo, "emergency_save: leave\n");
299} 309}
300 310
301// send all clients some informational text 311// send all clients some informational text
302static void 312static void
303cleanup_inform (const char *cause, bool make_core) 313cleanup_inform (const char *cause, bool make_core)
… …
322cleanup (const char *cause, bool make_core) 332cleanup (const char *cause, bool make_core)
323{ 333{
324 if (make_core) 334 if (make_core)
325 fork_abort (cause); 335 fork_abort (cause);
326 336
327 LOG (llevError, "cleanup cause: %s\n", cause); 337 LOG (make_core ? llevError : llevInfo, "cleanup cause: %s\n", cause);
328 338
329 if (!make_core) 339 if (!make_core)
330 cleanup_inform (cause, make_core); 340 cleanup_inform (cause, make_core);
331 341
332 LOG (llevDebug, "cleanup begin.\n"); 342 LOG (llevDebug, "cleanup begin.\n");
… …
419int 429int
420main (int argc, char **argv) 430main (int argc, char **argv)
421{ 431{
422 settings.argc = argc; 432 settings.argc = argc;
423 settings.argv = argv; 433 settings.argv = argv;
424 434
425 rndm.seed (time (0)); 435 rndm.seed (time (0));
426 g_thread_init (0); // for the slice allocator only 436 g_thread_init (0); // for the slice allocator only
427 437
438 // temporary(?) testing hack
439 if (argc >= 2 && !strcmp (argv [1], "--noise"))
440 {
441 void noise_test ();
442 noise_test ();
443 exit (0);
444 }
445
446#if 0
447 // code sometiems used for timing benchmarks
448 random_number_generator<freeciv_random_generator> rng;
449 rng.seed(0);
450 for (int i = 0; i < 10; ++i)
451 printf ("%08x\n", rng.get_u32());
452 for (int i = 0; i < 1000000; ++i)
453 volatile int r = rng.get_u32 ();
454 cstamp s = stamp ();
455 for (int i = 0; i < 1000000; ++i)
456 volatile int r = rng.next ();
457 printf ("c %d\n", (int)measure (s));
458 exit (0);
459#endif
460
428 init (argc, argv); 461 init (argc, argv);
429 462
430 for (;;) 463 for (;;)
431 cfperl_main (); 464 cfperl_main ();
432} 465}

Diff Legend

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