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.85 by root, Sun May 4 19:14:23 2008 UTC vs.
Revision 1.87 by root, Tue May 6 17:31:21 2008 UTC

400 /* MOVE_FLY_HIGH trumps MOVE_FLY_LOW - changing your move_fly_low 400 /* MOVE_FLY_HIGH trumps MOVE_FLY_LOW - changing your move_fly_low
401 * status doesn't make a difference if you are flying high 401 * status doesn't make a difference if you are flying high
402 */ 402 */
403 if (tmp->move_type & MOVE_FLY_LOW && !(op->move_type & MOVE_FLY_HIGH)) 403 if (tmp->move_type & MOVE_FLY_LOW && !(op->move_type & MOVE_FLY_HIGH))
404 { 404 {
405 DIFF_MSG (flag, "You start to float in the air!.", "You float down to the ground."); 405 DIFF_MSG (flag, "You start to float in the air!", "You float down to the ground.");
406 } 406 }
407 407
408 if (tmp->move_type & MOVE_FLY_HIGH) 408 if (tmp->move_type & MOVE_FLY_HIGH)
409 { 409 {
410 /* double conditional - second case covers if you have move_fly_low - 410 /* double conditional - second case covers if you have move_fly_low -
917 917
918 if (digest_types [tmp->type]) 918 if (digest_types [tmp->type])
919 { 919 {
920 contr->digestion += tmp->stats.food; 920 contr->digestion += tmp->stats.food;
921 contr->gen_hp += tmp->stats.hp; 921 contr->gen_hp += tmp->stats.hp;
922 if (tmp->type != BOW) // ugly exception for bows
922 contr->gen_sp += tmp->stats.sp; 923 contr->gen_sp += tmp->stats.sp;
923 contr->gen_grace += tmp->stats.grace; 924 contr->gen_grace += tmp->stats.grace;
924 contr->gen_sp_armour += tmp->gen_sp_armour; 925 contr->gen_sp_armour += tmp->gen_sp_armour;
925 } 926 }
926 } /* if this is a player */ 927 } /* if this is a player */
927 else 928 else

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines