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.73 by root, Tue Jan 2 11:08:36 2007 UTC vs.
Revision 1.104 by root, Thu May 17 14:14:55 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#ifdef HAVE_DES_H
29# include <des.h>
30#else
31# ifdef HAVE_CRYPT_H
32# include <crypt.h>
33# endif
34#endif
35 28
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>
… …
54 47
55 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:");
56 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>");
57 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>");
58 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:");
59 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>");
60 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>");
61 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>");
62 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>");
63 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>");
… …
94 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>");
95 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>");
96 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>");
97 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>");
98 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");
99 94 new_draw_info (NDI_UNIQUE, 0, op, "");
100 new_draw_info (NDI_UNIQUE, 0, op, "Images and art:"); 95 new_draw_info (NDI_UNIQUE, 0, op, "Images and art:");
101 new_draw_info (NDI_UNIQUE, 0, op, "Peter Gardner"); 96 new_draw_info (NDI_UNIQUE, 0, op, "Peter Gardner");
102 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>");
103 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>");
104 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>");
105 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, "");
106 new_draw_info (NDI_UNIQUE, 0, op, "And many more!"); 102 new_draw_info (NDI_UNIQUE, 0, op, "And many more!");
107} 103}
108 104
109/* 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
110 * savebed. We do some error checking - its possible that the 106 * savebed. We do some error checking - its possible that the
… …
147 new_draw_info (NDI_UNIQUE, 0, this, "The exit is closed"); 143 new_draw_info (NDI_UNIQUE, 0, this, "The exit is closed");
148 return; 144 return;
149 } 145 }
150 } 146 }
151 147
152 if (map && map != newmap) 148 if (contr && map != newmap && map)
153 if (INVOKE_MAP (LEAVE, map, ARG_PLAYER (contr))) 149 if (INVOKE_MAP (LEAVE, map, ARG_PLAYER (contr)))
154 return; 150 return;
155 151
156 /* If it is a player login, he has yet to be inserted anyplace. 152 // remove, so stupid ob_locked does not trigger a failure
157 * otherwise, we need to deal with removing the player here.
158 */
159 remove (); 153 remove ();
160 154
161 /* try to find a spot for the player */ 155 /* try to find a spot for the player */
162 if (ob_blocked (this, newmap, x, y)) 156 if (ob_blocked (this, newmap, x, y))
163 { /* First choice blocked */ 157 { /* First choice blocked */
… …
185 else 179 else
186 /* not much we can do in this case. */ 180 /* not much we can do in this case. */
187 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);
188 } 182 }
189 183
190 if (map != newmap && contr) 184 if (contr && map != newmap)
191 { 185 {
192 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)))
193 return; 187 return;
194 188
195 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)))
… …
200 this->y = y; 194 this->y = y;
201 map = newmap; 195 map = newmap;
202 196
203 insert_ob_in_map (this, map, 0, INS_NO_WALK_ON); 197 insert_ob_in_map (this, map, 0, INS_NO_WALK_ON);
204 198
205 enemy = NULL; 199 enemy = 0;
206 200
207 if (contr) 201 if (contr)
208 { 202 {
209 contr->maplevel = newmap->path; 203 contr->maplevel = newmap->path;
210 contr->count = 0; 204 contr->count = 0;
211 } 205 }
212 206
213 /* Update any golems */ 207 /* Update any golems */
214 if (type == PLAYER && contr->ranges[range_golem]) 208 if (type == PLAYER)
215 { 209 if (object *golem = contr->golem)
216 int i = find_free_spot (contr->ranges[range_golem], newmap,
217 x, y, 1, SIZEOFFREE);
218
219 contr->ranges[range_golem]->remove ();
220
221 if (i == -1)
222 { 210 {
223 remove_friendly_object (contr->ranges[range_golem]); 211 int i = find_free_spot (golem, newmap, x, y, 1, SIZEOFFREE);
224 contr->ranges[range_golem]->destroy (); 212
225 contr->ranges[range_golem] = 0; 213 if (i < 0)
226 } 214 golem->destroy ();
227 else 215 else
228 {
229 for (object *tmp = contr->ranges[range_golem]; tmp != NULL; tmp = tmp->more)
230 { 216 {
231 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]);
232 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);
233 tmp->map = newmap;
234 } 219 }
235
236 insert_ob_in_map (contr->ranges[range_golem], newmap, NULL, 0);
237 contr->ranges[range_golem]->direction =
238 find_dir_2 (x - contr->ranges[range_golem]->x, y - contr->ranges[range_golem]->y);
239 } 220 }
240 }
241
242 direction = 0;
243 221
244 /* 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
245 * about pending objects. 223 * about pending objects.
246 */ 224 */
247 remove_all_pets (newmap); 225 remove_all_pets (newmap);
… …
255 * is needed after the players have been updated. 233 * is needed after the players have been updated.
256 */ 234 */
257static void 235static void
258process_players1 () 236process_players1 ()
259{ 237{
260 int flag;
261
262 /* 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. */
263 for (flag = 1; flag != 0;) 239 for (int flag = 1; flag != 0;)
264 { 240 {
265 flag = 0; 241 flag = 0;
266 for_all_players (pl) 242 for_all_players (pl)
267 { 243 {
268 pl->refcnt_chk (); 244 pl->refcnt_chk ();
269 245
270 if (!pl->ob || !pl->ns || !pl->ob->active ()) 246 if (!pl->ob || !pl->ns || !pl->ob->active)
271 continue; 247 continue;
272 248
273 if (pl->ob->speed_left > 0) 249 if (pl->ob->speed_left > 0.f && pl->ns)
274 if (handle_newcs_player (pl->ob)) 250 if (handle_newcs_player (pl->ob))
275 flag = 1; 251 flag = 1;
276 252
277 /* If the player is not actively playing, don't make a 253 /* If the player is not actively playing, don't make a
278 * backup save - nothing to save anyway. Plus, the 254 * backup save - nothing to save anyway. Plus, the
… …
280 * player quits - they exist for purposes of tracking on the map, 256 * player quits - they exist for purposes of tracking on the map,
281 * but don't actually reside on any actual map. 257 * but don't actually reside on any actual map.
282 */ 258 */
283 if (QUERY_FLAG (pl->ob, FLAG_REMOVED)) 259 if (QUERY_FLAG (pl->ob, FLAG_REMOVED))
284 continue; 260 continue;
285
286#ifdef AUTOSAVE
287 /* check for ST_PLAYING state so that we don't try to save off when
288 * the player is logging in.
289 */
290 if ((pl->last_save_tick + AUTOSAVE) < (uint32) pticks && pl->ns->state == ST_PLAYING)
291 {
292 pl->ob->contr->save ();
293 pl->last_save_tick = pticks;
294 }
295#endif
296 } /* end of for loop for all the players */ 261 } /* end of for loop for all the players */
297 } /* for flag */ 262 } /* for flag */
298 263
299 for_all_players (pl) 264 for_all_players (pl)
300 { 265 {
266 object *ob = pl->ob;
267
301 if (!pl->ob || !pl->ns || !pl->ob->active ()) 268 if (!ob || !pl->ns || !ob->active)
302 continue; 269 continue;
303 270
304 if (settings.casting_time) 271 // process_events might steal us one speed slot, so adjust accordingly
305 { 272 if (ob->speed_left > 0.f)
306 if (pl->ob->casting_time > 0) 273 ++ob->speed_left;
307 {
308 pl->ob->casting_time--;
309 pl->ob->start_holding = 1;
310 }
311 274
312 /* set spell_state so we can update the range in stats field */
313 if ((pl->ob->casting_time == 0) && (pl->ob->start_holding == 1))
314 pl->ob->start_holding = 0;
315 }
316
317 do_some_living (pl->ob); 275 do_some_living (ob);
318 } 276 }
319} 277}
320 278
321static void 279static void
322process_players2 () 280process_players2 ()
323{ 281{
324 /* Then check if any players should use weapon-speed instead of speed */ 282 /* Then check if any players should use weapon-speed instead of speed */
325 for_all_players (pl) 283 for_all_players (pl)
326 { 284 {
327 /* The code that did weapon_sp handling here was out of place -
328 * this isn't called until after the player has finished there
329 * actions, and is thus out of place. All we do here is bounds
330 * checking.
331 */
332 if (pl->has_hit) 285 if (pl->has_hit)
333 { 286 {
287 pl->ob->speed_left = min (pl->weapon_speed (), pl->ob->speed_left + pl->weapon_speed ());
288
334 if (pl->ob->speed_left > pl->weapon_sp) 289 if (pl->ob->speed_left > 0.f)
335 pl->ob->speed_left = pl->weapon_sp;
336
337 /* This needs to be here - if the player is running, we need to
338 * clear this each tick, but new commands are not being received
339 * so execute_newserver_command() is never called
340 */
341 pl->has_hit = 0; 290 pl->has_hit = 0;
342 } 291 }
343 else if (pl->ob->speed_left > pl->ob->speed) 292 else
344 pl->ob->speed_left = pl->ob->speed; 293 pl->ob->speed_left = min (pl->ob->speed, pl->ob->speed_left + pl->ob->speed);
345 } 294 }
346} 295}
347 296
348void 297void
349process_events () 298process_events ()
350{ 299{
351 object *op;
352
353 static object_ptr marker_;
354
355 if (!marker_)
356 marker_ = object::create ();
357
358 object *marker = marker_;
359
360 process_players1 (); 300 process_players1 ();
361 301
362 marker->active_next = active_objects; 302 for_all_actives (op)
363
364 if (marker->active_next)
365 marker->active_next->active_prev = marker;
366
367 marker->active_prev = 0;
368 active_objects = marker;
369
370 while (marker->active_next)
371 { 303 {
372 op = marker->active_next;
373
374 /* Move marker forward - swap op and marker */
375 op->active_prev = marker->active_prev;
376
377 if (op->active_prev)
378 op->active_prev->active_next = op;
379 else
380 active_objects = op;
381
382 marker->active_next = op->active_next;
383
384 if (marker->active_next)
385 marker->active_next->active_prev = marker;
386
387 marker->active_prev = op;
388 op->active_next = marker;
389
390 /* Now process op */ 304 /* Now process op */
391 if (QUERY_FLAG (op, FLAG_FREED)) 305 if (QUERY_FLAG (op, FLAG_FREED))
392 { 306 {
393 LOG (llevError, "BUG: process_events(): Free object on list\n"); 307 LOG (llevError, "BUG: process_events(): Free object on list\n");
394 op->set_speed (0); 308 op->set_speed (0);
395 continue;
396 }
397
398 /* I've seen occasional crashes due to this - the object is removed,
399 * and thus the map it points to (last map it was on) may be bogus
400 * The real bug is to try to find out the cause of this - someone
401 * is probably calling remove_ob without either an insert_ob or
402 * free_object afterwards, leaving an object dangling. But I'd
403 * rather log this and continue on instead of crashing.
404 * Don't remove players - when a player quits, the object is in
405 * sort of a limbo, of removed, but something we want to keep
406 * around.
407 */
408 if (QUERY_FLAG (op, FLAG_REMOVED) && op->type != PLAYER && op->map && op->map->in_memory != MAP_IN_MEMORY)
409 {
410 LOG (llevError, "BUG: process_events(): Removed object on list\n");
411 char *dump = dump_object (op);
412 LOG (llevError, dump);
413 free (dump);
414 op->destroy ();
415 continue; 309 continue;
416 } 310 }
417 311
418 if (!op->has_active_speed ()) 312 if (!op->has_active_speed ())
419 { 313 {
… …
421 "but is on active list\n", op->debug_desc (), op->speed); 315 "but is on active list\n", op->debug_desc (), op->speed);
422 op->set_speed (0); 316 op->set_speed (0);
423 continue; 317 continue;
424 } 318 }
425 319
426 if (op->map == NULL && op->env == NULL && op->name && op->type != MAP) 320 if (op->flag [FLAG_REMOVED])
427 { 321 {
428 LOG (llevError, "BUG: process_events(): Object without map or " 322 LOG (llevError, "BUG: process_events(): removed object is on active list: %s\n",
429 "inventory is on active list: %s (%d)\n", &op->name, op->count); 323 op->debug_desc ());
430 op->set_speed (0); 324 op->set_speed (0);
431 continue; 325 continue;
432 } 326 }
433 327
434 /* Animate the object. Bug or feature that anim_speed 328 /* Animate the object. Bug or feature that anim_speed
435 * is based on ticks, and not the creatures speed? 329 * is based on ticks, and not the creatures speed?
436 */ 330 */
437 if (op->anim_speed && op->last_anim >= op->anim_speed) 331 if (op->anim_speed && op->last_anim >= op->anim_speed)
438 { 332 {
439 if ((op->type == PLAYER))
440 animate_object (op, op->facing);
441 else
442 animate_object (op, op->direction); 333 animate_object (op, op->contr ? op->facing : op->direction);
443
444 op->last_anim = 1; 334 op->last_anim = 1;
445 } 335 }
446 else 336 else
447 op->last_anim++; 337 ++op->last_anim;
448 338
449 if (op->speed_left > 0) 339 if (op->speed_left > 0.f)
450 {
451#if 0
452 /* I've seen occasional crashes in move_symptom() with it
453 * crashing because op is removed - add some debugging to
454 * track if it is removed at this point.
455 * This unfortunately is a bit too verbose it seems - not sure
456 * why - I think what happens is a map is freed or something and
457 * some objects get 'lost' - removed never to be reclaimed.
458 * removed objects generally shouldn't exist.
459 */
460 if (QUERY_FLAG (op, FLAG_REMOVED))
461 { 340 {
462 LOG (llevDebug, "process_events: calling process_object with removed object %s\n", op->name ? op->name : "null");
463 }
464#endif
465 --op->speed_left; 341 --op->speed_left;
466 process_object (op); 342 process_object (op);
467 343
468 if (op->destroyed ()) 344 if (op->destroyed ())
469 continue; 345 continue;
470 } 346 }
471 347
472 if (settings.casting_time == TRUE && op->casting_time > 0) 348 if (!op->contr)
473 op->casting_time--; 349 op->speed_left = min (abs (op->speed), op->speed_left + abs (op->speed));
474
475 if (op->speed_left <= 0)
476 op->speed_left += FABS (op->speed);
477 } 350 }
478
479 /* Remove marker object from active list */
480 if (marker->active_prev != NULL)
481 marker->active_prev->active_next = NULL;
482 else
483 active_objects = NULL;
484 351
485 process_players2 (); 352 process_players2 ();
486} 353}
487 354
488/* clean up everything before exiting */ 355/* clean up everything before exiting */
489void 356void
490emergency_save () 357emergency_save ()
491{ 358{
492 LOG (llevDebug, "emergency save begin.\n"); 359 LOG (llevDebug, "emergency save begin.\n");
493 360
494 LOG (llevDebug, "saving players.\n");
495 for_all_players (pl)
496 pl->save (1);
497
498// for_all_players (pl)
499// if (pl->ob)
500// pl->ob->remove ();
501
502 LOG (llevDebug, "saving maps.\n");
503 maptile::emergency_save (); 361 cfperl_emergency_save ();
504 362
505 LOG (llevDebug, "saving book archive.\n"); 363 LOG (llevDebug, "saving book archive.\n");
506 write_book_archive (); 364 write_book_archive ();
507 365
508 LOG (llevDebug, "emergency save done.\n"); 366 LOG (llevDebug, "emergency save done.\n");
509} 367}
510 368
369// send all clients some informational text
370static void
371cleanup_inform (const char *cause, bool make_core)
372{
373 int flags = NDI_UNIQUE | NDI_ALL | (make_core ? NDI_RED : NDI_GREEN);
374
375 new_draw_info_format (flags, 0, 0, "The server will now shutdown.\n");
376 new_draw_info_format (flags, 0, 0, "Cause for this shutdown: %s\n", cause);
377
378 if (make_core)
379 new_draw_info_format (flags, 0, 0, "This is considered a crash, but all maps and players have been saved.\n");
380 else
381 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");
382
383 new_draw_info_format (flags, 0, 0, "%s\n", CLEANUP_MESSAGE);
384
385 flush_sockets ();
386}
387
511/* clean up everything before exiting */ 388/* clean up everything before exiting */
512void 389void
513cleanup (bool make_core) 390cleanup (const char *cause, bool make_core)
514{ 391{
392 if (make_core)
393 fork_abort (cause);
394
395 LOG (llevError, "cleanup cause: %s\n", cause);
396
397 if (!make_core)
398 cleanup_inform (cause, make_core);
399
515 LOG (llevDebug, "cleanup begin.\n"); 400 LOG (llevDebug, "cleanup begin.\n");
516 401
517 if (init_done && !in_cleanup) 402 if (init_done && !in_cleanup)
518 { 403 {
519 in_cleanup = true; 404 in_cleanup = true;
… …
526 INVOKE_GLOBAL (CLEANUP); 411 INVOKE_GLOBAL (CLEANUP);
527 412
528 LOG (llevDebug, "cleanup done.\n"); 413 LOG (llevDebug, "cleanup done.\n");
529 414
530 if (make_core) 415 if (make_core)
531 abort (); 416 {
417 cleanup_inform (cause, make_core);
418 cfperl_cleanup (make_core);
419 _exit (1);
420 }
532 else 421 else
422 {
423 new_draw_info_format (NDI_UNIQUE | NDI_ALL | NDI_GREEN, 0, 0, "Maps and players successfully saved, exiting.\n");
424 new_draw_info_format (NDI_UNIQUE | NDI_ALL | NDI_GREEN, 0, 0, "And again: " CLEANUP_MESSAGE "\n");
425 flush_sockets ();
426 cfperl_cleanup (make_core);
533 _exit (0); 427 _exit (0);
428 }
534} 429}
535 430
536int 431int
537forbid_play (void) 432forbid_play (void)
538{ 433{
… …
594 * done on the same tick, but that will happen very infrequently 489 * done on the same tick, but that will happen very infrequently
595 * 490 *
596 * I also think this code makes it easier to see how often we really are 491 * I also think this code makes it easier to see how often we really are
597 * doing the various things. 492 * doing the various things.
598 */ 493 */
599
600extern unsigned long todtick;
601
602void 494void
603do_specials (void) 495do_specials (void)
604{ 496{
605 if (!(pticks % PTICKS_PER_CLOCK)) 497 if (!(pticks % TICKS_PER_HOUR))
606 tick_the_clock (); 498 adjust_daylight ();
607 499
608 if (!(pticks % 7)) 500 if (!(pticks % 7))
609 shstr::gc (); 501 shstr::gc ();
610 502
611 if (!(pticks % 2503)) 503 if (!(pticks % 2503))
… …
638 attachable::check_mortals (); 530 attachable::check_mortals ();
639 531
640 ++pticks; 532 ++pticks;
641} 533}
642 534
535#if 0
536// used fro benchmarking (x86/amd64-specific)
537typedef unsigned long tval;
538typedef unsigned long long stamp64;
539
540extern inline tval
541stamp (void)
542{
543 tval tsc;
544 asm volatile ("rdtsc":"=a" (tsc)::"edx");
545
546 return tsc;
547}
548
549extern inline tval
550measure (tval t)
551{
552 tval tsc;
553 asm volatile ("rdtsc":"=a" (tsc)::"edx");
554
555 if (tsc > t)
556 return tsc - t;
557 else
558 return t - tsc;
559}
560
643int 561int
644main (int argc, char **argv) 562main (int argc, char **argv)
645{ 563{
564 rand_gen rg(0);
565 tval fastest = 0x7fffffff;
566 for (int loop = 10000; loop--; )
567 {
568 tval s = stamp ();
569 volatile int i = rg.get_int(25);
570 fastest = min (fastest, measure (s));
571 }
572
573 //printf ("fastest %d\n", fastest);
574 for (int i = 0; i < 1024*1024*3; ++i)
575 {
576 char c = rg.get_int (256);
577 write (2, &c, 1);
578 }
579}
580
581#else
582
583// normal main
584int
585main (int argc, char **argv)
586{
646 settings.argc = argc; 587 settings.argc = argc;
647 settings.argv = argv; 588 settings.argv = argv;
648 589
649 init (argc, argv); 590 init (argc, argv);
650 591
651 initPlugins (); 592 initPlugins ();
652 593
653 for (;;) 594 for (;;)
654 cfperl_main (); 595 cfperl_main ();
655
656 cleanup (true);
657} 596}
597#endif
658 598

Diff Legend

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