bugfix: Do not show veterancy effects for dead units #1968
Conversation
| #if RETAIL_COMPATIBLE_CRC | ||
| if (isEffectivelyDead()) | ||
| return; | ||
| #endif |
There was a problem hiding this comment.
That should do:
#if RETAIL_COMPATIBLE_CRC
doAnimation &= isEffectivelyDead();
#endifThere was a problem hiding this comment.
Does it really matter when they're effectively the same thing and this one is deprecated? Having them the same highlights that both compatible and non-compatible logic is identical and the only difference is when it is called.
There was a problem hiding this comment.
My motivation here was to get rid of the return in the middle of the function.
| void Object::onVeterancyLevelChanged( VeterancyLevel oldLevel, VeterancyLevel newLevel, Bool provideFeedback ) | ||
| { | ||
| #if !RETAIL_COMPATIBLE_CRC | ||
| if (isEffectivelyDead()) |
There was a problem hiding this comment.
Can add TheSuperHackers comment because it is user facing, even if obvious what it does.
| && outerDrawable | ||
| && outerDrawable->isVisible(); | ||
|
|
||
| #if RETAIL_COMPATIBLE_CRC |
There was a problem hiding this comment.
Does this require retail compatibility? It looks like this only disables sound and visuals locally.
There was a problem hiding this comment.
Technically not. The idea is that this code gets removed when retail compatibility is dropped, so leaving this here will make it easier to keep track of.
3 participants
This change prevents veterancy effects from showing for dead units. It will also save running some redundant upgrade logic once retail compatibility is dropped.
Issue Demonstrations
DEAD_VET_1.mp4
DEAD_VET_2.mp4