Pass weaponDefID to UnitDestroyed #1665
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
sprunk
reviewed
Aug 29, 2024
rts/Sim/Units/UnitTypes/Factory.h
Outdated
| @@ -34,7 +34,7 @@ class CFactory : public CBuilding | |||
| /// supply the build piece to speed up | |||
| float3 CalcBuildPos(int buildPiece = -1); | |||
|
|
|||
| void KillUnit(CUnit* attacker, bool selfDestruct, bool reclaimed); | |||
| void KillUnit(CUnit* attacker, bool selfDestruct, bool reclaimed, int weaponDefID = 0); | |||
There was a problem hiding this comment.
Don't default to 0, this is because
- that represents some actual weapon (see 841 WeaponDefs is zero indexed #509),
- even if the above is fixed, now that every death type has its own constant there is always something appropriate to pass. There shouldn't be a case where a death was caused by some default/unknown weapon.
keelefi
force-pushed
the
pass-weapondefid-to-unitdestroyed
branch
from
c453d82
to
24df270
Compare
keelefi
force-pushed
the
pass-weapondefid-to-unitdestroyed
branch
from
24df270
to
d1df939
Compare
Pass weaponDefID to KillUnit and ForcedKillUnit so that it can be passed to UnitDestroyed.
keelefi
force-pushed
the
pass-weapondefid-to-unitdestroyed
branch
from
d1df939
to
69a333c
Compare
|
Hmm is this a dup of aed398d ? |
Yes. |
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.
Closes #1639