libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-03-04 17:29:11 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

use file class for speech so people with clusters in different directories get to hear sound as well

Browse Source 
svn-id: r9875
This commit is contained in:
Jonathan Gray 2003-08-27 06:32:42 +00:00
parent e37c930533
commit 8b91af78db
2 changed files with 27 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
sword2/driver/d_sound.cpp
View File

@ -359,6 +359,7 @@
#include "driver96.h"
#include "rdwin.h" // for hwnd.
#include "d_sound.h"
#include "../sword2.h"
// Decompression macros
#define MakeCompressedByte(shift,sign,amplitude) (((shift)<<4) + ((sign)<<3) + (amplitude))
@ -982,7 +983,7 @@ int32 Sword2Sound::PlayCompSpeech(const char *filename, uint32 speechid, uint8 v
uint8 *data8;
uint32 speechIndex[2];
void *lpv1;
FILE *fp;
File fp;
uint32 bufferSize;
if (!speechMuted)
@ -991,25 +992,26 @@ int32 Sword2Sound::PlayCompSpeech(const char *filename, uint32 speechid, uint8 v
return RDERR_SPEECHPLAYING;
// Open the speech cluster and find the data offset & size
fp = fopen(filename, "rb");
if (fp == NULL)
if (fp.open(filename, g_sword2->getGameDataPath()) == false)
return(RDERR_INVALIDFILENAME);
if (fseek(fp, (++speechid) * 8, SEEK_SET))
/* FIXME ? our fseek returns void not int
if (fp.seek((++speechid) * 8, SEEK_SET))
{
fclose(fp);
fp.close();
return (RDERR_READERROR);
}
if (fread(speechIndex, sizeof(uint32), 2, fp) != 2)
*/
fp.seek((++speechid) * 8, SEEK_SET);
if (fp.read(speechIndex, sizeof(uint32) * 2) != (2 * sizeof(uint32)))
{
fclose(fp);
fp.close();
return (RDERR_READERROR);
}
if (speechIndex[0] == 0 || speechIndex[1] == 0)
{
fclose(fp);
fp.close();
return (RDERR_INVALIDID);
}
@ -1018,25 +1020,27 @@ int32 Sword2Sound::PlayCompSpeech(const char *filename, uint32 speechid, uint8 v
// Create tempory buffer for compressed speech
if ((data8 = (uint8 *)malloc(speechIndex[1])) == NULL)
{
fclose(fp);
fp.close();
return(RDERR_OUTOFMEMORY);
}
if (fseek(fp, speechIndex[0], SEEK_SET))
/* FIXME ? see above
if (fp.seek(speechIndex[0], SEEK_SET))
{
fclose(fp);
fp.close();
free(data8);
return (RDERR_INVALIDID);
}
*/
fp.seek(speechIndex[0], SEEK_SET);
if (fp.read(data8, sizeof(uint8) * speechIndex[1]) != (speechIndex[1] * sizeof(uint8)))
{
fp.close();
free(data8);
return (RDERR_INVALIDID);
}
if (fread(data8, sizeof(uint8), speechIndex[1], fp) != speechIndex[1])
{
fclose(fp);
free(data8);
return (RDERR_INVALIDID);
}
fclose(fp);
fp.close();
// Create the speech sample buffer
/*

3
sword2/speech.cpp
View File

@ -1577,8 +1577,7 @@ int32 FN_i_speak(int32 *params) //Tony18Oct96 (revamped by James01july97)
} else
#endif // _SWORD2_DEBUG
{
strcpy(speechFile, g_sword2->getGameDataPath());
strcat(speechFile,"speech.clu");
strcpy(speechFile,"speech.clu");
}
}
//------------------------------