Skip to content

[GEN][ZH] Fix missing unit voice when attacking the ground #1156

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
xezon merged 1 commit into from
Jun 25, 2025
Merged

[GEN][ZH] Fix missing unit voice when attacking the ground #1156

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 15 additions & 15 deletions Generals/Code/GameEngine/Source/GameClient/MessageStream/CommandXlat.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -422,20 +422,6 @@ void pickAndPlayUnitVoiceResponse( const DrawableList *list, GameMessage::Type m
break;
}

case GameMessage::MSG_DO_FORCE_ATTACK_GROUND:
{
soundToPlayPtr = templ->getPerUnitSound( "VoiceBombard" );
objectWithSound = obj;
skip = true;

if (TheAudio->isValidAudioEvent(soundToPlayPtr)) {
break;
} else {
// clear out the sound to play, and drop into the attack object logic.
soundToPlayPtr = NULL;
}
}

case GameMessage::MSG_SWITCH_WEAPONS:
{
if( info && info->m_weaponSlot )
Expand All @@ -457,7 +443,21 @@ void pickAndPlayUnitVoiceResponse( const DrawableList *list, GameMessage::Type m
}
break;
}


case GameMessage::MSG_DO_FORCE_ATTACK_GROUND:
{
soundToPlayPtr = templ->getPerUnitSound( "VoiceBombard" );
objectWithSound = obj;
skip = true;

if (TheAudio->isValidAudioEvent(soundToPlayPtr)) {
break;
} else {
// clear out the sound to play, and drop into the attack object logic.
soundToPlayPtr = NULL;
FALLTHROUGH;
}
}
case GameMessage::MSG_DO_FORCE_ATTACK_OBJECT:
case GameMessage::MSG_DO_ATTACK_OBJECT:
case GameMessage::MSG_DO_WEAPON_AT_OBJECT:
Expand Down
30 changes: 15 additions & 15 deletions GeneralsMD/Code/GameEngine/Source/GameClient/MessageStream/CommandXlat.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -481,20 +481,6 @@ void pickAndPlayUnitVoiceResponse( const DrawableList *list, GameMessage::Type m
break;
}

case GameMessage::MSG_DO_FORCE_ATTACK_GROUND:
{
soundToPlayPtr = templ->getPerUnitSound( "VoiceBombard" );
objectWithSound = obj;
skip = true;

if (TheAudio->isValidAudioEvent(soundToPlayPtr)) {
break;
} else {
// clear out the sound to play, and drop into the attack object logic.
soundToPlayPtr = NULL;
}
}

case GameMessage::MSG_SWITCH_WEAPONS:
{
if( info && info->m_weaponSlot )
Expand All @@ -516,7 +502,21 @@ void pickAndPlayUnitVoiceResponse( const DrawableList *list, GameMessage::Type m
}
break;
}


case GameMessage::MSG_DO_FORCE_ATTACK_GROUND:
{
soundToPlayPtr = templ->getPerUnitSound( "VoiceBombard" );
objectWithSound = obj;
skip = true;

if (TheAudio->isValidAudioEvent(soundToPlayPtr)) {
break;
} else {
// clear out the sound to play, and drop into the attack object logic.
soundToPlayPtr = NULL;
FALLTHROUGH;
}
}
case GameMessage::MSG_DO_FORCE_ATTACK_OBJECT:
case GameMessage::MSG_DO_ATTACK_OBJECT:
case GameMessage::MSG_DO_WEAPON_AT_OBJECT:
Expand Down
Loading