Ignore punches with no damage in the actionstream #2405
Closed
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
Please fix the build |
|
No commit can be too small to not contain any mistake. Fixed it. |
|
Rebased and fixed the conflicts. |
| // create message and add to list | ||
| ActiveObjectMessage aom(getId(), true, str); | ||
| m_messages_out.push(aom); | ||
| actionstream<<getDescription()<<" punched by " |
|
Place fix the spaces |
|
Fixed spaces. |
| if ( puncher != 0 ) | ||
| punchername = puncher->getDescription(); | ||
| if (result.damage > 0) { | ||
| if (puncher != 0) |
There was a problem hiding this comment.
std::string punchername = puncher ? puncher->getDescription() : "nil"; and remove line 448
If you do not like the ternary operation I'd still suggest removing line 448 and having here
std::string punchername;
if (puncher == NULL)
punchername = "nil";
else
punchername = puncher->getDescription();
If you don't, for some bizarre reason (heh), want to do either of those changes then the line has to at least be changed from if (puncher != 0) to if (puncher != NULL), or even better simply if (puncher)
Edit: other than that, this should be merged
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.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Punches with no damage do not get written in the actionstream anymore; they are just useless in the actionstream because nothing has changed.
This is a trivial change.