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.155 by root, Wed Apr 21 06:45:57 2010 UTC vs.
Revision 1.168 by root, Fri Apr 22 02:03:12 2011 UTC

… …
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 blocked 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 */
… …
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 >= 0) 106 if (i >= 0)
109 { 107 {
108 maptile *m = newmap;
110 x += freearr_x[i]; 109 sint16 nx = x + freearr_x[i];
111 y += freearr_y[i]; 110 sint16 ny = y + freearr_y[i];
111
112 if (xy_normalise (m, nx, ny))
113 {
114 newmap = m;
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 newmap->insert (this, x, y, 0, INS_NO_WALK_ON);
128 132
129 enemy = 0; 133 enemy = 0;
130 134
135 //newmap->insert (this, x, y);
136 newmap->insert (this, x, y, 0, INS_NO_AUTO_EXIT);
137
138 if (map == newmap) // see if we actually arrived there - insert might trigger a teleport
139 {
131 if (contr) 140 if (contr)
132 { 141 {
133 contr->maplevel = newmap->path; 142 contr->maplevel = newmap->path;
134 contr->count = 0; 143 contr->count = 0;
135 }
136 144
137 /* Update any golems */ 145 /* Update any golems */
138 if (type == PLAYER)
139 if (object *golem = contr->golem) 146 if (object *golem = contr->golem)
140 { 147 {
141 int i = find_free_spot (golem, newmap, x, y, 1, SIZEOFFREE); 148 int i = find_free_spot (golem, newmap, x, y, 1, SIZEOFFREE);
142 149
143 if (i < 0) 150 if (i < 0)
144 golem->drop_and_destroy (); 151 golem->drop_and_destroy ();
145 else 152 else
146 { 153 {
147 newmap->insert (golem, x + freearr_x[i], y + freearr_y[i]); 154 newmap->insert (golem, x + freearr_x[i], y + freearr_y[i]);
148 golem->direction = find_dir_2 (golem->x - x, golem->y - y); 155 golem->direction = find_dir_2 (golem->x - x, golem->y - y);
156 }
149 } 157 }
150 } 158 }
151 159
152 /* since the players map is already loaded, we don't need to worry 160 /* since the players map is already loaded, we don't need to worry
153 * about pending objects. 161 * about pending objects.
154 */ 162 */
155 remove_all_pets (newmap); 163 move_all_pets ();
164
165 return true;
166 }
167
168 return false;
156} 169}
157 170
158/* process_players1 and process_players2 do all the player related stuff. 171/* process_players1 and process_players2 do all the player related stuff.
159 * I moved it out of process events and process_map. This was to some 172 * I moved it out of process events and process_map. This was to some
160 * extent for debugging as well as to get a better idea of the time used 173 * extent for debugging as well as to get a better idea of the time used
… …
231 } 244 }
232 245
233 /* Now process op */ 246 /* Now process op */
234 if (expect_false (op->flag [FLAG_FREED])) 247 if (expect_false (op->flag [FLAG_FREED]))
235 { 248 {
236 LOG (llevError, "BUG: process_events(): Free object on list\n"); 249 LOG (llevError, "BUG: process_events(): Free object on list (%s)\n", op->debug_desc ());
237 op->set_speed (0); 250 op->set_speed (0);
238 continue; 251 continue;
239 } 252 }
240 253
241 if (expect_false (!op->has_active_speed ())) 254 if (expect_false (!op->has_active_speed ()))
… …
282 295
283/* clean up everything before exiting */ 296/* clean up everything before exiting */
284void 297void
285emergency_save () 298emergency_save ()
286{ 299{
287 LOG (llevDebug, "emergency save begin.\n"); 300 LOG (llevInfo, "emergency_save: enter\n");
301
302 LOG (llevInfo, "emergency_save: saving book archive\n");
303 write_book_archive ();
288 304
289 cfperl_emergency_save (); 305 cfperl_emergency_save ();
290 306
291 LOG (llevDebug, "saving book archive.\n");
292 write_book_archive ();
293
294 LOG (llevDebug, "emergency save done.\n"); 307 LOG (llevInfo, "emergency_save: leave\n");
295} 308}
296 309
297// send all clients some informational text 310// send all clients some informational text
298static void 311static void
299cleanup_inform (const char *cause, bool make_core) 312cleanup_inform (const char *cause, bool make_core)
… …
318cleanup (const char *cause, bool make_core) 331cleanup (const char *cause, bool make_core)
319{ 332{
320 if (make_core) 333 if (make_core)
321 fork_abort (cause); 334 fork_abort (cause);
322 335
323 LOG (llevError, "cleanup cause: %s\n", cause); 336 LOG (make_core ? llevError : llevInfo, "cleanup cause: %s\n", cause);
324 337
325 if (!make_core) 338 if (!make_core)
326 cleanup_inform (cause, make_core); 339 cleanup_inform (cause, make_core);
327 340
328 LOG (llevDebug, "cleanup begin.\n"); 341 LOG (llevDebug, "cleanup begin.\n");
… …
415int 428int
416main (int argc, char **argv) 429main (int argc, char **argv)
417{ 430{
418 settings.argc = argc; 431 settings.argc = argc;
419 settings.argv = argv; 432 settings.argv = argv;
420 433
421 rndm.seed (time (0)); 434 rndm.seed (time (0));
422 g_thread_init (0); // for the slice allocator only 435 g_thread_init (0); // for the slice allocator only
423 436
437#if 0
438 extern void hack(); hack ();//D
439#endif
440
441#if 0
442 // code sometiems used for timing benchmarks
443 random_number_generator<freeciv_random_generator> rng;
444 rng.seed(0);
445 for (int i = 0; i < 10; ++i)
446 printf ("%08x\n", rng.get_u32());
447 for (int i = 0; i < 1000000; ++i)
448 volatile int r = rng.get_u32 ();
449 cstamp s = stamp ();
450 for (int i = 0; i < 1000000; ++i)
451 volatile int r = rng.next ();
452 printf ("c %d\n", (int)measure (s));
453 exit (0);
454#endif
455
424 init (argc, argv); 456 init (argc, argv);
425 457
426 for (;;) 458 for (;;)
427 cfperl_main (); 459 cfperl_main ();
428} 460}

Diff Legend

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