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

- Bugfix: Santos Barkeeper (!= HERVE) misses speech and edt files

Browse Source 
o This bug was introduced when making the possibility to have different EDT / NPC / speech files for the 4 Santos barkeepers (see revision: 6183)
o Now the fallback to HERVE (id = 151) if a file is missing seems to work correctly

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6208 3b4a5df2-a311-0410-b5c6-a8a6f20db521
This commit is contained in:
Wanne
2013-07-08 06:58:12 +00:00
parent 739d9a47d8
commit 0650b2b3ed
1 changed files with 48 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Tactical/Dialogue Control.cpp
+48 -35
View File
@@ -1943,6 +1943,7 @@ CHAR8 *GetDialogueDataFilename( UINT8 ubCharacterNum, UINT16 usQuoteNum, BOOLEAN
static CHAR8 zFileName[164]; static CHAR8 zFileName[164];
static CHAR8 zFileNameExists[164]; static CHAR8 zFileNameExists[164];
UINT8 ubFileNumID; UINT8 ubFileNumID;
BOOLEAN isBartenderSantos = FALSE;
// Are we an NPC OR an RPC that has not been recruited? // Are we an NPC OR an RPC that has not been recruited?
// ATE: Did the || clause here to allow ANY RPC that talks while the talking menu is up to use an npc quote file // ATE: Did the || clause here to allow ANY RPC that talks while the talking menu is up to use an npc quote file
@@ -1986,42 +1987,39 @@ CHAR8 *GetDialogueDataFilename( UINT8 ubCharacterNum, UINT16 usQuoteNum, BOOLEAN
{ {
ubFileNumID = ubCharacterNum; ubFileNumID = ubCharacterNum;
// ATE: If we are merc profile ID #151-154, all use 151's data....
//if ( ubCharacterNum >= HERVE && ubCharacterNum <= CARLO )
//{
//ubFileNumID = HERVE;
//}
if ( ubCharacterNum == HERVE ) if ( ubCharacterNum == HERVE )
{
ubFileNumID = HERVE;
}
else if ( ubCharacterNum == PETER )
{
sprintf( (char *)zFileNameExists,"NPCDATA\\%03d.EDT", PETER );
if ( !FileExists( zFileName ) )
ubFileNumID = HERVE;
else
ubFileNumID = PETER;
}
else if ( ubCharacterNum == ALBERTO )
{
sprintf( (char *)zFileNameExists,"NPCDATA\\%03d.EDT", ALBERTO );
if ( !FileExists( zFileName ) )
ubFileNumID = HERVE;
else
ubFileNumID = ALBERTO;
}
else if ( ubCharacterNum == CARLO )
{ {
sprintf( (char *)zFileNameExists,"NPCDATA\\%03d.EDT", CARLO ); isBartenderSantos = TRUE;
if ( !FileExists( zFileName ) ) ubFileNumID = HERVE;
ubFileNumID = HERVE; }
else else if ( ubCharacterNum == PETER )
ubFileNumID = CARLO; {
isBartenderSantos = TRUE;
sprintf( (char *)zFileNameExists,"NPCDATA\\%03d.EDT", PETER );
if ( !FileExists( zFileName ) )
ubFileNumID = HERVE;
else
ubFileNumID = PETER;
}
else if ( ubCharacterNum == ALBERTO )
{
isBartenderSantos = TRUE;
sprintf( (char *)zFileNameExists,"NPCDATA\\%03d.EDT", ALBERTO );
if ( !FileExists( zFileName ) )
ubFileNumID = HERVE;
else
ubFileNumID = ALBERTO;
}
else if ( ubCharacterNum == CARLO )
{
isBartenderSantos = TRUE;
sprintf( (char *)zFileNameExists,"NPCDATA\\%03d.EDT", CARLO );
if ( !FileExists( zFileName ) )
ubFileNumID = HERVE;
else
ubFileNumID = CARLO;
} }
// If we are character #155, check fact! // If we are character #155, check fact!
if ( ubCharacterNum == MANNY && !gubFact[ FACT_MANNY_IS_BARTENDER ] ) if ( ubCharacterNum == MANNY && !gubFact[ FACT_MANNY_IS_BARTENDER ] )
@@ -2035,16 +2033,31 @@ CHAR8 *GetDialogueDataFilename( UINT8 ubCharacterNum, UINT16 usQuoteNum, BOOLEAN
{ {
// Lesh: patch to allow playback ogg speech files // Lesh: patch to allow playback ogg speech files
sprintf( zFileName,"NPC_SPEECH\\%03d_%03d.ogg",ubFileNumID,usQuoteNum ); sprintf( zFileName,"NPC_SPEECH\\%03d_%03d.ogg",ubFileNumID,usQuoteNum );
if ( !FileExists( zFileName ) )
// WANNE: We do not have any speech files for the other (!= HERVE) santos bartenders, take HERVE speech files
if (isBartenderSantos && HERVE != ubFileNumID && !FileExists(zFileName))
{ {
sprintf( zFileName,"NPC_SPEECH\\%03d_%03d.wav",ubFileNumID,usQuoteNum ); ubFileNumID = HERVE;
sprintf( zFileName,"NPC_SPEECH\\%03d_%03d.ogg",ubFileNumID,usQuoteNum );
} }
// We do not have *.ogg file, take *.WAV file
if ( !FileExists( zFileName ) )
{
sprintf( zFileName,"NPC_SPEECH\\%03d_%03d.wav",ubFileNumID,usQuoteNum );
}
} }
} }
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 );
// WANNE: We do not have any edt files for the other (!= HERVE) santos bartenders, take HERVE speech files
if (isBartenderSantos && HERVE != ubFileNumID && !FileExists(zFileName))
{
sprintf( zFileName,"NPCDATA\\%03d.EDT", HERVE );
}
} }
} }
else else