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.80 by pippijn, Sat Jan 6 14:42:30 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) 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)
216 { 209 if (object *golem = contr->golem)
217 int i = find_free_spot (contr->ranges[range_golem], newmap,
218 x, y, 1, SIZEOFFREE);
219
220 contr->ranges[range_golem]->remove ();
221
222 if (i == -1)
223 { 210 {
224 remove_friendly_object (contr->ranges[range_golem]); 211 int i = find_free_spot (golem, newmap, x, y, 1, SIZEOFFREE);
225 contr->ranges[range_golem]->destroy (); 212
226 contr->ranges[range_golem] = 0; 213 if (i < 0)
227 } 214 golem->destroy ();
228 else 215 else
229 {
230 for (object *tmp = contr->ranges[range_golem]; tmp != NULL; tmp = tmp->more)
231 { 216 {
232 tmp->x = x + freearr_x[i] + (tmp->arch ? 0 : tmp->arch->clone.x); 217 newmap->insert (golem, x + freearr_x[i], y + freearr_y[i]);
233 tmp->y = y + freearr_y[i] + (tmp->arch ? 0 : tmp->arch->clone.y); 218 golem->direction = find_dir_2 (x - golem->x, y - golem->y);
234 tmp->map = newmap;
235 } 219 }
236
237 insert_ob_in_map (contr->ranges[range_golem], newmap, NULL, 0);
238 contr->ranges[range_golem]->direction =
239 find_dir_2 (x - contr->ranges[range_golem]->x, y - contr->ranges[range_golem]->y);
240 } 220 }
241 }
242 221
243 /* 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
244 * about pending objects. 223 * about pending objects.
245 */ 224 */
246 remove_all_pets (newmap); 225 remove_all_pets (newmap);
… …
254 * is needed after the players have been updated. 233 * is needed after the players have been updated.
255 */ 234 */
256static void 235static void
257process_players1 () 236process_players1 ()
258{ 237{
259 int flag;
260
261 /* 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. */
262 for (flag = 1; flag != 0;) 239 for (int flag = 1; flag != 0;)
263 { 240 {
264 flag = 0; 241 flag = 0;
265 for_all_players (pl) 242 for_all_players (pl)
266 { 243 {
267 pl->refcnt_chk (); 244 pl->refcnt_chk ();
268 245
269 if (!pl->ob || !pl->ns || !pl->ob->active ()) 246 if (!pl->ob || !pl->ns || !pl->ob->active)
270 continue; 247 continue;
271 248
272 if (pl->ob->speed_left > 0) 249 if (pl->ob->speed_left > 0.f && pl->ns)
273 if (handle_newcs_player (pl->ob)) 250 if (handle_newcs_player (pl->ob))
274 flag = 1; 251 flag = 1;
275 252
276 /* If the player is not actively playing, don't make a 253 /* If the player is not actively playing, don't make a
277 * backup save - nothing to save anyway. Plus, the 254 * backup save - nothing to save anyway. Plus, the
… …
279 * player quits - they exist for purposes of tracking on the map, 256 * player quits - they exist for purposes of tracking on the map,
280 * but don't actually reside on any actual map. 257 * but don't actually reside on any actual map.
281 */ 258 */
282 if (QUERY_FLAG (pl->ob, FLAG_REMOVED)) 259 if (QUERY_FLAG (pl->ob, FLAG_REMOVED))
283 continue; 260 continue;
284
285#ifdef AUTOSAVE
286 /* check for ST_PLAYING state so that we don't try to save off when
287 * the player is logging in.
288 */
289 if ((pl->last_save_tick + AUTOSAVE) < (uint32) pticks && pl->ns->state == ST_PLAYING)
290 {
291 pl->ob->contr->save ();
292 pl->last_save_tick = pticks;
293 }
294#endif
295 } /* end of for loop for all the players */ 261 } /* end of for loop for all the players */
296 } /* for flag */ 262 } /* for flag */
297 263
298 for_all_players (pl) 264 for_all_players (pl)
299 { 265 {
266 object *ob = pl->ob;
267
300 if (!pl->ob || !pl->ns || !pl->ob->active ()) 268 if (!ob || !pl->ns || !ob->active)
301 continue; 269 continue;
302 270
303 if (settings.casting_time) 271 // process_events might steal us one speed slot, so adjust accordingly
304 { 272 if (ob->speed_left > 0.f)
305 if (pl->ob->casting_time > 0) 273 ++ob->speed_left;
306 {
307 pl->ob->casting_time--;
308 pl->ob->start_holding = 1;
309 }
310 274
311 /* set spell_state so we can update the range in stats field */
312 if ((pl->ob->casting_time == 0) && (pl->ob->start_holding == 1))
313 pl->ob->start_holding = 0;
314 }
315
316 do_some_living (pl->ob); 275 do_some_living (ob);
317 } 276 }
318} 277}
319 278
320static void 279static void
321process_players2 () 280process_players2 ()
322{ 281{
323 /* 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 */
324 for_all_players (pl) 283 for_all_players (pl)
325 { 284 {
326 /* The code that did weapon_sp handling here was out of place -
327 * this isn't called until after the player has finished there
328 * actions, and is thus out of place. All we do here is bounds
329 * checking.
330 */
331 if (pl->has_hit) 285 if (pl->has_hit)
332 { 286 {
287 pl->ob->speed_left = min (pl->weapon_speed (), pl->ob->speed_left + pl->weapon_speed ());
288
333 if (pl->ob->speed_left > pl->weapon_sp) 289 if (pl->ob->speed_left > 0.f)
334 pl->ob->speed_left = pl->weapon_sp;
335
336 /* This needs to be here - if the player is running, we need to
337 * clear this each tick, but new commands are not being received
338 * so execute_newserver_command() is never called
339 */
340 pl->has_hit = 0; 290 pl->has_hit = 0;
341 } 291 }
342 else if (pl->ob->speed_left > pl->ob->speed) 292 else
343 pl->ob->speed_left = pl->ob->speed; 293 pl->ob->speed_left = min (pl->ob->speed, pl->ob->speed_left + pl->ob->speed);
344 } 294 }
345} 295}
346 296
347void 297void
348process_events () 298process_events ()
349{ 299{
350 object *op;
351
352 static object_ptr marker_;
353
354 if (!marker_)
355 marker_ = object::create ();
356
357 object *marker = marker_;
358
359 process_players1 (); 300 process_players1 ();
360 301
361 marker->active_next = active_objects; 302 for_all_actives (op)
362
363 if (marker->active_next)
364 marker->active_next->active_prev = marker;
365
366 marker->active_prev = 0;
367 active_objects = marker;
368
369 while (marker->active_next)
370 { 303 {
371 op = marker->active_next;
372
373 /* Move marker forward - swap op and marker */
374 op->active_prev = marker->active_prev;
375
376 if (op->active_prev)
377 op->active_prev->active_next = op;
378 else
379 active_objects = op;
380
381 marker->active_next = op->active_next;
382
383 if (marker->active_next)
384 marker->active_next->active_prev = marker;
385
386 marker->active_prev = op;
387 op->active_next = marker;
388
389 /* Now process op */ 304 /* Now process op */
390 if (QUERY_FLAG (op, FLAG_FREED)) 305 if (QUERY_FLAG (op, FLAG_FREED))
391 { 306 {
392 LOG (llevError, "BUG: process_events(): Free object on list\n"); 307 LOG (llevError, "BUG: process_events(): Free object on list\n");
393 op->set_speed (0); 308 op->set_speed (0);
394 continue;
395 }
396
397 /* I've seen occasional crashes due to this - the object is removed,
398 * and thus the map it points to (last map it was on) may be bogus
399 * The real bug is to try to find out the cause of this - someone
400 * is probably calling remove_ob without either an insert_ob or
401 * free_object afterwards, leaving an object dangling. But I'd
402 * rather log this and continue on instead of crashing.
403 * Don't remove players - when a player quits, the object is in
404 * sort of a limbo, of removed, but something we want to keep
405 * around.
406 */
407 if (QUERY_FLAG (op, FLAG_REMOVED) && op->type != PLAYER && op->map && op->map->in_memory != MAP_IN_MEMORY)
408 {
409 LOG (llevError, "BUG: process_events(): Removed object on list\n");
410 char *dump = dump_object (op);
411 LOG (llevError, dump);
412 free (dump);
413 op->destroy ();
414 continue; 309 continue;
415 } 310 }
416 311
417 if (!op->has_active_speed ()) 312 if (!op->has_active_speed ())
418 { 313 {
… …
420 "but is on active list\n", op->debug_desc (), op->speed); 315 "but is on active list\n", op->debug_desc (), op->speed);
421 op->set_speed (0); 316 op->set_speed (0);
422 continue; 317 continue;
423 } 318 }
424 319
425 if (op->map == NULL && op->env == NULL && op->name && op->type != MAP) 320 if (op->flag [FLAG_REMOVED])
426 { 321 {
427 LOG (llevError, "BUG: process_events(): Object without map or " 322 LOG (llevError, "BUG: process_events(): removed object is on active list: %s\n",
428 "inventory is on active list: %s (%d)\n", &op->name, op->count); 323 op->debug_desc ());
429 op->set_speed (0); 324 op->set_speed (0);
430 continue; 325 continue;
431 } 326 }
432 327
433 /* Animate the object. Bug or feature that anim_speed 328 /* Animate the object. Bug or feature that anim_speed
434 * is based on ticks, and not the creatures speed? 329 * is based on ticks, and not the creatures speed?
435 */ 330 */
436 if (op->anim_speed && op->last_anim >= op->anim_speed) 331 if (op->anim_speed && op->last_anim >= op->anim_speed)
437 { 332 {
438 if ((op->type == PLAYER))
439 animate_object (op, op->facing);
440 else
441 animate_object (op, op->direction); 333 animate_object (op, op->contr ? op->facing : op->direction);
442
443 op->last_anim = 1; 334 op->last_anim = 1;
444 } 335 }
445 else 336 else
446 op->last_anim++; 337 ++op->last_anim;
447 338
448 if (op->speed_left > 0) 339 if (op->speed_left > 0.f)
449 {
450#if 0
451 /* I've seen occasional crashes in move_symptom() with it
452 * crashing because op is removed - add some debugging to
453 * track if it is removed at this point.
454 * This unfortunately is a bit too verbose it seems - not sure
455 * why - I think what happens is a map is freed or something and
456 * some objects get 'lost' - removed never to be reclaimed.
457 * removed objects generally shouldn't exist.
458 */
459 if (QUERY_FLAG (op, FLAG_REMOVED))
460 { 340 {
461 LOG (llevDebug, "process_events: calling process_object with removed object %s\n", op->name ? op->name : "null");
462 }
463#endif
464 --op->speed_left; 341 --op->speed_left;
465 process_object (op); 342 process_object (op);
466 343
467 if (op->destroyed ()) 344 if (op->destroyed ())
468 continue; 345 continue;
469 } 346 }
470 347
471 if (settings.casting_time == TRUE && op->casting_time > 0) 348 if (!op->contr)
472 op->casting_time--; 349 op->speed_left = min (abs (op->speed), op->speed_left + abs (op->speed));
473
474 if (op->speed_left <= 0)
475 op->speed_left += FABS (op->speed);
476 } 350 }
477
478 /* Remove marker object from active list */
479 if (marker->active_prev != NULL)
480 marker->active_prev->active_next = NULL;
481 else
482 active_objects = NULL;
483 351
484 process_players2 (); 352 process_players2 ();
485} 353}
486 354
487/* clean up everything before exiting */ 355/* clean up everything before exiting */
488void 356void
489emergency_save () 357emergency_save ()
490{ 358{
491 LOG (llevDebug, "emergency save begin.\n"); 359 LOG (llevDebug, "emergency save begin.\n");
492 360
493 LOG (llevDebug, "saving players.\n");
494 for_all_players (pl)
495 if (pl->enable_save && pl->ob && pl->ns)
496 {
497 pl->save (true);
498 pl->enable_save = true;
499 }
500
501// for_all_players (pl)
502// if (pl->ob)
503// pl->ob->remove ();
504
505 LOG (llevDebug, "saving maps.\n");
506 maptile::emergency_save (); 361 cfperl_emergency_save ();
507 362
508 LOG (llevDebug, "saving book archive.\n"); 363 LOG (llevDebug, "saving book archive.\n");
509 write_book_archive (); 364 write_book_archive ();
510 365
511 LOG (llevDebug, "emergency save done.\n"); 366 LOG (llevDebug, "emergency save done.\n");
… …
513 368
514// send all clients some informational text 369// send all clients some informational text
515static void 370static void
516cleanup_inform (const char *cause, bool make_core) 371cleanup_inform (const char *cause, bool make_core)
517{ 372{
373 int flags = NDI_UNIQUE | NDI_ALL | (make_core ? NDI_RED : NDI_GREEN);
374
518 new_draw_info_format (NDI_UNIQUE | NDI_ALL | NDI_RED, 0, 0, "The server will now shutdown.\n"); 375 new_draw_info_format (flags, 0, 0, "The server will now shutdown.\n");
519 new_draw_info_format (NDI_UNIQUE | NDI_ALL | NDI_RED, 0, 0, "Cause for this shtudown: %s\n", cause); 376 new_draw_info_format (flags, 0, 0, "Cause for this shutdown: %s\n", cause);
520 377
521 if (make_core) 378 if (make_core)
522 new_draw_info_format (NDI_UNIQUE | NDI_ALL | NDI_RED, 0, 0, "This is considered a crash.\n"); 379 new_draw_info_format (flags, 0, 0, "This is considered a crash, but all maps and players have been saved.\n");
523 else 380 else
524 new_draw_info_format (NDI_UNIQUE | NDI_ALL | NDI_RED, 0, 0, "This is considered to be a clean shutdown.\n"); 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");
525 382
526 new_draw_info_format (NDI_UNIQUE | NDI_ALL | NDI_RED, 0, 0, "%s\n", CLEANUP_MESSAGE); 383 new_draw_info_format (flags, 0, 0, "%s\n", CLEANUP_MESSAGE);
527 384
528 flush_sockets (); 385 flush_sockets ();
529} 386}
530 387
531/* clean up everything before exiting */ 388/* clean up everything before exiting */
532void 389void
533cleanup (const char *cause, bool make_core) 390cleanup (const char *cause, bool make_core)
534{ 391{
392 if (make_core)
393 fork_abort (cause);
394
535 LOG (llevError, "cleanup cause: %s\n", cause); 395 LOG (llevError, "cleanup cause: %s\n", cause);
536 396
537 if (!make_core) 397 if (!make_core)
538 cleanup_inform (cause, make_core); 398 cleanup_inform (cause, make_core);
539 399
… …
553 LOG (llevDebug, "cleanup done.\n"); 413 LOG (llevDebug, "cleanup done.\n");
554 414
555 if (make_core) 415 if (make_core)
556 { 416 {
557 cleanup_inform (cause, make_core); 417 cleanup_inform (cause, make_core);
558 abort (); 418 cfperl_cleanup (make_core);
419 _exit (1);
559 } 420 }
560 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);
561 _exit (0); 427 _exit (0);
428 }
562} 429}
563 430
564int 431int
565forbid_play (void) 432forbid_play (void)
566{ 433{
… …
622 * done on the same tick, but that will happen very infrequently 489 * done on the same tick, but that will happen very infrequently
623 * 490 *
624 * 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
625 * doing the various things. 492 * doing the various things.
626 */ 493 */
627
628extern unsigned long todtick;
629
630void 494void
631do_specials (void) 495do_specials (void)
632{ 496{
633 if (!(pticks % PTICKS_PER_CLOCK)) 497 if (!(pticks % TICKS_PER_HOUR))
634 tick_the_clock (); 498 adjust_daylight ();
635 499
636 if (!(pticks % 7)) 500 if (!(pticks % 7))
637 shstr::gc (); 501 shstr::gc ();
638 502
639 if (!(pticks % 2503)) 503 if (!(pticks % 2503))
… …
666 attachable::check_mortals (); 530 attachable::check_mortals ();
667 531
668 ++pticks; 532 ++pticks;
669} 533}
670 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
671int 561int
672main (int argc, char **argv) 562main (int argc, char **argv)
673{ 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{
674 settings.argc = argc; 587 settings.argc = argc;
675 settings.argv = argv; 588 settings.argv = argv;
676 589
677 init (argc, argv); 590 init (argc, argv);
678 591
679 initPlugins (); 592 initPlugins ();
680 593
681 for (;;) 594 for (;;)
682 cfperl_main (); 595 cfperl_main ();
683} 596}
597#endif
684 598

Diff Legend

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