unify(object): Merge the unit veterancy effect changes including the veterancy effect fix for detected stealth units from Zero Hour#1455
Conversation
|
Is this meant to be merged with Rebase? Edit:
I suggest create 3 Pull for these that build on top of each other, in that order. |
There was a problem hiding this comment.
This can be simplified more:
Set provideFeedback = FALSE in case LEVEL_REGULAR
Then move this code up here to down below:
if( provideFeedback && TheGameLogic->getDrawIconUI() )
{
Bool hideAnimationForStealth = !isLocallyControlled() &&
testStatus( OBJECT_STATUS_STEALTHED ) &&
!testStatus( OBJECT_STATUS_DETECTED ) &&
!testStatus( OBJECT_STATUS_DISGUISED );
Bool doAnimation = ( ! hideAnimationForStealth
&& (newLevel > oldLevel)
&& ( ! isKindOf(KINDOF_IGNORED_IN_GUI))); //First, we plan to do the animation if the level went up
if ( doAnimation )
{
...
}
}5a8f644 to
e4a0bf0
Compare
Updated! |
|
Title updated. |
|
Is this meant to be merged with rebase? If yes then the commit titles need updating. |
I had not intended it to be. If that is preferable, what titles do you suggest? |
|
…ct from Zero Hour (#1455)
…ealth units from Zero Hour (#1455)
e4a0bf0 to
5a61dca
Compare
Done. |
…ealth units from Zero Hour (TheSuperHackers#1455)
…ealth units from Zero Hour (TheSuperHackers#1455)
This change ports the
provideFeedbackparameter and respective logic regarding the veterancy effect from Zero Hour to Generals. It also fixes a bug in Generals where detected stealth units would not play the veterancy effect.