| … | |
… | |
| 861 | continue; |
861 | continue; |
| 862 | |
862 | |
| 863 | /* See note in map.c:update_position about making this additive |
863 | /* See note in map.c:update_position about making this additive |
| 864 | * since light sources are never applied, need to put check here. |
864 | * since light sources are never applied, need to put check here. |
| 865 | */ |
865 | */ |
| 866 | if (tmp->glow_radius > glow_radius) |
|
|
| 867 | glow_radius = tmp->glow_radius; |
866 | glow_radius = max (glow_radius, tmp->glow_radius); |
| 868 | |
867 | |
| 869 | /* For some things, we don't care what is equipped */ |
868 | /* For some things, we don't care what is equipped */ |
| 870 | if (tmp->type == SKILL) |
869 | if (tmp->type == SKILL) |
| 871 | { |
870 | { |
| 872 | /* Want to take the highest skill here. */ |
871 | /* Want to take the highest skill here. */ |
| … | |
… | |
| 885 | else if (tmp->level > grace_obj->level) |
884 | else if (tmp->level > grace_obj->level) |
| 886 | grace_obj = tmp; |
885 | grace_obj = tmp; |
| 887 | } |
886 | } |
| 888 | } |
887 | } |
| 889 | |
888 | |
| 890 | /* Container objects are not meant to adjust a players, but other applied |
889 | /* Container objects are not meant to adjust players, but other applied |
| 891 | * objects need to make adjustments. |
890 | * objects need to make adjustments. |
| 892 | * This block should handle all player specific changes |
891 | * This block should handle all player specific changes |
| 893 | * The check for Praying is a bit of a hack - god given bonuses are put |
892 | * The check for Praying is a bit of a hack - god given bonuses are put |
| 894 | * in the praying skill, and the player should always get those. |
893 | * in the praying skill, and the player should always get those. |
| 895 | * It also means we need to put in additional checks for applied below, |
894 | * It also means we need to put in additional checks for applied below, |
| … | |
… | |
| 938 | |
937 | |
| 939 | if (tmp->type == SYMPTOM) |
938 | if (tmp->type == SYMPTOM) |
| 940 | speed_reduce_from_disease = |
939 | speed_reduce_from_disease = |
| 941 | min (speed_reduce_from_disease, tmp->last_sp ? tmp->last_sp / 100.f : 1.f); |
940 | min (speed_reduce_from_disease, tmp->last_sp ? tmp->last_sp / 100.f : 1.f); |
| 942 | |
941 | |
| 943 | /* Pos. and neg. protections are counted seperate (-> pro/vuln). |
942 | /* Pos. and neg. protections are counted separate (-> pro/vuln). |
| 944 | * (Negative protections are calculated exactly like positive.) |
943 | * (Negative protections are calculated exactly like positive.) |
| 945 | * Resistance from potions are treated special as well. If there's |
944 | * Resistance from potions are treated special as well. If there's |
| 946 | * more than one potion-effect, the bigger prot.-value is taken. |
945 | * more than one potion-effect, the bigger prot.-value is taken. |
| 947 | */ |
946 | */ |
| 948 | if (tmp->type != POTION) |
947 | if (tmp->type != POTION) |
