Skip to content

Commit

Permalink
Slightly clunkier fix for RUSSIAN conditional
Browse files Browse the repository at this point in the history
  • Loading branch information
majcosta committed Dec 31, 2024
1 parent cf0b4df commit 4b563fe
Showing 1 changed file with 4 additions and 3 deletions.
7 changes: 4 additions & 3 deletions Tactical/Dialogue Control.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,7 @@
#include "ub_config.h"

#include "history.h"
#include <language.hpp>

//forward declarations of common classes to eliminate includes
class OBJECTTYPE;
Expand Down Expand Up @@ -2407,8 +2408,8 @@ CHAR8 *GetDialogueDataFilename( UINT8 ubCharacterNum, UINT16 usQuoteNum, BOOLEAN
{
if ( fWavFile )
{
#ifdef RUSSIAN
if ( ( gMercProfiles[ubCharacterNum].Type == PROFILETYPE_RPC ||
if ( g_lang == i18n::Lang::ru &&
( gMercProfiles[ubCharacterNum].Type == PROFILETYPE_RPC ||
gMercProfiles[ubCharacterNum].Type == PROFILETYPE_NPC ||
gMercProfiles[ubCharacterNum].Type == PROFILETYPE_VEHICLE ) && gMercProfiles[ ubCharacterNum ].ubMiscFlags & PROFILE_MISC_FLAG_RECRUITED )
{
Expand All @@ -2426,7 +2427,7 @@ CHAR8 *GetDialogueDataFilename( UINT8 ubCharacterNum, UINT16 usQuoteNum, BOOLEAN
#endif
}
else
#endif

{
// build name of wav file (characternum + quotenum)
sprintf( zFileNameHelper, "SPEECH\\%03d_%03d", usVoiceSet, usQuoteNum );
Expand Down

0 comments on commit 4b563fe

Please sign in to comment.