Skip to content

Commit

Permalink
fix few mistakes
Browse files Browse the repository at this point in the history
  • Loading branch information
GuardianDll committed Mar 1, 2024
1 parent 6f52ec5 commit c76b87f
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion data/json/items/tool_armor.json
Original file line number Diff line number Diff line change
Expand Up @@ -3857,7 +3857,7 @@
"use_action": { "type": "transform", "msg": "The %s engages.", "target": "utility_exoskeleton_on", "active": true },
"flags": [ "STURDY", "OVERSIZE", "BELTED", "WATER_FRIENDLY", "SLOWS_MOVEMENT", "ELECTRONIC" ],
"relic_data": {
"passive_effects": [ { "id": "ench_exo_strength" }, { "condition": "ACTIVE", "values": [ { "value": "CARRY_WEIGHT", "add": 190000 } ] } ]
"passive_effects": [ { "id": "ench_exo_strength" }, { "condition": "ACTIVE", "values": [ { "value": "CARRY_WEIGHT", "add": 215000 } ] } ]
},
"armor": [
{
Expand Down
4 changes: 2 additions & 2 deletions src/character.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -6635,8 +6635,8 @@ int Character::base_bmr() const
int Character::get_bmr() const
{
int base_bmr_calc = base_bmr();
base_bmr_calc *= clamp( activity_history.average_activity(), NO_EXERCISE,
maximum_exertion_level() );
return base_bmr_calc *= std::ceil( clamp( activity_history.average_activity(), NO_EXERCISE,

Check failure on line 6638 in src/character.cpp

View workflow job for this annotation

GitHub Actions / build (src)

Although the value stored to 'base_bmr_calc' is used in the enclosing expression, the value is never actually read from 'base_bmr_calc' [clang-analyzer-deadcode.DeadStores,-warnings-as-errors]
maximum_exertion_level() ) );
}

void Character::set_activity_level( float new_level )
Expand Down
2 changes: 1 addition & 1 deletion src/ranged.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1128,7 +1128,7 @@ int throw_cost( const Character &c, const item &to_throw )
move_cost *= stamina_penalty;
move_cost += skill_cost;
move_cost -= dexbonus;
move_cost = enchantment_cache->modify_value( enchant_vals::mod::ATTACK_SPEED, move_cost );
move_cost = c.enchantment_cache->modify_value( enchant_vals::mod::ATTACK_SPEED, move_cost );

return std::max( 25, move_cost );
}
Expand Down

0 comments on commit c76b87f

Please sign in to comment.