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

Fix not displaying mutant + cbm encumbrance #36121

Merged
merged 3 commits into from
Dec 18, 2019
Merged

Fix not displaying mutant + cbm encumbrance #36121

Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3a06018
Change display from just armor to total encumbrance and as its no lon…
Ramza13 Dec 15, 2019
b0d48d1
Change display closer to original while fixing bug
Ramza13 Dec 15, 2019
869b837
Update src/player_display.cpp
Ramza13 Dec 17, 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
2 changes: 1 addition & 1 deletion src/player_display.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,7 @@ void player::print_encumbrance( const catacurses::window &win, const int line,
( highlighted ? c_green : c_light_gray );
mvwprintz( win, point( 1, 1 + i ), limb_color, "%s", out );
// accumulated encumbrance from clothing, plus extra encumbrance from layering
mvwprintz( win, point( 8, 1 + i ), encumb_color( e.encumbrance ), "%3d", e.armor_encumbrance );
mvwprintz( win, point( 8, 1 + i ), encumb_color( e.encumbrance ), "%3d", e.encumbrance - e.layer_penalty );
Ramza13 marked this conversation as resolved.
Show resolved Hide resolved
// separator in low toned color
mvwprintz( win, point( 11, 1 + i ), c_light_gray, "+" );
// take into account the new encumbrance system for layers
Expand Down