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.124 by root, Sat Apr 23 04:56:45 2011 UTC vs.
Revision 1.125 by root, Sat Dec 31 06:18:01 2011 UTC

1086 1086
1087 if (tmp->stats.ac) 1087 if (tmp->stats.ac)
1088 ac -= tmp->stats.ac + tmp->magic; 1088 ac -= tmp->stats.ac + tmp->magic;
1089 1089
1090 if (ARMOUR_SPEED (tmp)) 1090 if (ARMOUR_SPEED (tmp))
1091 max_speed = min (max_speed, ARMOUR_SPEED (tmp) / 10.f); 1091 min_it (max_speed, ARMOUR_SPEED (tmp) / 10.f);
1092 1092
1093 break; 1093 break;
1094 } /* switch tmp->type */ 1094 } /* switch tmp->type */
1095 } /* item is equipped */ 1095 } /* item is equipped */
1096 } /* for loop of items */ 1096 } /* for loop of items */
1901 tmp->stats.exp -= loss; 1901 tmp->stats.exp -= loss;
1902 player_lvl_adj (op, tmp); 1902 player_lvl_adj (op, tmp);
1903 } 1903 }
1904 1904
1905 percentage_loss = op->stats.exp * settings.death_penalty_ratio / 100; 1905 percentage_loss = op->stats.exp * settings.death_penalty_ratio / 100;
1906 level_loss = op->stats.exp - levels[max (0, op->level - settings.death_penalty_level)]; 1906 level_loss = op->stats.exp - levels [max (0, op->level - settings.death_penalty_level)];
1907 1907
1908 if (level_loss < 0) 1908 if (level_loss < 0)
1909 level_loss = 0; 1909 level_loss = 0;
1910 1910
1911 loss = check_exp_loss (op, min (level_loss, percentage_loss)); 1911 loss = check_exp_loss (op, min (level_loss, percentage_loss));

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines