| … | |
… | |
| 914 | && !tmp->flag [FLAG_CURSED] |
914 | && !tmp->flag [FLAG_CURSED] |
| 915 | && !tmp->flag [FLAG_DAMNED]) |
915 | && !tmp->flag [FLAG_DAMNED]) |
| 916 | continue; |
916 | continue; |
| 917 | |
917 | |
| 918 | for (int i = 0; i < NUM_STATS; i++) |
918 | for (int i = 0; i < NUM_STATS; i++) |
| 919 | if (expect_false (tmp->stats.stat (i))) |
|
|
| 920 | stat_sum [i] = clamp (stat_sum [i] + tmp->stats.stat (i), MIN_STAT, MAX_STAT); |
919 | stat_sum [i] = stat_sum [i] + tmp->stats.stat (i); |
| 921 | |
920 | |
| 922 | if (digest_types [tmp->type]) |
921 | if (digest_types [tmp->type]) |
| 923 | { |
922 | { |
| 924 | contr->digestion += tmp->stats.food; |
923 | contr->digestion += tmp->stats.food; |
| 925 | contr->gen_hp += tmp->stats.hp; |
924 | contr->gen_hp += tmp->stats.hp; |
| … | |
… | |
| 938 | if (QUERY_FLAG (tmp, FLAG_APPLIED)) |
937 | if (QUERY_FLAG (tmp, FLAG_APPLIED)) |
| 939 | for (int i = 0; i < NUM_BODY_LOCATIONS; i++) |
938 | for (int i = 0; i < NUM_BODY_LOCATIONS; i++) |
| 940 | slot[i].used += tmp->slot[i].info; |
939 | slot[i].used += tmp->slot[i].info; |
| 941 | |
940 | |
| 942 | if (tmp->type == SYMPTOM) |
941 | if (tmp->type == SYMPTOM) |
| 943 | { |
|
|
| 944 | speed_reduce_from_disease = tmp->last_sp / 100.f; |
|
|
| 945 | |
|
|
| 946 | if (speed_reduce_from_disease == 0) |
|
|
| 947 | speed_reduce_from_disease = 1; |
942 | speed_reduce_from_disease = |
| 948 | } |
943 | min (speed_reduce_from_disease, tmp->last_sp ? tmp->last_sp / 100.f : 1.f); |
| 949 | |
944 | |
| 950 | /* Pos. and neg. protections are counted seperate (-> pro/vuln). |
945 | /* Pos. and neg. protections are counted seperate (-> pro/vuln). |
| 951 | * (Negative protections are calculated exactly like positive.) |
946 | * (Negative protections are calculated exactly like positive.) |
| 952 | * Resistance from potions are treated special as well. If there's |
947 | * Resistance from potions are treated special as well. If there's |
| 953 | * more than one potion-effect, the bigger prot.-value is taken. |
948 | * more than one potion-effect, the bigger prot.-value is taken. |
| … | |
… | |
| 1362 | speed = speed / (1.f + f / max_carry[stats.Str]); |
1357 | speed = speed / (1.f + f / max_carry[stats.Str]); |
| 1363 | } |
1358 | } |
| 1364 | |
1359 | |
| 1365 | speed += bonus_speed / 10.f; /* Not affected by limits */ |
1360 | speed += bonus_speed / 10.f; /* Not affected by limits */ |
| 1366 | |
1361 | |
|
|
1362 | speed = speed * speed_reduce_from_disease; |
|
|
1363 | |
| 1367 | /* Put a lower limit on speed. Note with this speed, you move once every |
1364 | /* Put a lower limit on speed. Note with this speed, you move once every |
| 1368 | * 100 ticks or so. This amounts to once every 12 seconds of realtime. |
1365 | * 100 ticks or so. This amounts to once every 12 seconds of realtime. |
| 1369 | */ |
1366 | */ |
| 1370 | speed = speed * speed_reduce_from_disease; |
|
|
| 1371 | |
|
|
| 1372 | if (speed < 0.01f && type == PLAYER) |
1367 | if (speed < 0.01f && type == PLAYER) |
| 1373 | speed = 0.01f; |
1368 | speed = 0.01f; |
|
|
1369 | |
|
|
1370 | if (speed != old_speed) |
|
|
1371 | set_speed (speed); |
| 1374 | |
1372 | |
| 1375 | if (type == PLAYER) |
1373 | if (type == PLAYER) |
| 1376 | { |
1374 | { |
| 1377 | /* (This formula was made by vidarl@ifi.uio.no) |
1375 | /* (This formula was made by vidarl@ifi.uio.no) |
| 1378 | * Note that we never used these values again - basically |
1376 | * Note that we never used these values again - basically |
| … | |
… | |
| 1409 | */ |
1407 | */ |
| 1410 | if (move_type == 0) |
1408 | if (move_type == 0) |
| 1411 | move_type = MOVE_WALK; |
1409 | move_type = MOVE_WALK; |
| 1412 | else if (move_type & (MOVE_FLY_LOW | MOVE_FLY_HIGH)) |
1410 | else if (move_type & (MOVE_FLY_LOW | MOVE_FLY_HIGH)) |
| 1413 | move_type &= ~MOVE_WALK; |
1411 | move_type &= ~MOVE_WALK; |
| 1414 | |
|
|
| 1415 | if (speed != old_speed) |
|
|
| 1416 | set_speed (speed); |
|
|
| 1417 | |
1412 | |
| 1418 | /* It is quite possible that a player's spell costing might have changed, |
1413 | /* It is quite possible that a player's spell costing might have changed, |
| 1419 | * so we will check that now. |
1414 | * so we will check that now. |
| 1420 | */ |
1415 | */ |
| 1421 | if (type == PLAYER) |
1416 | if (type == PLAYER) |
