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.63 by root, Sat Dec 30 16:56:16 2006 UTC vs.
Revision 1.103 by root, Sun May 13 15:13:57 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) 2001-2003 Mark Wedel & Crossfire Development Team 5 * Copyright (C) 2001-2003 Mark Wedel & Crossfire Development Team
5 Copyright (C) 1992 Frank Tore Johansen 6 * Copyright (C) 1992 Frank Tore Johansen
6 7 *
7 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
8 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
9 the Free Software Foundation; either version 2 of the License, or 10 * the Free Software Foundation; either version 2 of the License, or
10 (at your option) any later version. 11 * (at your option) any later version.
11 12 *
12 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,
13 but WITHOUT ANY WARRANTY; without even the implied warranty of 14 * but WITHOUT ANY WARRANTY; without even the implied warranty of
14 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
15 GNU General Public License for more details. 16 * GNU General Public License for more details.
16 17 *
17 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
18 along with this program; if not, write to the Free Software 19 * along with this program; if not, write to the Free Software
19 Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 20 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
20 21 *
21 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>
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#ifdef HAVE_DES_H
29# include <des.h>
30#else
31# ifdef HAVE_CRYPT_H
32# include <crypt.h>
33# endif
34#endif
35
36#include <sproto.h> 29#include <sproto.h>
37#include <time.h> 30#include <time.h>
38 31
39#include <../random_maps/random_map.h> 32#include <../random_maps/random_map.h>
40#include <../random_maps/rproto.h> 33#include <../random_maps/rproto.h>
… …
45}; 38};
46 39
47void 40void
48version (object *op) 41version (object *op)
49{ 42{
50 if (op != NULL) 43 if (op)
51 clear_win_info (op); 44 clear_win_info (op);
52 45
53 new_draw_info_format (NDI_UNIQUE, 0, op, "This is Crossfire v%s", VERSION); 46 new_draw_info_format (NDI_UNIQUE, 0, op, "This is Crossfire+ v%s", VERSION);
54
55/* If in a socket, don't print out the list of authors. It confuses the
56 * crossclient program.
57 */
58 if (op == NULL)
59 return;
60 47
61 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:");
62 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>");
63 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>");
64 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:");
65 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>");
66 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>");
67 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>");
68 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>");
69 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>");
70 new_draw_info (NDI_UNIQUE, 0, op, "Dougal Scott <dougal.scott@fcit.monasu.edu.au>"); 59 new_draw_info (NDI_UNIQUE, 0, op, "Dougal Scott <dougal.scott@fcit.monasu.edu.au>");
71 new_draw_info (NDI_UNIQUE, 0, op, "William <wchuang@athena.mit.edu>"); 60 new_draw_info (NDI_UNIQUE, 0, op, "William <wchuang@athena.mit.edu>");
72 new_draw_info (NDI_UNIQUE, 0, op, "Geoff Bailey <ftww@cs.su.oz.au>"); 61 new_draw_info (NDI_UNIQUE, 0, op, "Geoff Bailey <ftww@cs.su.oz.au>");
73 new_draw_info (NDI_UNIQUE, 0, op, "Kjetil Wiekhorst Jxrgensen <jorgens@flipper.pvv.unit.no>"); 62 new_draw_info (NDI_UNIQUE, 0, op, "Kjetil Wiekhorst Jørgensen <jorgens@flipper.pvv.unit.no>");
74 new_draw_info (NDI_UNIQUE, 0, op, "Cameron Blackwood <c.blackwood@rdt.monash.edu.au>"); 63 new_draw_info (NDI_UNIQUE, 0, op, "Cameron Blackwood <c.blackwood@rdt.monash.edu.au>");
75 new_draw_info (NDI_UNIQUE, 0, op, "Joseph L. Traub <jtraub+@cmu.edu>"); 64 new_draw_info (NDI_UNIQUE, 0, op, "Joseph L. Traub <jtraub+@cmu.edu>");
76 new_draw_info (NDI_UNIQUE, 0, op, "Rupert G. Goldie <rgg@aaii.oz.au>"); 65 new_draw_info (NDI_UNIQUE, 0, op, "Rupert G. Goldie <rgg@aaii.oz.au>");
77 new_draw_info (NDI_UNIQUE, 0, op, "Eric A. Anderson <eanders+@cmu.edu>"); 66 new_draw_info (NDI_UNIQUE, 0, op, "Eric A. Anderson <eanders+@cmu.edu>");
78 new_draw_info (NDI_UNIQUE, 0, op, "Rickard Eneqvist <eneq@Prag.DoCS.UU.SE>"); 67 new_draw_info (NDI_UNIQUE, 0, op, "Rickard Eneqvist <eneq@Prag.DoCS.UU.SE>");
… …
100 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>");
101 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>");
102 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>");
103 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>");
104 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");
105 94 new_draw_info (NDI_UNIQUE, 0, op, "");
106 new_draw_info (NDI_UNIQUE, 0, op, "Images and art:"); 95 new_draw_info (NDI_UNIQUE, 0, op, "Images and art:");
107 new_draw_info (NDI_UNIQUE, 0, op, "Peter Gardner"); 96 new_draw_info (NDI_UNIQUE, 0, op, "Peter Gardner");
108 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>");
109 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>");
110 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>");
111 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, "");
112 new_draw_info (NDI_UNIQUE, 0, op, "And many more!"); 102 new_draw_info (NDI_UNIQUE, 0, op, "And many more!");
113} 103}
114 104
115/* 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
116 * savebed. We do some error checking - its possible that the 106 * savebed. We do some error checking - its possible that the
… …
136 * the function that calls this should figure them out. 126 * the function that calls this should figure them out.
137 */ 127 */
138void 128void
139object::enter_map (maptile *newmap, int x, int y) 129object::enter_map (maptile *newmap, int x, int y)
140{ 130{
141 if (!newmap->load ()) 131 if (destroyed () || !newmap || newmap->in_memory != MAP_IN_MEMORY)
142 return; 132 return;
143 133
144 if (out_of_map (newmap, x, y)) 134 if (out_of_map (newmap, x, y))
145 { 135 {
146 LOG (llevError, "enter_map: supplied coordinates are not within the map! (%s: %d, %d)\n", &newmap->path, x, y); 136 LOG (llevError, "enter_map: supplied coordinates are not within the map! (%s: %d, %d)\n", &newmap->path, x, y);
… …
152 &newmap->path, x, y, newmap->width, newmap->height); 142 &newmap->path, x, y, newmap->width, newmap->height);
153 new_draw_info (NDI_UNIQUE, 0, this, "The exit is closed"); 143 new_draw_info (NDI_UNIQUE, 0, this, "The exit is closed");
154 return; 144 return;
155 } 145 }
156 } 146 }
147
148 if (contr && map != newmap && map)
149 if (INVOKE_MAP (LEAVE, map, ARG_PLAYER (contr)))
150 return;
151
152 // remove, so stupid ob_locked does not trigger a failure
153 remove ();
157 154
158 /* try to find a spot for the player */ 155 /* try to find a spot for the player */
159 if (ob_blocked (this, newmap, x, y)) 156 if (ob_blocked (this, newmap, x, y))
160 { /* First choice blocked */ 157 { /* First choice blocked */
161 /* We try to find a spot for the player, starting closest in. 158 /* We try to find a spot for the player, starting closest in.
… …
182 else 179 else
183 /* not much we can do in this case. */ 180 /* not much we can do in this case. */
184 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); 181 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);
185 } 182 }
186 183
187 if (map) 184 if (contr && map != newmap)
188 if (INVOKE_MAP (LEAVE, map, ARG_PLAYER (contr))) 185 {
189 return;
190
191 if (INVOKE_PLAYER (MAP_CHANGE, contr, ARG_MAP (newmap), ARG_INT (x), ARG_INT (y))) 186 if (INVOKE_PLAYER (MAP_CHANGE, contr, ARG_MAP (newmap), ARG_INT (x), ARG_INT (y)))
192 return; 187 return;
193 188
194 if (INVOKE_MAP (ENTER, newmap, ARG_PLAYER (contr), ARG_INT (x), ARG_INT (y))) 189 if (INVOKE_MAP (ENTER, newmap, ARG_PLAYER (contr), ARG_INT (x), ARG_INT (y)))
195 return; 190 return;
196 191 }
197 /* If it is a player login, he has yet to be inserted anyplace.
198 * otherwise, we need to deal with removing the player here.
199 */
200 remove ();
201 192
202 this->x = x; 193 this->x = x;
203 this->y = y; 194 this->y = y;
204 map = newmap; 195 map = newmap;
205 196
206 insert_ob_in_map (this, map, 0, INS_NO_WALK_ON); 197 insert_ob_in_map (this, map, 0, INS_NO_WALK_ON);
207 198
208 newmap->timeout = 0;
209 enemy = NULL; 199 enemy = 0;
210 200
211 if (contr) 201 if (contr)
212 { 202 {
213 strcpy (contr->maplevel, newmap->path); 203 contr->maplevel = newmap->path;
214 contr->count = 0; 204 contr->count = 0;
215 } 205 }
216 206
217 /* Update any golems */ 207 /* Update any golems */
218 if (type == PLAYER && contr->ranges[range_golem]) 208 if (type == PLAYER)
219 { 209 if (object *golem = contr->golem)
220 int i = find_free_spot (contr->ranges[range_golem], newmap,
221 x, y, 1, SIZEOFFREE);
222
223 contr->ranges[range_golem]->remove ();
224
225 if (i == -1)
226 { 210 {
227 remove_friendly_object (contr->ranges[range_golem]); 211 int i = find_free_spot (golem, newmap, x, y, 1, SIZEOFFREE);
228 contr->ranges[range_golem]->destroy (); 212
229 contr->ranges[range_golem] = 0; 213 if (i < 0)
230 } 214 golem->destroy ();
231 else 215 else
232 {
233 for (object *tmp = contr->ranges[range_golem]; tmp != NULL; tmp = tmp->more)
234 { 216 {
235 tmp->x = x + freearr_x[i] + (tmp->arch == NULL ? 0 : tmp->arch->clone.x); 217 newmap->insert (golem, x + freearr_x[i], y + freearr_y[i]);
236 tmp->y = y + freearr_y[i] + (tmp->arch == NULL ? 0 : tmp->arch->clone.y); 218 golem->direction = find_dir_2 (x - golem->x, y - golem->y);
237 tmp->map = newmap;
238 } 219 }
239
240 insert_ob_in_map (contr->ranges[range_golem], newmap, NULL, 0);
241 contr->ranges[range_golem]->direction =
242 find_dir_2 (x - contr->ranges[range_golem]->x, y - contr->ranges[range_golem]->y);
243 } 220 }
244 }
245
246 direction = 0;
247 221
248 /* since the players map is already loaded, we don't need to worry 222 /* since the players map is already loaded, we don't need to worry
249 * about pending objects. 223 * about pending objects.
250 */ 224 */
251 remove_all_pets (newmap); 225 remove_all_pets (newmap);
252}
253
254/* clean_path takes a path and replaces all / with _
255 * We do a strcpy so that we do not change the original string.
256 */
257char *
258clean_path (const char *file)
259{
260 static char newpath[MAX_BUF], *cp;
261 assign (newpath, file);
262
263 for (cp = newpath; *cp != '\0'; cp++)
264 if (*cp == '/')
265 *cp = '_';
266
267 return newpath;
268}
269
270/* unclean_path takes a path and replaces all _ with /
271 * This basically undoes clean path.
272 * We do a strcpy so that we do not change the original string.
273 * We are smart enough to start after the last / in case we
274 * are getting passed a string that points to a unique map
275 * path.
276 */
277char *
278unclean_path (const char *src)
279{
280 static char newpath[MAX_BUF], *cp;
281
282 cp = strrchr (src, '/');
283 assign (newpath, cp ? cp + 1 : src);
284
285 for (cp = newpath; *cp != '\0'; cp++)
286 if (*cp == '_')
287 *cp = '/';
288
289 return newpath;
290} 226}
291 227
292/* process_players1 and process_players2 do all the player related stuff. 228/* process_players1 and process_players2 do all the player related stuff.
293 * I moved it out of process events and process_map. This was to some 229 * I moved it out of process events and process_map. This was to some
294 * extent for debugging as well as to get a better idea of the time used 230 * extent for debugging as well as to get a better idea of the time used
… …
297 * is needed after the players have been updated. 233 * is needed after the players have been updated.
298 */ 234 */
299static void 235static void
300process_players1 () 236process_players1 ()
301{ 237{
302 int flag;
303
304 /* Basically, we keep looping until all the players have done their actions. */ 238 /* Basically, we keep looping until all the players have done their actions. */
305 for (flag = 1; flag != 0;) 239 for (int flag = 1; flag != 0;)
306 { 240 {
307 flag = 0; 241 flag = 0;
308 for_all_players (pl) 242 for_all_players (pl)
309 { 243 {
310 pl->refcnt_chk (); 244 pl->refcnt_chk ();
311 245
312 if (!pl->ob || !pl->ns) 246 if (!pl->ob || !pl->ns || !pl->ob->active)
313 continue; 247 continue;
314 248
315 if (pl->ob->speed_left > 0) 249 if (pl->ob->speed_left > 0.f && pl->ns)
316 if (handle_newcs_player (pl->ob)) 250 if (handle_newcs_player (pl->ob))
317 flag = 1; 251 flag = 1;
318 252
319 /* If the player is not actively playing, don't make a 253 /* If the player is not actively playing, don't make a
320 * backup save - nothing to save anyway. Plus, the 254 * backup save - nothing to save anyway. Plus, the
… …
322 * player quits - they exist for purposes of tracking on the map, 256 * player quits - they exist for purposes of tracking on the map,
323 * but don't actually reside on any actual map. 257 * but don't actually reside on any actual map.
324 */ 258 */
325 if (QUERY_FLAG (pl->ob, FLAG_REMOVED)) 259 if (QUERY_FLAG (pl->ob, FLAG_REMOVED))
326 continue; 260 continue;
327
328#ifdef AUTOSAVE
329 /* check for ST_PLAYING state so that we don't try to save off when
330 * the player is logging in.
331 */
332 if ((pl->last_save_tick + AUTOSAVE) < (uint32) pticks && pl->ns->state == ST_PLAYING)
333 {
334 pl->ob->contr->save ();
335 pl->last_save_tick = pticks;
336 }
337#endif
338 } /* end of for loop for all the players */ 261 } /* end of for loop for all the players */
339 } /* for flag */ 262 } /* for flag */
340 263
341 for_all_players (pl) 264 for_all_players (pl)
342 { 265 {
343 if (!pl->ob || !pl->ns) 266 object *ob = pl->ob;
267
268 if (!ob || !pl->ns || !ob->active)
344 continue; 269 continue;
345 270
346 if (settings.casting_time) 271 if (settings.casting_time)
347 { 272 {
348 if (pl->ob->casting_time > 0) 273 if (ob->casting_time > 0.f)
349 { 274 {
350 pl->ob->casting_time--; 275 --ob->casting_time;
351 pl->ob->start_holding = 1; 276 ob->start_holding = 1;
352 } 277 }
353 278
354 /* set spell_state so we can update the range in stats field */ 279 /* set spell_state so we can update the range in stats field */
355 if ((pl->ob->casting_time == 0) && (pl->ob->start_holding == 1)) 280 if (pl->ob->casting_time == 0.f && pl->ob->start_holding == 1)
356 pl->ob->start_holding = 0; 281 pl->ob->start_holding = 0;
357 } 282 }
358 283
284 // process_events might steal us one speed slot, so adjust accordingly
285 if (ob->speed_left > 0.f)
286 ++ob->speed_left;
287
359 do_some_living (pl->ob); 288 do_some_living (ob);
360 } 289 }
361} 290}
362 291
363static void 292static void
364process_players2 () 293process_players2 ()
365{ 294{
366 /* Then check if any players should use weapon-speed instead of speed */ 295 /* Then check if any players should use weapon-speed instead of speed */
367 for_all_players (pl) 296 for_all_players (pl)
368 { 297 {
369 /* The code that did weapon_sp handling here was out of place -
370 * this isn't called until after the player has finished there
371 * actions, and is thus out of place. All we do here is bounds
372 * checking.
373 */
374 if (pl->has_hit) 298 if (pl->has_hit)
375 { 299 {
300 pl->ob->speed_left = min (pl->weapon_speed (), pl->ob->speed_left + pl->weapon_speed ());
301
376 if (pl->ob->speed_left > pl->weapon_sp) 302 if (pl->ob->speed_left > 0.f)
377 pl->ob->speed_left = pl->weapon_sp;
378
379 /* This needs to be here - if the player is running, we need to
380 * clear this each tick, but new commands are not being received
381 * so execute_newserver_command() is never called
382 */
383 pl->has_hit = 0; 303 pl->has_hit = 0;
384 } 304 }
385 else if (pl->ob->speed_left > pl->ob->speed) 305 else
386 pl->ob->speed_left = pl->ob->speed; 306 pl->ob->speed_left = min (pl->ob->speed, pl->ob->speed_left + pl->ob->speed);
387 } 307 }
388} 308}
389 309
390void 310void
391process_events () 311process_events ()
392{ 312{
393 object *op;
394
395 static object_ptr marker_;
396
397 if (!marker_)
398 marker_ = object::create ();
399
400 object *marker = marker_;
401
402 process_players1 (); 313 process_players1 ();
403 314
404 marker->active_next = active_objects; 315 for_all_actives (op)
405
406 if (marker->active_next)
407 marker->active_next->active_prev = marker;
408
409 marker->active_prev = 0;
410 active_objects = marker;
411
412 while (marker->active_next)
413 { 316 {
414 op = marker->active_next;
415
416 /* Move marker forward - swap op and marker */
417 op->active_prev = marker->active_prev;
418
419 if (op->active_prev)
420 op->active_prev->active_next = op;
421 else
422 active_objects = op;
423
424 marker->active_next = op->active_next;
425
426 if (marker->active_next)
427 marker->active_next->active_prev = marker;
428
429 marker->active_prev = op;
430 op->active_next = marker;
431
432 /* Now process op */ 317 /* Now process op */
433 if (QUERY_FLAG (op, FLAG_FREED)) 318 if (QUERY_FLAG (op, FLAG_FREED))
434 { 319 {
435 LOG (llevError, "BUG: process_events(): Free object on list\n"); 320 LOG (llevError, "BUG: process_events(): Free object on list\n");
436 op->set_speed (0); 321 op->set_speed (0);
437 continue; 322 continue;
438 } 323 }
439 324
440 /* I've seen occasional crashes due to this - the object is removed, 325 if (!op->has_active_speed ())
441 * and thus the map it points to (last map it was on) may be bogus
442 * The real bug is to try to find out the cause of this - someone
443 * is probably calling remove_ob without either an insert_ob or
444 * free_object afterwards, leaving an object dangling. But I'd
445 * rather log this and continue on instead of crashing.
446 * Don't remove players - when a player quits, the object is in
447 * sort of a limbo, of removed, but something we want to keep
448 * around.
449 */
450 if (QUERY_FLAG (op, FLAG_REMOVED) && op->type != PLAYER && op->map && op->map->in_memory != MAP_IN_MEMORY)
451 {
452 LOG (llevError, "BUG: process_events(): Removed object on list\n");
453 char *dump = dump_object (op);
454 LOG (llevError, dump);
455 free (dump);
456 op->destroy ();
457 continue;
458 } 326 {
459
460 if (!op->speed)
461 {
462 LOG (llevError, "BUG: process_events(): Object %s has no speed, " 327 LOG (llevError, "BUG: process_events(): Object %s has no speed (%f), "
463 "but is on active list\n", &op->arch->name); 328 "but is on active list\n", op->debug_desc (), op->speed);
464 op->set_speed (0); 329 op->set_speed (0);
465 continue; 330 continue;
466 } 331 }
467 332
468 if (op->map == NULL && op->env == NULL && op->name && op->type != MAP) 333 if (op->flag [FLAG_REMOVED])
469 { 334 {
470 LOG (llevError, "BUG: process_events(): Object without map or " 335 LOG (llevError, "BUG: process_events(): removed object is on active list: %s\n",
471 "inventory is on active list: %s (%d)\n", &op->name, op->count); 336 op->debug_desc ());
472 op->set_speed (0); 337 op->set_speed (0);
473 continue; 338 continue;
474 } 339 }
475 340
476 /* Animate the object. Bug or feature that anim_speed 341 /* Animate the object. Bug or feature that anim_speed
477 * is based on ticks, and not the creatures speed? 342 * is based on ticks, and not the creatures speed?
478 */ 343 */
479 if (op->anim_speed && op->last_anim >= op->anim_speed) 344 if (op->anim_speed && op->last_anim >= op->anim_speed)
480 { 345 {
481 if ((op->type == PLAYER))
482 animate_object (op, op->facing);
483 else
484 animate_object (op, op->direction); 346 animate_object (op, op->contr ? op->facing : op->direction);
485
486 op->last_anim = 1; 347 op->last_anim = 1;
487 } 348 }
488 else 349 else
489 op->last_anim++; 350 ++op->last_anim;
490 351
491 if (op->speed_left > 0) 352 if (op->speed_left > 0.f)
492 {
493#if 0
494 /* I've seen occasional crashes in move_symptom() with it
495 * crashing because op is removed - add some debugging to
496 * track if it is removed at this point.
497 * This unfortunately is a bit too verbose it seems - not sure
498 * why - I think what happens is a map is freed or something and
499 * some objects get 'lost' - removed never to be reclaimed.
500 * removed objects generally shouldn't exist.
501 */
502 if (QUERY_FLAG (op, FLAG_REMOVED))
503 { 353 {
504 LOG (llevDebug, "process_events: calling process_object with removed object %s\n", op->name ? op->name : "null");
505 }
506#endif
507 --op->speed_left; 354 --op->speed_left;
508 process_object (op); 355 process_object (op);
509 356
510 if (op->destroyed ()) 357 if (op->destroyed ())
511 continue; 358 continue;
512 } 359 }
513 360
514 if (settings.casting_time == TRUE && op->casting_time > 0) 361 if (settings.casting_time == TRUE && op->casting_time > 0.f)
515 op->casting_time--; 362 --op->casting_time;
516 363
517 if (op->speed_left <= 0) 364 if (!op->contr)
518 op->speed_left += FABS (op->speed); 365 op->speed_left = min (abs (op->speed), op->speed_left + abs (op->speed));
519 } 366 }
520
521 /* Remove marker object from active list */
522 if (marker->active_prev != NULL)
523 marker->active_prev->active_next = NULL;
524 else
525 active_objects = NULL;
526 367
527 process_players2 (); 368 process_players2 ();
528} 369}
529 370
530/* clean up everything before exiting */ 371/* clean up everything before exiting */
531void 372void
532emergency_save () 373emergency_save ()
533{ 374{
534 LOG (llevDebug, "emergency save begin.\n"); 375 LOG (llevDebug, "emergency save begin.\n");
535 376
536 LOG (llevDebug, "saving players.\n");
537 for_all_players (pl)
538 pl->save (1);
539
540// for_all_players (pl)
541// if (pl->ob)
542// pl->ob->remove ();
543
544 LOG (llevDebug, "saving maps.\n");
545 maptile::emergency_save (); 377 cfperl_emergency_save ();
546 378
547 LOG (llevDebug, "saving book archive.\n"); 379 LOG (llevDebug, "saving book archive.\n");
548 write_book_archive (); 380 write_book_archive ();
549 381
550 LOG (llevDebug, "emergency save done.\n"); 382 LOG (llevDebug, "emergency save done.\n");
551} 383}
552 384
385// send all clients some informational text
386static void
387cleanup_inform (const char *cause, bool make_core)
388{
389 int flags = NDI_UNIQUE | NDI_ALL | (make_core ? NDI_RED : NDI_GREEN);
390
391 new_draw_info_format (flags, 0, 0, "The server will now shutdown.\n");
392 new_draw_info_format (flags, 0, 0, "Cause for this shutdown: %s\n", cause);
393
394 if (make_core)
395 new_draw_info_format (flags, 0, 0, "This is considered a crash, but all maps and players have been saved.\n");
396 else
397 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");
398
399 new_draw_info_format (flags, 0, 0, "%s\n", CLEANUP_MESSAGE);
400
401 flush_sockets ();
402}
403
553/* clean up everything before exiting */ 404/* clean up everything before exiting */
554void 405void
555cleanup (bool make_core) 406cleanup (const char *cause, bool make_core)
556{ 407{
408 if (make_core)
409 fork_abort (cause);
410
411 LOG (llevError, "cleanup cause: %s\n", cause);
412
413 if (!make_core)
414 cleanup_inform (cause, make_core);
415
557 LOG (llevDebug, "cleanup begin.\n"); 416 LOG (llevDebug, "cleanup begin.\n");
558 417
418 if (init_done && !in_cleanup)
419 {
559 in_cleanup = true; 420 in_cleanup = true;
560
561 if (init_done)
562 emergency_save (); 421 emergency_save ();
422 }
423 else
424 in_cleanup = true;
563 425
564 LOG (llevDebug, "running cleanup handlers.\n"); 426 LOG (llevDebug, "running cleanup handlers.\n");
565 INVOKE_GLOBAL (CLEANUP); 427 INVOKE_GLOBAL (CLEANUP);
566 428
567 LOG (llevDebug, "cleanup done.\n"); 429 LOG (llevDebug, "cleanup done.\n");
568 430
569 if (make_core) 431 if (make_core)
570 abort (); 432 {
433 cleanup_inform (cause, make_core);
434 cfperl_cleanup (make_core);
435 _exit (1);
436 }
571 else 437 else
438 {
439 new_draw_info_format (NDI_UNIQUE | NDI_ALL | NDI_GREEN, 0, 0, "Maps and players successfully saved, exiting.\n");
440 new_draw_info_format (NDI_UNIQUE | NDI_ALL | NDI_GREEN, 0, 0, "And again: " CLEANUP_MESSAGE "\n");
441 flush_sockets ();
442 cfperl_cleanup (make_core);
572 _exit (0); 443 _exit (0);
573}
574
575void
576leave (player *pl, int draw_exit)
577{
578 if (pl)
579 {
580 if (pl->ob->type != DEAD_OBJECT)
581 {
582 /* If a hidden dm dropped connection do not create
583 * inconsistencies by showing that they have left the game
584 */
585 if (!(QUERY_FLAG (pl->ob, FLAG_WIZ) && pl->ob->contr->hidden)
586 && draw_exit)
587 {
588 if (pl->ob->map)
589 {
590 INVOKE_PLAYER (LOGOUT, pl);
591 LOG (llevInfo, "LOGOUT: Player named %s from ip %s\n", &pl->ob->name, pl->ns->host);
592 }
593
594 char buf[MAX_BUF];
595
596 sprintf (buf, "%s left the game.", &pl->ob->name);
597 new_draw_info (NDI_UNIQUE | NDI_ALL | NDI_DK_ORANGE, 5, 0, buf);
598 }
599
600 pl->ob->remove ();
601 pl->ob->type = DEAD_OBJECT; /* To avoid problems with inventory window */
602 }
603
604 /* We do this so that the socket handling routine can do the final
605 * cleanup. We also leave that loop to actually handle the freeing
606 * of the data.
607 */
608 if (pl->ns)
609 pl->ns->destroy ();
610
611 } 444 }
612} 445}
613 446
614int 447int
615forbid_play (void) 448forbid_play (void)
… …
630 463
631 while (fgets (buf, MAX_BUF, fp)) 464 while (fgets (buf, MAX_BUF, fp))
632 { 465 {
633 if (buf[0] == '#') 466 if (buf[0] == '#')
634 continue; 467 continue;
468
635 if (!strncmp (buf, "msg", 3)) 469 if (!strncmp (buf, "msg", 3))
636 { 470 {
637 if (forbit) 471 if (forbit)
638 while (fgets (buf, MAX_BUF, fp)) /* print message */ 472 while (fgets (buf, MAX_BUF, fp)) /* print message */
639 fputs (buf, logfile); 473 fputs (buf, logfile);
640 break; 474 break;
641
642 } 475 }
643 else if (sscanf (buf, "%s %d%*c%d\n", day, &start, &stop) != 3) 476 else if (sscanf (buf, "%s %d%*c%d\n", day, &start, &stop) != 3)
644 { 477 {
645 LOG (llevDebug, "Warning: Incomplete line in permission file ignored.\n"); 478 LOG (llevDebug, "Warning: Incomplete line in permission file ignored.\n");
646 continue; 479 continue;
… …
660 return 0; 493 return 0;
661#endif 494#endif
662} 495}
663 496
664/* 497/*
665 * do_specials() is a collection of functions to call from time to time. 498 * do_specials() is a collection of functions to call from time to time.
666 * Modified 2000-1-14 MSW to use the global pticks count to determine how 499 * Modified 2000-1-14 MSW to use the global pticks count to determine how
667 * often to do things. This will allow us to spred them out more often. 500 * often to do things. This will allow us to spred them out more often.
668 * I use prime numbers for the factor count - in that way, it is less likely 501 * I use prime numbers for the factor count - in that way, it is less likely
669 * these actions will fall on the same tick (compared to say using 500/2500/15000 502 * these actions will fall on the same tick (compared to say using 500/2500/15000
670 * which would mean on that 15,000 tick count a whole bunch of stuff gets 503 * which would mean on that 15,000 tick count a whole bunch of stuff gets
… …
672 * done on the same tick, but that will happen very infrequently 505 * done on the same tick, but that will happen very infrequently
673 * 506 *
674 * I also think this code makes it easier to see how often we really are 507 * I also think this code makes it easier to see how often we really are
675 * doing the various things. 508 * doing the various things.
676 */ 509 */
677
678extern unsigned long todtick;
679
680void 510void
681do_specials (void) 511do_specials (void)
682{ 512{
683 if (!(pticks % PTICKS_PER_CLOCK)) 513 if (!(pticks % TICKS_PER_HOUR))
684 tick_the_clock (); 514 adjust_daylight ();
685 515
686 if (!(pticks % 7)) 516 if (!(pticks % 7))
687 shstr::gc (); 517 shstr::gc ();
688 518
689 if (!(pticks % 2503)) 519 if (!(pticks % 2503))
… …
716 attachable::check_mortals (); 546 attachable::check_mortals ();
717 547
718 ++pticks; 548 ++pticks;
719} 549}
720 550
551#if 0
552// used fro benchmarking (x86/amd64-specific)
553typedef unsigned long tval;
554typedef unsigned long long stamp64;
555
556extern inline tval
557stamp (void)
558{
559 tval tsc;
560 asm volatile ("rdtsc":"=a" (tsc)::"edx");
561
562 return tsc;
563}
564
565extern inline tval
566measure (tval t)
567{
568 tval tsc;
569 asm volatile ("rdtsc":"=a" (tsc)::"edx");
570
571 if (tsc > t)
572 return tsc - t;
573 else
574 return t - tsc;
575}
576
721int 577int
722main (int argc, char **argv) 578main (int argc, char **argv)
723{ 579{
580 rand_gen rg(0);
581 tval fastest = 0x7fffffff;
582 for (int loop = 10000; loop--; )
583 {
584 tval s = stamp ();
585 volatile int i = rg.get_int(25);
586 fastest = min (fastest, measure (s));
587 }
588
589 //printf ("fastest %d\n", fastest);
590 for (int i = 0; i < 1024*1024*3; ++i)
591 {
592 char c = rg.get_int (256);
593 write (2, &c, 1);
594 }
595}
596
597#else
598
599// normal main
600int
601main (int argc, char **argv)
602{
724 settings.argc = argc; 603 settings.argc = argc;
725 settings.argv = argv; 604 settings.argv = argv;
726 605
727 init (argc, argv); 606 init (argc, argv);
728 607
729 initPlugins (); 608 initPlugins ();
730 609
731 for (;;) 610 for (;;)
732 cfperl_main (); 611 cfperl_main ();
733
734 // unreached
735 cleanup ();
736
737 return 0;
738} 612}
613#endif
614

Diff Legend

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