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

add bathroom scale #31849

Merged
merged 4 commits into from
Jun 27, 2019
Merged

add bathroom scale #31849

Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
8ba7d51
add bathroom scale
KorGgenT Jun 25, 2019
6be10eb
dat astyle
KorGgenT Jun 26, 2019
09c23eb
modify error message slightly
KorGgenT Jun 26, 2019
bcc69e8
max weight
KorGgenT Jun 26, 2019
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
5 changes: 2 additions & 3 deletions src/iuse_actor.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4255,10 +4255,9 @@ int weigh_self_actor::use( player &p, item &, bool, const tripoint & ) const
// this is a weight, either in kgs or in lbs.
double weight = convert_weight( p.get_weight() );
if( weight > convert_weight( max_weight ) ) {
popup( "ERROR TOO HEAVY" );
popup( _( "ERROR: Max weight of %.0f %s exceeded" ), weight, weight_units() );
KorGgenT marked this conversation as resolved.
Show resolved Hide resolved
} else {
popup( string_format( "%.0f %s", weight,
get_option<std::string>( "USE_METRIC_WEIGHTS" ) == "lbs" ? _( "lbs" ) : _( "kgs" ) ) );
popup( string_format( "%.0f %s", weight, weight_units() ) );
}
return 0;
}
Expand Down