Skip to content

Commit

Permalink
style(autofix.ci): automated formatting
Browse files Browse the repository at this point in the history
  • Loading branch information
autofix-ci[bot] authored and KheirFerrum committed Aug 29, 2024
1 parent 0050481 commit b70c8f2
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 8 deletions.
7 changes: 1 addition & 6 deletions data/json/items/tool/woodworking.json
Original file line number Diff line number Diff line change
Expand Up @@ -179,12 +179,7 @@
"qualities": [ [ "AXE", 4 ] ],
"use_action": "ELEC_CHAINSAW_OFF",
"flags": [ "NONCONDUCTIVE", "POWERED" ],
"batteries": [
"medium_battery_cell",
"medium_plus_battery_cell",
"medium_atomic_battery_cell",
"medium_disposable_cell"
],
"batteries": [ "medium_battery_cell", "medium_plus_battery_cell", "medium_atomic_battery_cell", "medium_disposable_cell" ],
"magazine_well": "500 ml"
},
{
Expand Down
4 changes: 2 additions & 2 deletions src/item.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -5304,14 +5304,14 @@ units::volume item::volume( bool integral ) const
if( magazine_current() != nullptr ) {
ret += std::max( magazine_current()->volume() - type->magazine_well, 0_ml );
}

// Some batteries sit (partly) flush with the item so add less extra volume
if( battery_current() != nullptr ){
ret+= std::max( battery_current()->volume() - type->battery_well, 0_ml );
}

if( is_gun() ) {
for( const item *elem : gunmods() ) {
for( const item *elem : gunmods() ) {
ret += elem->volume( true );
}

Expand Down

0 comments on commit b70c8f2

Please sign in to comment.