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.87 by root, Thu Jan 18 19:32:37 2007 UTC vs.
Revision 1.90 by root, Fri Feb 9 01:52:11 2007 UTC

250 pl->refcnt_chk (); 250 pl->refcnt_chk ();
251 251
252 if (!pl->ob || !pl->ns || !pl->ob->active) 252 if (!pl->ob || !pl->ns || !pl->ob->active)
253 continue; 253 continue;
254 254
255 if (pl->ob->speed_left > 0) 255 if (pl->ob->speed_left > 0 && pl->ns)
256 if (handle_newcs_player (pl->ob)) 256 if (handle_newcs_player (pl->ob))
257 flag = 1; 257 flag = 1;
258 258
259 /* If the player is not actively playing, don't make a 259 /* If the player is not actively playing, don't make a
260 * backup save - nothing to save anyway. Plus, the 260 * backup save - nothing to save anyway. Plus, the
370 /* Animate the object. Bug or feature that anim_speed 370 /* Animate the object. Bug or feature that anim_speed
371 * is based on ticks, and not the creatures speed? 371 * is based on ticks, and not the creatures speed?
372 */ 372 */
373 if (op->anim_speed && op->last_anim >= op->anim_speed) 373 if (op->anim_speed && op->last_anim >= op->anim_speed)
374 { 374 {
375 if ((op->type == PLAYER)) 375 animate_object (op, op->type == PLAYER ? op->facing : op->direction);
376 animate_object (op, op->facing);
377 else
378 animate_object (op, op->direction);
379 376
380 op->last_anim = 1; 377 op->last_anim = 1;
381 } 378 }
382 else 379 else
383 op->last_anim++; 380 op->last_anim++;
439 new_draw_info_format (flags, 0, 0, "Cause for this shutdown: %s\n", cause); 436 new_draw_info_format (flags, 0, 0, "Cause for this shutdown: %s\n", cause);
440 437
441 if (make_core) 438 if (make_core)
442 new_draw_info_format (flags, 0, 0, "This is considered a crash, but all maps and players have been saved.\n"); 439 new_draw_info_format (flags, 0, 0, "This is considered a crash, but all maps and players have been saved.\n");
443 else 440 else
444 new_draw_info_format (flags, 0, 0, "This is considered to be a clean shutdown, and all maps and players have been saved.\n"); 441 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");
445 442
446 new_draw_info_format (flags, 0, 0, "%s\n", CLEANUP_MESSAGE); 443 new_draw_info_format (flags, 0, 0, "%s\n", CLEANUP_MESSAGE);
447 444
448 flush_sockets (); 445 flush_sockets ();
449} 446}
479 { 476 {
480 cleanup_inform (cause, make_core); 477 cleanup_inform (cause, make_core);
481 _exit (1); 478 _exit (1);
482 } 479 }
483 else 480 else
481 {
482 new_draw_info_format (NDI_UNIQUE | NDI_ALL | NDI_GREEN, 0, 0, "Maps and players successfully saved, exiting.\n");
483 new_draw_info_format (NDI_UNIQUE | NDI_ALL | NDI_GREEN, 0, 0, "And again: " CLEANUP_MESSAGE "\n");
484 flush_sockets ();
484 _exit (0); 485 _exit (0);
486 }
485} 487}
486 488
487int 489int
488forbid_play (void) 490forbid_play (void)
489{ 491{

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines