[Scummvm-cvs-logs] CVS: scummvm/saga animation.cpp,1.28,1.29 animation.h,1.13,1.14 game.cpp,1.33,1.34 music.cpp,1.40,1.41 rscfile.cpp,1.13,1.14 saga.h,1.50,1.51 sound.cpp,1.17,1.18 sthread.cpp,1.44,1.45
Eugene Sandulenko
sev at users.sourceforge.net
Wed Dec 22 11:35:03 CET 2004
Update of /cvsroot/scummvm/scummvm/saga
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13677
Modified Files:
animation.cpp animation.h game.cpp music.cpp rscfile.cpp
saga.h sound.cpp sthread.cpp
Log Message:
o Fix regression with Mac versions
o Normalize GIDs and GTypes
o Introduce MD5-based game detection. Now only 2 games should be ordered.
Linux demo should go before Win32 newer demo
o Fix sound in Mac versions
Index: animation.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/saga/animation.cpp,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -d -r1.28 -r1.29
--- animation.cpp 22 Dec 2004 13:09:46 -0000 1.28
+++ animation.cpp 22 Dec 2004 19:34:41 -0000 1.29
@@ -468,7 +468,7 @@
fh.x_start = readS.readUint16BE();
- if (IS_MAC_VERSION)
+ if (_vm->_features & GF_BIG_ENDIAN_DATA)
fh.y_start = readS.readUint16BE();
else
fh.y_start = readS.readByte();
@@ -523,7 +523,7 @@
case SAGA_FRAME_ROW_END: // End of row
x_vector = readS.readSint16BE();
- if (IS_MAC_VERSION)
+ if (_vm->_features & GF_BIG_ENDIAN_DATA)
new_row = readS.readSint16BE();
else
new_row = readS.readByte();
@@ -883,7 +883,7 @@
break;
case SAGA_FRAME_ROW_END: // End of row marker
readS.readSint16BE();
- if (IS_MAC_VERSION)
+ if (_vm->_features & GF_BIG_ENDIAN_DATA)
readS.readSint16BE();
else
readS.readByte();
Index: animation.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/saga/animation.h,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- animation.h 15 Dec 2004 00:24:10 -0000 1.13
+++ animation.h 22 Dec 2004 19:34:41 -0000 1.14
@@ -31,7 +31,7 @@
#define MAX_ANIMATIONS 7
#define DEFAULT_FRAME_TIME 140
-#define SAGA_FRAME_HEADER_LEN (IS_MAC_VERSION ? 13 : 12)
+#define SAGA_FRAME_HEADER_LEN (_vm->_features & GF_MAC_RESOURCES ? 13 : 12)
#define SAGA_FRAME_START 0xF
#define SAGA_FRAME_END 0x3F
Index: game.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/saga/game.cpp,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -d -r1.33 -r1.34
--- game.cpp 22 Dec 2004 13:09:46 -0000 1.33
+++ game.cpp 22 Dec 2004 19:34:41 -0000 1.34
@@ -24,9 +24,11 @@
// Game detection, general game parameters
#include "saga/saga.h"
+
#include "common/file.h"
-#include "base/gameDetector.h"
+#include "common/md5.h"
#include "base/plugins.h"
+#include "base/gameDetector.h"
#include "backends/fs/fs.h"
#include "saga/rscfile_mod.h"
@@ -55,22 +57,21 @@
GAME_SOUND_VOC, 0, 0, 0
};
-// Inherit the Earth - MAC Wyrmkeep Demo version
-static GAME_FILEDESC ITEMACDEMO_GameFiles[] = {
- {"ITED.RSC", GAME_RESOURCEFILE},
- {"SCRIPTSD.RSC", GAME_SCRIPTFILE},
- {"SOUNDSD.RSC", GAME_SOUNDFILE},
- {"VOICESD.RSC", GAME_VOICEFILE},
- {"MUSICD.RSC", GAME_MUSICFILE}
-};
-
static GAME_FONTDESC ITEMACDEMO_GameFonts[] = {
{GAME_FONT_MEDIUM, 0},
{GAME_FONT_SMALL, 2}
};
-// Inherit the Earth - win32 Wyrmkeep Linux Demo version
-static GAME_FILEDESC ITEWINDEMO_GameFiles[] = {
+// Inherit the Earth - Wyrmkeep Win32 Demo version
+static GAME_FILEDESC ITEWINDEMO2_GameFiles[] = {
+ {"ITED.RSC", GAME_RESOURCEFILE},
+ {"SCRIPTSD.RSC", GAME_SCRIPTFILE},
+ {"SOUNDSD.RSC", GAME_SOUNDFILE},
+ {"VOICESD.RSC", GAME_VOICEFILE}
+};
+
+// Inherit the Earth - Wyrmkeep Linux Demo version
+static GAME_FILEDESC ITELINDEMO_GameFiles[] = {
{"ITED.RSC", GAME_RESOURCEFILE},
{"SCRIPTSD.RSC", GAME_SCRIPTFILE},
{"SOUNDSD.RSC", GAME_SOUNDFILE},
@@ -83,8 +84,17 @@
{GAME_FONT_SMALL, 2}
};
+// Inherit the Earth - Mac Wyrmkeep version
+static GAME_FILEDESC ITEMACCD_GameFiles[] = {
+ {"ite.rsc", GAME_RESOURCEFILE},
+ {"scripts.rsc", GAME_SCRIPTFILE},
+ {"sounds.rsc", GAME_SOUNDFILE},
+ {"Inherit the Earth Voices", GAME_VOICEFILE},
+ {"music.rsc", GAME_MUSICFILE}
+};
+
// Inherit the Earth - win32 Wyrmkeep Demo version older release
-static GAME_FILEDESC ITEWINDEMOOld_GameFiles[] = {
+static GAME_FILEDESC ITEWINDEMO1_GameFiles[] = {
{"ITED.RSC", GAME_RESOURCEFILE},
{"SCRIPTSD.RSC", GAME_SCRIPTFILE},
{"SOUNDSD.RSC", GAME_SOUNDFILE},
@@ -181,12 +191,74 @@
GAME_SOUND_WAV, 0, 0, 0
};
+struct GAME_MD5 {
+ GAME_IDS id;
+ const char *md5;
+ const char *filename;
+ uint32 len;
+};
+
+static GAME_MD5 game_md5[] = {
+ { GID_ITE_DISK_G, "8f4315a9bb10ec839253108a032c8b54", "ite.rsc", 5000 },
+ { GID_ITE_DISK_G, "516f7330f8410057b834424ea719d1ef", "scripts.rsc", 5000 },
+ { GID_ITE_DISK_G, "c46e4392fcd2e89bc91e5567db33b62d", "voices.rsc", 5000 },
+
+ { GID_ITE_CD_G, "8f4315a9bb10ec839253108a032c8b54", "ite.rsc", 5000 },
+ { GID_ITE_CD_G, "a891405405edefc69c9d6c420c868b84", "scripts.rsc", 5000 },
+ { GID_ITE_CD_G, "e2ccb61c325d6d1ead3be0e731fe29fe", "sounds.rsc", 5000 },
+ { GID_ITE_CD_G, "41bb6b95d792dde5196bdb78740895a6", "voices.rsc", 5000 },
+
+ { GID_ITE_DEMO_G, "986c79c4d2939dbe555576529fd37932", "ite.rsc", 5000 },
+ { GID_ITE_DEMO_G, "d5697dd3240a3ceaddaa986c47e1a2d7", "scripts.rsc", 5000 },
+ { GID_ITE_DEMO_G, "c58e67c506af4ffa03fd0aac2079deb0", "voices.rsc", 5000 },
+
+ { GID_ITE_MACCD, "4f7fa11c5175980ed593392838523060", "ite.rsc", 5000 },
+ { GID_ITE_MACCD, "adf1f46c1d0589083996a7060c798ad0", "scripts.rsc", 5000 },
+ { GID_ITE_MACCD, "1a91cd60169f367ecb6c6e058d899b2f", "music.rsc", 5000 },
+ { GID_ITE_MACCD, "95863b89a0916941f6c5e1789843ba14", "sounds.rsc", 5000 },
+ { GID_ITE_MACCD, "c14c4c995e7a0d3828e3812a494301b7", "Inherit the Earth Voices", 5000 },
+
+ { GID_ITE_DISK_DE, "869fc23c8f38f575979ec67152914fee", "ite.rsc", 5000 },
+ { GID_ITE_DISK_DE, "516f7330f8410057b834424ea719d1ef", "scripts.rsc", 5000 },
+ { GID_ITE_DISK_DE, "0c9113e630f97ef0996b8c3114badb08", "voices.rsc", 5000 },
+
+ { GID_ITE_WINDEMO2, "3a450852cbf3c80773984d565647e6ac", "ited.rsc", 5000 },
+ { GID_ITE_WINDEMO2, "3f12b67fa93e56e1a6be39d2921d80bb", "scriptsd.rsc", 5000 },
+ { GID_ITE_WINDEMO2, "95a6c148e22e99a8c243f2978223583c", "soundsd.rsc", 5000 },
+ { GID_ITE_WINDEMO2, "e139d86bab2ee8ba3157337f894a92d4", "voicesd.rsc", 5000 },
+
+ { GID_ITE_LINDEMO, "3a450852cbf3c80773984d565647e6ac", "ited.rsc", 5000 },
+ { GID_ITE_LINDEMO, "3f12b67fa93e56e1a6be39d2921d80bb", "scriptsd.rsc", 5000 },
+ { GID_ITE_LINDEMO, "d6454756517f042f01210458abe8edd4", "musicd.rsc", 5000 },
+ { GID_ITE_LINDEMO, "95a6c148e22e99a8c243f2978223583c", "soundsd.rsc", 5000 },
+ { GID_ITE_LINDEMO, "e139d86bab2ee8ba3157337f894a92d4", "voicesd.rsc", 5000 },
+
+ { GID_ITE_MACDEMO2, "addfc9d82bc2fa1f4cab23743c652c08", "ited.rsc", 5000 },
+ { GID_ITE_MACDEMO2, "fded5c59b8b7c5976229f960d21e6b0b", "scriptsd.rsc", 5000 },
+ { GID_ITE_MACDEMO2, "495bdde51fd9f4bea2b9c911091b1ab2", "musicd.rsc", 5000 },
+ { GID_ITE_MACDEMO2, "b3a831fbed337d1f1300fee1dd474f6c", "soundsd.rsc", 5000 },
+ { GID_ITE_MACDEMO2, "e139d86bab2ee8ba3157337f894a92d4", "voicesd.rsc", 5000 },
+
+ { GID_ITE_WINDEMO1, "3a450852cbf3c80773984d565647e6ac", "ited.rsc", 5000 },
+ { GID_ITE_WINDEMO1, "3f12b67fa93e56e1a6be39d2921d80bb", "scriptsd.rsc", 5000 },
+ { GID_ITE_WINDEMO1, "a741139dd7365a13f463cd896ff9969a", "soundsd.rsc", 5000 },
+ { GID_ITE_WINDEMO1, "0759eaf5b64ae19fd429920a70151ad3", "voicesd.rsc", 5000 },
+
+ { GID_ITE_MACDEMO1, "addfc9d82bc2fa1f4cab23743c652c08", "ited.rsc", 5000 },
+ { GID_ITE_MACDEMO1, "fded5c59b8b7c5976229f960d21e6b0b", "scriptsd.rsc", 5000 },
+ { GID_ITE_MACDEMO1, "1a91cd60169f367ecb6c6e058d899b2f", "musicd.rsc", 5000 },
+ { GID_ITE_MACDEMO1, "b3a831fbed337d1f1300fee1dd474f6c", "soundsd.rsc", 5000 },
+ { GID_ITE_MACDEMO1, "e139d86bab2ee8ba3157337f894a92d4", "voicesd.rsc", 5000 },
+};
+
+static bool gameMD5check(int descNum);
+
static GAMEDESC GameDescs[] = {
// Inherit the earth - DOS Demo version
{
"ite-demo",
GType_ITE,
- GID_ITE_DEMO, // Game id
+ GID_ITE_DEMO_G, // Game id
"Inherit the Earth (DOS Demo)", // Game title
320, 200, // Logical resolution
137, // Scene viewport height
@@ -201,55 +273,108 @@
},
// Inherit the earth - MAC Demo version
- // Note: it should be before win32 version ???
{
"ite-demo",
GType_ITE,
- GID_ITE_MACDEMO,
+ GID_ITE_MACDEMO2,
"Inherit the Earth (MAC Demo)",
320, 200,
137,
ITE_DEFAULT_SCENE,
&ITE_Resources,
- ARRAYSIZE(ITEMACDEMO_GameFiles),
- ITEMACDEMO_GameFiles,
+ ARRAYSIZE(ITEWINDEMO2_GameFiles),
+ ITEWINDEMO2_GameFiles,
ARRAYSIZE(ITEMACDEMO_GameFonts),
ITEMACDEMO_GameFonts,
&ITECD_GameSound,
- GF_VOX_VOICES | GF_BIG_ENDIAN_DATA
+ GF_VOX_VOICES | GF_BIG_ENDIAN_DATA | GF_MAC_RESOURCES
+ },
+
+ // Inherit the earth - early MAC Demo version
+ {
+ "ite-demo",
+ GType_ITE,
+ GID_ITE_MACDEMO1,
+ "Inherit the Earth (early MAC Demo)",
+ 320, 200,
+ 137,
+ ITE_DEFAULT_SCENE,
+ &ITE_Resources,
+ ARRAYSIZE(ITEWINDEMO2_GameFiles),
+ ITEWINDEMO2_GameFiles,
+ ARRAYSIZE(ITEMACDEMO_GameFonts),
+ ITEMACDEMO_GameFonts,
+ &ITECD_GameSound,
+ GF_BIG_ENDIAN_DATA | GF_MAC_RESOURCES
+ },
+
+ // Inherit the earth - MAC CD Wyrmkeep version
+ {
+ "ite",
+ GType_ITE,
+ GID_ITE_MACCD,
+ "Inherit the Earth (MAC CD)",
+ 320, 200,
+ 137,
+ ITE_DEFAULT_SCENE,
+ &ITE_Resources,
+ ARRAYSIZE(ITEMACCD_GameFiles),
+ ITEMACCD_GameFiles,
+ ARRAYSIZE(ITEMACDEMO_GameFonts),
+ ITEMACDEMO_GameFonts,
+ &ITECD_GameSound,
+ GF_BIG_ENDIAN_DATA | GF_MAC_RESOURCES
},
// Inherit the earth - Linux Demo version
- // Note: it should be before win32 version
+ // Note: it should be before GID_ITE_WINDEMO2 version
{
"ite-demo",
GType_ITE,
- GID_ITE_WINDEMO,
+ GID_ITE_LINDEMO,
"Inherit the Earth (Linux Demo)",
320, 200,
137,
ITE_DEFAULT_SCENE,
&ITE_Resources,
- ARRAYSIZE(ITEWINDEMO_GameFiles),
- ITEWINDEMO_GameFiles,
+ ARRAYSIZE(ITELINDEMO_GameFiles),
+ ITELINDEMO_GameFiles,
ARRAYSIZE(ITECD_GameFonts),
ITECD_GameFonts,
&ITECD_GameSound,
GF_VOX_VOICES
},
- // Inherit the earth - Win32 Demo version
+ // Inherit the earth - Linux Demo version
{
"ite-demo",
GType_ITE,
- GID_ITE_WINDEMO,
+ GID_ITE_WINDEMO2,
"Inherit the Earth (Win32 Demo)",
320, 200,
137,
ITE_DEFAULT_SCENE,
&ITE_Resources,
- ARRAYSIZE(ITEWINDEMOOld_GameFiles),
- ITEWINDEMO_GameFiles,
+ ARRAYSIZE(ITEWINDEMO2_GameFiles),
+ ITEWINDEMO2_GameFiles,
+ ARRAYSIZE(ITECD_GameFonts),
+ ITECD_GameFonts,
+ &ITECD_GameSound,
+ GF_VOX_VOICES
+ },
+
+ // Inherit the earth - Win32 Demo version
+ {
+ "ite-demo",
+ GType_ITE,
+ GID_ITE_WINDEMO1,
+ "Inherit the Earth (early Win32 Demo)",
+ 320, 200,
+ 137,
+ ITE_DEFAULT_SCENE,
+ &ITE_Resources,
+ ARRAYSIZE(ITEWINDEMO1_GameFiles),
+ ITEWINDEMO1_GameFiles,
ARRAYSIZE(ITEWINDEMO_GameFonts),
ITEWINDEMO_GameFonts,
&ITECD_GameSound,
@@ -257,12 +382,11 @@
},
// Inherit the earth - CD version
- // NOTE: it should be before floppy version
{
"ite",
GType_ITE,
- GID_ITE_CD,
- "Inherit the Earth (DOS CD Version)",
+ GID_ITE_CD_G,
+ "Inherit the Earth (DOS/Win32 CD Version)",
320, 200,
137,
ITE_DEFAULT_SCENE,
@@ -275,12 +399,30 @@
0
},
+ // Inherit the earth - German Floppy version
+ {
+ "ite",
+ GType_ITE,
+ GID_ITE_DISK_DE,
+ "Inherit the Earth (De DOS Floppy)",
+ 320, 200,
+ 137,
+ ITE_DEFAULT_SCENE,
+ &ITE_Resources,
+ ARRAYSIZE(ITEDISK_GameFiles),
+ ITEDISK_GameFiles,
+ ARRAYSIZE(ITEDISK_GameFonts),
+ ITEDISK_GameFonts,
+ &ITE_GameSound,
+ GF_LANG_DE
+ },
+
// Inherit the earth - Disk version
{
"ite",
GType_ITE,
- GID_ITE_DISK,
- "Inherit the Earth (DOS)",
+ GID_ITE_DISK_G,
+ "Inherit the Earth (DOS Floppy)",
320, 200,
137,
ITE_DEFAULT_SCENE,
@@ -481,6 +623,10 @@
// game
if (file_missing) {
continue;
+ } else {
+ debug(0, "Pre-Found game: %s", GameDescs[game_n].gd_title);
+ if (!gameMD5check(game_n))
+ continue;
}
debug(0, "Found game: %s", GameDescs[game_n].gd_title);
@@ -505,6 +651,10 @@
GameModule.game_number = game_n;
GameModule.gamedesc = &GameDescs[game_n];
+ _gameId = GameModule.gamedesc->gd_game_id;
+ _gameType = GameModule.gamedesc->gd_game_type;
+ _features = GameModule.gamedesc->features;
+
game_filect = GameDescs[game_n].gd_filect;
GameModule.gfile_data = (GAME_FILEDATA *)malloc(game_filect * sizeof *GameModule.gfile_data);
@@ -532,10 +682,6 @@
GameModule.gd_fontct = GameDescs[game_n].gd_fontct;
GameModule.gd_fontdescs = GameDescs[game_n].gd_fontdescs;
- _gameId = GameModule.gamedesc->gd_game_id;
- _gameType = GameModule.gamedesc->gd_game_type;
- _features = GameModule.gamedesc->features;
-
return SUCCESS;
}
@@ -579,4 +725,32 @@
return SUCCESS;
}
+static bool gameMD5check(int descNum) {
+ bool result = true;
+ char md5str[32+1];
+ uint8 md5sum[16];
+
+ for (int i = 0; i < ARRAYSIZE(game_md5); i++) {
+ if (game_md5[i].id == GameDescs[descNum].gd_game_id) {
+ if (md5_file(game_md5[i].filename, md5sum, NULL, game_md5[i].len)) {
+ for (int j = 0; j < 16; j++) {
+ sprintf(md5str + j*2, "%02x", (int)md5sum[j]);
+ }
+
+ if (strcmp(game_md5[i].md5, md5str)) {
+ result = false;
+ debug(0, "!MD5 for %s wrong", game_md5[i].filename);
+ break;
+ } else {
+ debug(0, "MD5 for %s correct", game_md5[i].filename);
+ }
+ } else {
+ result = false;
+ }
+ }
+ }
+
+ return result;
+}
+
} // End of namespace Saga
Index: music.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/saga/music.cpp,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -d -r1.40 -r1.41
--- music.cpp 22 Dec 2004 13:09:47 -0000 1.40
+++ music.cpp 22 Dec 2004 19:34:41 -0000 1.41
@@ -138,7 +138,7 @@
if (len & 1)
len--;
- if (IS_BIG_ENDIAN) {
+ if (_vm->_features & GF_BIG_ENDIAN_DATA) {
uint16 *ptr16 = (uint16 *)ptr;
for (uint32 i = 0; i < (len / 2); i++)
ptr16[i] = TO_BE_16(ptr16[i]);
Index: rscfile.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/saga/rscfile.cpp,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- rscfile.cpp 22 Dec 2004 13:09:47 -0000 1.13
+++ rscfile.cpp 22 Dec 2004 19:34:41 -0000 1.14
@@ -264,7 +264,7 @@
int RSC_ConvertID(int id) {
int res = id;
- if (IS_MAC_VERSION) {
+ if (_vm->_features & GF_MAC_RESOURCES) {
if (res > 1537)
res -= 2;
else if (res == 1535 || res == 1536) {
Index: saga.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/saga/saga.h,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -d -r1.50 -r1.51
--- saga.h 22 Dec 2004 13:09:47 -0000 1.50
+++ saga.h 22 Dec 2004 19:34:41 -0000 1.51
@@ -90,17 +90,35 @@
#define IS_BIG_ENDIAN ((_vm->_features & GF_BIG_ENDIAN_DATA) != 0)
-#define IS_MAC_VERSION (_vm->_gameId == GID_ITE_MACDEMO)
enum GAME_IDS {
- GID_ITE_DEMO = 0,
- GID_ITE_DISK = 1,
- GID_ITE_CD = 2,
- GID_IHNM_DEMO = 3,
- GID_IHNM_CD = 4,
- GID_ITE_WINDEMO = 5,
- GID_ITE_MACDEMO = 6
+ // Dreamers Guild
+ GID_ITE_DEMO_G = 0,
+ GID_ITE_DISK_G,
+ GID_ITE_CD_G,
+ GID_ITE_MAC_G, // TODO
+
+ // Wyrmkeep
+ //GID_ITE_CD, // data for Win rerelease is same as in old DOS
+ GID_ITE_MACCD,
+ GID_ITE_WINDEMO1, // older Wyrmkeep windows demo
+ GID_ITE_MACDEMO1, // older Wyrmkeep mac demo
+ GID_ITE_LINDEMO,
+ GID_ITE_WINDEMO2,
+ GID_ITE_MACDEMO2,
+
+ // German
+ GID_ITE_DISK_DE,
+ GID_ITE_AMIGACD_DE, // TODO
+ GID_ITE_OLDMAC_DE, // TODO
+ GID_ITE_AMIGA_FL_DE,
+ GID_ITE_CD_DE, // don't have it
+ GID_ITE_AMIGA_AGA_DEMO,
+ GID_ITE_AMIGA_ECS_DEMO,
+
+ GID_IHNM_DEMO,
+ GID_IHNM_CD
};
enum GAME_FILETYPES {
@@ -133,7 +151,9 @@
enum GAME_FEATURES {
GF_VOX_VOICES = 1,
- GF_BIG_ENDIAN_DATA = 2
+ GF_BIG_ENDIAN_DATA = 2,
+ GF_MAC_RESOURCES = 4,
+ GF_LANG_DE = 8
};
struct GAME_DISPLAYINFO {
Index: sound.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/saga/sound.cpp,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- sound.cpp 22 Dec 2004 13:09:47 -0000 1.17
+++ sound.cpp 22 Dec 2004 19:34:41 -0000 1.18
@@ -164,8 +164,11 @@
if (loop)
flags |= SoundMixer::FLAG_LOOP;
- if (buf->s_samplebits == 16)
- flags |= (SoundMixer::FLAG_16BITS | SoundMixer::FLAG_LITTLE_ENDIAN);
+ if (buf->s_samplebits == 16) {
+ flags |= SoundMixer::FLAG_16BITS;
+ if (!(_vm->_features & GF_BIG_ENDIAN_DATA))
+ flags |= SoundMixer::FLAG_LITTLE_ENDIAN;
+ }
if (buf->s_stereo)
flags |= SoundMixer::FLAG_STEREO;
if (!buf->s_signed)
Index: sthread.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/saga/sthread.cpp,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -d -r1.44 -r1.45
--- sthread.cpp 22 Dec 2004 13:09:47 -0000 1.44
+++ sthread.cpp 22 Dec 2004 19:34:41 -0000 1.45
@@ -762,7 +762,7 @@
}
// now data contains last string index
- if (_vm->_gameId == GID_ITE_DISK) { // special ITE dos
+ if (_vm->_gameId == GID_ITE_DISK_G) { // special ITE dos
if ((_vm->_scene->currentSceneNumber() == ITE_DEFAULT_SCENE) && (data >= 288) && (data <= (SCENE1_VOICE_138 - SCENE1_VOICE_009 + 288))) {
sampleResourceId = SCENE1_VOICE_009 + data - 288;
}
More information about the Scummvm-git-logs
mailing list