Join GitHub today
GitHub is home to over 36 million developers working together to host and review code, manage projects, and build software together.
Sign upFixes incorrect grabbing message. #6791
Conversation
KA101
reviewed
Mar 19, 2014
| @@ -7559,7 +7559,7 @@ bool player::eat(item *eaten, it_comest *comest) | |||
| !has_trait("EATDEAD")) { | |||
| add_disease("foodpoison", eaten->poison * 300); | |||
| } | |||
|
|
|||
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
Soyweiser
Mar 19, 2014
Author
Contributor
No idea what happend. Seems code blocks removed tabs/spaces. Is that right?
This comment has been minimized.
This comment has been minimized.
KA101
Mar 19, 2014
Contributor
Whatever happened, it's good to be rid of excess spaces.
Getting some graphical-displacement issues and the capitalization of messages is off, but those aren't in-scope.
KA101
self-assigned this
Mar 19, 2014
KA101
reviewed
Mar 19, 2014
| @@ -4287,7 +4287,7 @@ dealt_damage_instance player::deal_damage(Creature* source, body_part bp, | |||
| } | |||
|
|
|||
| if ( source->has_flag(MF_GRABS)) { | |||
| g->add_msg(_("%s grabs you!"), source->disp_name().c_str()); | |||
| g->add_msg_player_or_npc(this, _("%s grabs you!"), _("%s grabs <npcname>!"), source->disp_name().c_str()); | |||
This comment has been minimized.
This comment has been minimized.
KA101
Mar 19, 2014
Contributor
Basically it's using a lowercase "the" for the critter even when it begins the sentence. Not a dealbreaker, can be looked into later.
KA101
merged commit c088f56
into
CleverRaven:master
Mar 19, 2014
1 check passed
default
This has been rescheduled for testing as the 'master' branch has been updated.
Soyweiser
deleted the
Soyweiser:grabass
branch
Mar 21, 2014
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Soyweiser commentedMar 19, 2014
Fixes: http://smf.cataclysmdda.com/index.php?topic=5797.0