Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Sane-ify in-vehicle movement size checks #74004

Merged
merged 6 commits into from
May 23, 2024
Merged

Sane-ify in-vehicle movement size checks #74004

Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
fc043af
Common Creature::can_move_to_vehicle_tile definition
RenechCDDA May 20, 2024
c7f5a66
Fix most of the movement logic
RenechCDDA May 22, 2024
d80e015
Remove duplicate cramped space code in effects processing
RenechCDDA May 22, 2024
3fe03b5
Use midpoints of size classes
RenechCDDA May 22, 2024
4c338ae
Zombies try to bash through cargo
RenechCDDA May 22, 2024
d790b9b
Use an overload so we can stop passing dummy values
RenechCDDA May 22, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Use midpoints of size classes
  • Loading branch information
@RenechCDDA
RenechCDDA committed May 22, 2024
commit 3fe03b5e7fb17342294316572a649a314ced8eb5
14 changes: 9 additions & 5 deletions src/creature.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -194,16 +194,20 @@ void Creature::setpos( const tripoint &p )

static units::volume size_to_volume( creature_size size_class )
{
// returns midpoint of size from volume_to_size, minus 1_ml
// e.g. max tiny size is 7500, max small size is 46250, we return
// 46250+7500 / 2 - 1_ml = 26875_ml - 1ml
// This is still stupid and both of these functions should be merged into one single source of truth.
if( size_class == creature_size::tiny ) {
return 7499_ml;
return 3749_ml;
} else if( size_class == creature_size::small ) {
return 46249_ml;
return 26874_ml;
} else if( size_class == creature_size::medium ) {
return 107999_ml;
return 77124_ml;
} else if( size_class == creature_size::large ) {
return 483749_ml;
return 295874_ml;
}
return DEFAULT_TILE_VOLUME - 1_ml;
return 741874_ml;
}

bool Creature::can_move_to_vehicle_tile( const tripoint_abs_ms &loc, bool &cramped ) const
Expand Down
Loading