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.108 by root, Mon May 28 21:28:36 2007 UTC vs.
Revision 1.111 by root, Sun Jun 24 04:09:29 2007 UTC

… …
38}; 38};
39 39
40void 40void
41version (object *op) 41version (object *op)
42{ 42{
43 if (op)
44 clear_win_info (op);
45
46 new_draw_info_format (NDI_UNIQUE, 0, op, "This is Crossfire+ v%s", VERSION); 43 new_draw_info_format (NDI_UNIQUE, 0, op, "This is Crossfire+ v%s", VERSION);
47 44
48 new_draw_info (NDI_UNIQUE, 0, op, "Authors and contributors to this program:"); 45 new_draw_info (NDI_UNIQUE, 0, op, "Authors and contributors to this program:");
49 new_draw_info (NDI_UNIQUE, 0, op, "Marc A. Lehmann <pcg@goof.com>"); 46 new_draw_info (NDI_UNIQUE, 0, op, "Marc A. Lehmann <pcg@goof.com>");
50 new_draw_info (NDI_UNIQUE, 0, op, "Robin Redeker <elmex@x-paste.de>"); 47 new_draw_info (NDI_UNIQUE, 0, op, "Robin Redeker <elmex@x-paste.de>");
… …
241 flag = 0; 238 flag = 0;
242 for_all_players (pl) 239 for_all_players (pl)
243 { 240 {
244 pl->refcnt_chk (); 241 pl->refcnt_chk ();
245 242
246 if (!pl->ob || !pl->ns || !pl->ob->active) 243 if (expect_false (!pl->ob || !pl->ns || !pl->ob->active))
247 continue; 244 continue;
248 245
249 if (handle_newcs_player (pl->ob)) 246 if (handle_newcs_player (pl->ob))
250 flag = 1; 247 flag = 1;
251 } 248 }
… …
253 250
254 for_all_players (pl) 251 for_all_players (pl)
255 { 252 {
256 object *ob = pl->ob; 253 object *ob = pl->ob;
257 254
258 if (!ob || !pl->ns || !ob->active) 255 if (expect_false (!ob || !pl->ns || !ob->active))
259 continue; 256 continue;
260 257
261 do_some_living (ob); 258 do_some_living (ob);
262 } 259 }
263} 260}
… …
279 process_players1 (); 276 process_players1 ();
280 277
281 for_all_actives (op) 278 for_all_actives (op)
282 { 279 {
283 /* Now process op */ 280 /* Now process op */
284 if (QUERY_FLAG (op, FLAG_FREED)) 281 if (expect_false (QUERY_FLAG (op, FLAG_FREED)))
285 { 282 {
286 LOG (llevError, "BUG: process_events(): Free object on list\n"); 283 LOG (llevError, "BUG: process_events(): Free object on list\n");
287 op->set_speed (0); 284 op->set_speed (0);
288 continue; 285 continue;
289 } 286 }
290 287
291 if (!op->has_active_speed ()) 288 if (expect_false (!op->has_active_speed ()))
292 { 289 {
293 LOG (llevError, "BUG: process_events(): Object %s has no speed (%f), " 290 LOG (llevError, "BUG: process_events(): Object %s has no speed (%f), "
294 "but is on active list\n", op->debug_desc (), op->speed); 291 "but is on active list\n", op->debug_desc (), op->speed);
295 op->set_speed (0); 292 op->set_speed (0);
296 continue; 293 continue;
297 } 294 }
298 295
299 if (op->flag [FLAG_REMOVED]) 296 if (expect_false (op->flag [FLAG_REMOVED]))
300 { 297 {
301 LOG (llevError, "BUG: process_events(): removed object is on active list: %s\n", 298 LOG (llevError, "BUG: process_events(): removed object is on active list: %s\n",
302 op->debug_desc ()); 299 op->debug_desc ());
303 op->set_speed (0); 300 op->set_speed (0);
304 continue; 301 continue;
… …
349static void 346static void
350cleanup_inform (const char *cause, bool make_core) 347cleanup_inform (const char *cause, bool make_core)
351{ 348{
352 int flags = NDI_UNIQUE | NDI_ALL | (make_core ? NDI_RED : NDI_GREEN); 349 int flags = NDI_UNIQUE | NDI_ALL | (make_core ? NDI_RED : NDI_GREEN);
353 350
354 new_draw_info_format (flags, 0, 0, "The server will now shutdown.\n"); 351 new_draw_info_format (flags, 0, 0, "The server will now shutdown.");
355 new_draw_info_format (flags, 0, 0, "Cause for this shutdown: %s\n", cause); 352 new_draw_info_format (flags, 0, 0, "Cause for this shutdown: %s", cause);
356 353
357 if (make_core) 354 if (make_core)
358 new_draw_info_format (flags, 0, 0, "This is considered a crash, but all maps and players have been saved.\n"); 355 new_draw_info_format (flags, 0, 0, "This is considered a crash, but all maps and players have been saved.");
359 else 356 else
360 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"); 357 new_draw_info_format (flags, 0, 0, "This is considered to be a clean shutdown, and all maps and players will be saved now.");
361 358
362 new_draw_info_format (flags, 0, 0, "%s\n", CLEANUP_MESSAGE); 359 new_draw_info_format (flags, 0, 0, "%s", CLEANUP_MESSAGE);
363 360
364 flush_sockets (); 361 flush_sockets ();
365} 362}
366 363
367/* clean up everything before exiting */ 364/* clean up everything before exiting */
… …
397 cfperl_cleanup (make_core); 394 cfperl_cleanup (make_core);
398 _exit (1); 395 _exit (1);
399 } 396 }
400 else 397 else
401 { 398 {
402 new_draw_info_format (NDI_UNIQUE | NDI_ALL | NDI_GREEN, 0, 0, "Maps and players successfully saved, exiting.\n"); 399 new_draw_info_format (NDI_UNIQUE | NDI_ALL | NDI_GREEN, 0, 0, "Maps and players successfully saved, exiting.");
403 new_draw_info_format (NDI_UNIQUE | NDI_ALL | NDI_GREEN, 0, 0, "And again: " CLEANUP_MESSAGE "\n"); 400 new_draw_info_format (NDI_UNIQUE | NDI_ALL | NDI_GREEN, 0, 0, "And again: " CLEANUP_MESSAGE);
404 flush_sockets (); 401 flush_sockets ();
405 cfperl_cleanup (make_core); 402 cfperl_cleanup (make_core);
406 _exit (0); 403 _exit (0);
407 } 404 }
408} 405}
… …
471 * doing the various things. 468 * doing the various things.
472 */ 469 */
473void 470void
474do_specials (void) 471do_specials (void)
475{ 472{
476 if (!(pticks % TICKS_PER_HOUR)) 473 if (expect_false (!(pticks % TICKS_PER_HOUR)))
477 adjust_daylight (); 474 adjust_daylight ();
478 475
479 if (!(pticks % 7)) 476 if (expect_false (!(pticks % 7)))
480 shstr::gc (); 477 shstr::gc ();
481 478
482 if (!(pticks % 2503)) 479 if (expect_false (!(pticks % 2503)))
483 fix_weight (); /* Hack to fix weightproblems caused by bugs */ 480 fix_weight (); /* Hack to fix weightproblems caused by bugs */
484 481
485 if (!(pticks % 5003)) 482 if (expect_false (!(pticks % 5003)))
486 write_book_archive (); 483 write_book_archive ();
487 484
488 if (!(pticks % 5009)) 485 if (expect_false (!(pticks % 5009)))
489 clean_friendly_list (); 486 clean_friendly_list ();
490 487
491 if (!(pticks % 5011)) 488 if (expect_false (!(pticks % 5011)))
492 obsolete_parties (); 489 obsolete_parties ();
493 490
494 if (!(pticks % 12503)) 491 if (expect_false (!(pticks % 12503)))
495 fix_luck (); 492 fix_luck ();
496} 493}
497 494
498void 495void
499server_tick () 496server_tick ()

Diff Legend

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