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.20 by root, Sat Dec 23 06:30:49 2006 UTC vs.
Revision 1.23 by pippijn, Wed Jan 3 00:21:35 2007 UTC

224 "You feel stupid!", 224 "You feel stupid!",
225 "You feel less potent!" 225 "You feel less potent!"
226}; 226};
227 227
228const char *const statname[NUM_STATS] = { 228const char *const statname[NUM_STATS] = {
229 "strength", "dexterity", "constitution", "wisdom", "charisma", "intelligence", "power" 229 "strength", "dexterity", "constitution", "intelligence", "wisdom", "power", "charisma"
230}; 230};
231 231
232const char *const short_stat_name[NUM_STATS] = { 232const char *const short_stat_name[NUM_STATS] = {
233 "Str", "Dex", "Con", "Wis", "Cha", "Int", "Pow" 233 "Str", "Dex", "Con", "Int", "Wis", "Pow", "Cha"
234}; 234};
235 235
236/* 236/*
237 * sets Str/Dex/con/Wis/Cha/Int/Pow in stats to value, depending on 237 * sets Str/Dex/con/Wis/Cha/Int/Pow in stats to value, depending on
238 * what attr is (STR to POW). 238 * what attr is (STR to POW).
1028 if (tmp->type != POTION) 1028 if (tmp->type != POTION)
1029 { 1029 {
1030 for (i = 0; i < NROFATTACKS; i++) 1030 for (i = 0; i < NROFATTACKS; i++)
1031 { 1031 {
1032 /* Potential for cursed potions, in which case we just can use 1032 /* Potential for cursed potions, in which case we just can use
1033 * a straight MAX, as potion_resist is initialized to zero. 1033 * a straight MAX, as potion_resist is initialised to zero.
1034 */ 1034 */
1035 if (tmp->type == POTION_EFFECT) 1035 if (tmp->type == POTION_EFFECT)
1036 { 1036 {
1037 if (potion_resist[i]) 1037 if (potion_resist[i])
1038 potion_resist[i] = MAX (potion_resist[i], tmp->resist[i]); 1038 potion_resist[i] = MAX (potion_resist[i], tmp->resist[i]);
1502 if (move_type == 0) 1502 if (move_type == 0)
1503 move_type = MOVE_WALK; 1503 move_type = MOVE_WALK;
1504 else if (move_type & (MOVE_FLY_LOW | MOVE_FLY_HIGH)) 1504 else if (move_type & (MOVE_FLY_LOW | MOVE_FLY_HIGH))
1505 move_type &= ~MOVE_WALK; 1505 move_type &= ~MOVE_WALK;
1506 1506
1507 update_ob_speed (this); 1507 set_speed (speed);
1508 1508
1509 /* It is quite possible that a player's spell costing might have changed, 1509 /* It is quite possible that a player's spell costing might have changed,
1510 * so we will check that now. 1510 * so we will check that now.
1511 */ 1511 */
1512 if (type == PLAYER) 1512 if (type == PLAYER)

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines