Skip to content

Commit 60609ab

Browse files
committed
feat: Enable special power EVA events for observed players
1 parent 636c40f commit 60609ab

File tree

1 file changed

+6
-6
lines changed

1 file changed

+6
-6
lines changed

GeneralsMD/Code/GameEngine/Source/GameLogic/Object/SpecialPower/SpecialPowerModule.cpp

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -550,7 +550,7 @@ void SpecialPowerModule::aboutToDoSpecialPower( const Coord3D *location )
550550
// Let EVA do her thing
551551
SpecialPowerType type = getSpecialPowerModuleData()->m_specialPowerTemplate->getSpecialPowerType();
552552

553-
Player *localPlayer = ThePlayerList->getLocalPlayer();
553+
Player *localPlayer = TheControlBar->getCurrentlyViewedPlayer();
554554

555555
// Only play the EVA sounds if this is not the local player, and the local player doesn't consider the
556556
// person an enemy.
@@ -564,7 +564,7 @@ void SpecialPowerModule::aboutToDoSpecialPower( const Coord3D *location )
564564
{
565565
TheEva->setShouldPlay(EVA_SuperweaponLaunched_Own_ParticleCannon);
566566
}
567-
else if ( localPlayer->getRelationship(getObject()->getTeam()) != ENEMIES )
567+
else if ( TheControlBar->getCurrentlyViewedPlayerRelationship(getObject()->getTeam()) != ENEMIES )
568568
{
569569
// Note: counting relationship NEUTRAL as ally. Not sure if this makes a difference???
570570
TheEva->setShouldPlay(EVA_SuperweaponLaunched_Ally_ParticleCannon);
@@ -580,7 +580,7 @@ void SpecialPowerModule::aboutToDoSpecialPower( const Coord3D *location )
580580
{
581581
TheEva->setShouldPlay(EVA_SuperweaponLaunched_Own_Nuke);
582582
}
583-
else if ( localPlayer->getRelationship(getObject()->getTeam()) != ENEMIES )
583+
else if ( TheControlBar->getCurrentlyViewedPlayerRelationship(getObject()->getTeam()) != ENEMIES )
584584
{
585585
// Note: counting relationship NEUTRAL as ally. Not sure if this makes a difference???
586586
TheEva->setShouldPlay(EVA_SuperweaponLaunched_Ally_Nuke);
@@ -596,7 +596,7 @@ void SpecialPowerModule::aboutToDoSpecialPower( const Coord3D *location )
596596
{
597597
TheEva->setShouldPlay(EVA_SuperweaponLaunched_Own_ScudStorm);
598598
}
599-
else if ( localPlayer->getRelationship(getObject()->getTeam()) != ENEMIES )
599+
else if ( TheControlBar->getCurrentlyViewedPlayerRelationship(getObject()->getTeam()) != ENEMIES )
600600
{
601601
// Note: counting relationship NEUTRAL as ally. Not sure if this makes a difference???
602602
TheEva->setShouldPlay(EVA_SuperweaponLaunched_Ally_ScudStorm);
@@ -614,7 +614,7 @@ void SpecialPowerModule::aboutToDoSpecialPower( const Coord3D *location )
614614
{
615615
TheEva->setShouldPlay(EVA_SuperweaponLaunched_Own_GPS_Scrambler);
616616
}
617-
else if ( localPlayer->getRelationship(getObject()->getTeam()) != ENEMIES )
617+
else if ( TheControlBar->getCurrentlyViewedPlayerRelationship(getObject()->getTeam()) != ENEMIES )
618618
{
619619
// Note: counting relationship NEUTRAL as ally. Not sure if this makes a difference???
620620
TheEva->setShouldPlay(EVA_SuperweaponLaunched_Ally_GPS_Scrambler);
@@ -630,7 +630,7 @@ void SpecialPowerModule::aboutToDoSpecialPower( const Coord3D *location )
630630
{
631631
TheEva->setShouldPlay(EVA_SuperweaponLaunched_Own_Sneak_Attack);
632632
}
633-
else if ( localPlayer->getRelationship(getObject()->getTeam()) != ENEMIES )
633+
else if ( TheControlBar->getCurrentlyViewedPlayerRelationship(getObject()->getTeam()) != ENEMIES )
634634
{
635635
// Note: counting relationship NEUTRAL as ally. Not sure if this makes a difference???
636636
TheEva->setShouldPlay(EVA_SuperweaponLaunched_Ally_Sneak_Attack);

0 commit comments

Comments
 (0)