ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/server/common/living.C
(Generate patch)

Comparing deliantra/server/common/living.C (file contents):
Revision 1.103 by root, Mon Nov 23 12:19:57 2009 UTC vs.
Revision 1.105 by root, Sun Nov 29 17:41:07 2009 UTC

607 { 607 {
608 tmp = present_arch_in_ob (at, this); 608 tmp = present_arch_in_ob (at, this);
609 609
610 if (!tmp) 610 if (!tmp)
611 { 611 {
612 tmp = arch_to_object (at); 612 tmp = at->instance ();
613 tmp = insert_ob_in_ob (tmp, this); 613 tmp = insert_ob_in_ob (tmp, this);
614 SET_FLAG (tmp, FLAG_APPLIED); 614 SET_FLAG (tmp, FLAG_APPLIED);
615 } 615 }
616 } 616 }
617 617
637 if (!tmp) 637 if (!tmp)
638 { 638 {
639 if (!value) 639 if (!value)
640 return; 640 return;
641 641
642 tmp = arch_to_object (at); 642 tmp = at->instance ();
643 tmp = insert_ob_in_ob (tmp, this); 643 tmp = insert_ob_in_ob (tmp, this);
644 SET_FLAG (tmp, FLAG_APPLIED); 644 SET_FLAG (tmp, FLAG_APPLIED);
645 } 645 }
646 646
647 if (value) 647 if (value)
1356 speed *= speed_reduce_from_disease; 1356 speed *= speed_reduce_from_disease;
1357 1357
1358 /* Put a lower limit on speed. Note with this speed, you move once every 1358 /* Put a lower limit on speed. Note with this speed, you move once every
1359 * 25 ticks or so. This amounts to once every 3 seconds of realtime. 1359 * 25 ticks or so. This amounts to once every 3 seconds of realtime.
1360 */ 1360 */
1361 if (speed < 0.04f && type == PLAYER) 1361 max_it (speed, is_player () ? MIN_PLAYER_SPEED : MIN_ACTIVE_SPEED);
1362 speed = 0.04f;
1363 1362
1364 if (speed != old_speed) 1363 if (speed != old_speed)
1365 set_speed (speed); 1364 set_speed (speed);
1366 1365
1367 if (type == PLAYER) 1366 if (type == PLAYER)

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines