1dot13/source
1
0
Fork 0
mirror of https://github.com/1dot13/source.git synced 2026-09-09 14:46:05 +02:00
Code Issues Packages Projects Releases Wiki Activity

- Bugfix: Hopefully fixed problem with RPC/NPC speech in russian version (thx to Inshy)

Browse Source 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5820 3b4a5df2-a311-0410-b5c6-a8a6f20db521
This commit is contained in:
Wanne
2013-01-28 14:04:44 +00:00
parent a9532dc4db
commit 9bed6087b3
1 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Tactical/Dialogue Control.cpp
+13 -13
View File
@@ -1983,6 +1983,7 @@ CHAR8 *GetDialogueDataFilename( UINT8 ubCharacterNum, UINT16 usQuoteNum, BOOLEAN
|| ProfileCurrentlyTalkingInDialoguePanel( ubCharacterNum ) || ProfileCurrentlyTalkingInDialoguePanel( ubCharacterNum )
|| (gMercProfiles[ ubCharacterNum ].ubMiscFlags & PROFILE_MISC_FLAG_FORCENPCQUOTE) ) || (gMercProfiles[ ubCharacterNum ].ubMiscFlags & PROFILE_MISC_FLAG_FORCENPCQUOTE) )
) )
{ {
ubFileNumID = ubCharacterNum; ubFileNumID = ubCharacterNum;
@@ -1998,7 +1999,6 @@ CHAR8 *GetDialogueDataFilename( UINT8 ubCharacterNum, UINT16 usQuoteNum, BOOLEAN
ubFileNumID = 155; ubFileNumID = 155;
} }
if ( fWavFile ) if ( fWavFile )
{ {
if ( gSoundProfileValue[ubFileNumID].EnabledSound == TRUE ) if ( gSoundProfileValue[ubFileNumID].EnabledSound == TRUE )
@@ -2013,7 +2013,7 @@ CHAR8 *GetDialogueDataFilename( UINT8 ubCharacterNum, UINT16 usQuoteNum, BOOLEAN
} }
else else
{ {
// assume EDT files are in EDT directory on HARD DRIVE // assume EDT files are in EDT directory on HARD DRIVE
sprintf( zFileName,"NPCDATA\\%03d.EDT", ubFileNumID ); sprintf( zFileName,"NPCDATA\\%03d.EDT", ubFileNumID );
} }
} }
@@ -2029,29 +2029,28 @@ CHAR8 *GetDialogueDataFilename( UINT8 ubCharacterNum, UINT16 usQuoteNum, BOOLEAN
//inshy: fix for UB-1.13 version only sprintf( zFileName,"SPEECH\\r_%03d_%03d.ogg",ubCharacterNum,usQuoteNum ); //inshy: fix for UB-1.13 version only sprintf( zFileName,"SPEECH\\r_%03d_%03d.ogg",ubCharacterNum,usQuoteNum );
if ( gSoundProfileValue[ubCharacterNum].EnabledSound == TRUE ) if ( gSoundProfileValue[ubCharacterNum].EnabledSound == TRUE )
{ {
//#ifdef JA2UB #ifdef JA2UB
sprintf( zFileName,"SPEECH\\%03d_%03d.ogg",ubCharacterNum,usQuoteNum ); sprintf( zFileName,"SPEECH\\%03d_%03d.ogg",ubCharacterNum,usQuoteNum );
if ( !FileExists( zFileName ) ) if ( !FileExists( zFileName ) )
{ {
sprintf( zFileName,"SPEECH\\%03d_%03d.ogg",ubCharacterNum,usQuoteNum ); sprintf( zFileName,"SPEECH\\%03d_%03d.ogg",ubCharacterNum,usQuoteNum );
} }
#else
//#else sprintf( zFileName,"SPEECH\\r_%03d_%03d.ogg",ubCharacterNum,usQuoteNum );
// sprintf( zFileName,"SPEECH\\r_%03d_%03d.ogg",ubCharacterNum,usQuoteNum ); #endif
//#endif
if ( !FileExists( zFileName ) ) if ( !FileExists( zFileName ) )
{ {
//inshy: fix for UB-1.13 version only sprintf( zFileName,"SPEECH\\r_%03d_%03d.wav",ubCharacterNum,usQuoteNum ); //inshy: fix for UB-1.13 version only
//#ifdef JA2UB #ifdef JA2UB
sprintf( zFileName,"SPEECH\\%03d_%03d.wav",ubCharacterNum,usQuoteNum ); sprintf( zFileName,"SPEECH\\%03d_%03d.wav",ubCharacterNum,usQuoteNum );
if ( !FileExists( zFileName ) ) if ( !FileExists( zFileName ) )
{ {
sprintf( zFileName,"SPEECH\\%03d_%03d.wav",ubCharacterNum,usQuoteNum ); sprintf( zFileName,"SPEECH\\%03d_%03d.wav",ubCharacterNum,usQuoteNum );
} }
//#else #else
// sprintf( zFileName,"SPEECH\\r_%03d_%03d.wav",ubCharacterNum,usQuoteNum ); sprintf( zFileName,"SPEECH\\r_%03d_%03d.wav",ubCharacterNum,usQuoteNum );
//#endif #endif
//<SB> Also check for Russian Gold sound files (identical to international ones) //<SB> Also check for Russian Gold sound files (identical to international ones)
if(! FileExists( zFileName ) ) if(! FileExists( zFileName ) )
{ {
@@ -2089,6 +2088,7 @@ CHAR8 *GetDialogueDataFilename( UINT8 ubCharacterNum, UINT16 usQuoteNum, BOOLEAN
return( zFileName ); return( zFileName );
} }
// Used to see if the dialog text file exists // Used to see if the dialog text file exists
BOOLEAN DialogueDataFileExistsForProfile( UINT8 ubCharacterNum, UINT16 usQuoteNum, BOOLEAN fWavFile, STR8 *ppStr ) BOOLEAN DialogueDataFileExistsForProfile( UINT8 ubCharacterNum, UINT16 usQuoteNum, BOOLEAN fWavFile, STR8 *ppStr )
{ {