[Scummvm-cvs-logs] CVS: scummvm/simon simon-md5.h,NONE,1.1 intern.h,1.30,1.31 simon.cpp,1.439,1.440 sound.cpp,1.66,1.67
Travis Howell
kirben at users.sourceforge.net
Fri Jul 30 02:01:03 CEST 2004
Update of /cvsroot/scummvm/scummvm/simon
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29916/simon
Modified Files:
intern.h simon.cpp sound.cpp
Added Files:
simon-md5.h
Log Message:
Reduce simon 1/2 targets
Add auto detection
--- NEW FILE: simon-md5.h ---
/*
This file was generated by the md5table tool on Thu Mar 25 11:31:33 2004
DO NOT EDIT MANUALLY!
*/
struct MD5Table {
const char *md5;
const char *target;
Common::Language language;
Common::Platform platform;
};
static const MD5Table md5table[] = {
{ "078b04da0974a40645b92baffdf2781e", "simon2talkie", Common::EN_USA, Common::kPlatformPC },
{ "27c8e7feada80c75b70b9c2f6088d519", "simon2dos", Common::EN_USA, Common::kPlatformPC },
{ "465eed710cc242b2de7dc77edd467c4c", "simon1dos", Common::EN_USA, Common::kPlatformPC },
{ "48ce4ffda968cc7a38870c354571f92c", "simon1dos", Common::EN_USA, Common::kPlatformPC },
{ "9d58f84988634d217c944cd4153a2a3b", "simon1talkie", Common::HB_ISR, Common::kPlatformPC },
{ "a3cbdd3450f9fccb0a9d8d6dc28f66fe", "simon2talkie", Common::HB_ISR, Common::kPlatformPC },
{ "bd85a8b5135592ada9cbeae49160f1d3", "simon2win", Common::EN_USA, Common::kPlatformPC },
{ "bed9134804d96f72afa152b8ec5628c3", "simon1dos", Common::FR_FRA, Common::kPlatformPC },
{ "c8ddd48919aa75423dd2d3e5864909df", "simon2talkie", Common::FR_FRA, Common::kPlatformPC },
{ "c8f5b860a20dcc63915d94cf2bdcfa49", "simon1dos", Common::IT_ITA, Common::kPlatformPC },
{ "d22302abf44219f95d50f2faa807dd1a", "simon1win", Common::EN_USA, Common::kPlatformPC },
{ "d545db8a0efae95a90b23da81aadb201", "simon1talkie", Common::EN_USA, Common::kPlatformPC },
{ "e3712b3ed4429e736123a40276f533d7", "simon1talkie", Common::ES_ESP, Common::kPlatformPC },
{ 0, 0, Common::UNK_LANG, Common::kPlatformUnknown }
};
Index: intern.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/simon/intern.h,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -d -r1.30 -r1.31
--- intern.h 22 Feb 2004 14:11:15 -0000 1.30
+++ intern.h 30 Jul 2004 09:00:28 -0000 1.31
@@ -153,10 +153,9 @@
GF_WIN = 1 << 1,
GF_TALKIE = 1 << 2,
GF_DEMO = 1 << 3,
- GF_MAC = 1 << 4,
- GF_AMIGA = 1 << 5,
- GF_ACORN = 1 << 6,
- GF_OLD_BUNDLE = 1 << 7
+ GF_AMIGA = 1 << 4,
+ GF_ACORN = 1 << 5,
+ GF_OLD_BUNDLE = 1 << 6
};
enum {
@@ -164,10 +163,7 @@
GAME_SIMON2DOS = GF_SIMON2,
GAME_SIMON1TALKIE = GF_TALKIE,
GAME_SIMON2TALKIE = GF_SIMON2 | GF_TALKIE,
- GAME_SIMON1WIN = GF_WIN | GF_TALKIE,
- GAME_SIMON2WIN = GF_SIMON2 | GF_WIN | GF_TALKIE,
GAME_SIMON1DEMO = GF_DEMO | GF_OLD_BUNDLE,
- GAME_SIMON2MAC = GF_SIMON2 | GF_WIN | GF_TALKIE | GF_MAC,
GAME_SIMON1AMIGA = GF_AMIGA | GF_OLD_BUNDLE,
GAME_SIMON1CD32 = GF_TALKIE | GF_AMIGA | GF_OLD_BUNDLE,
GAME_SIMON1ACORN = GF_TALKIE | GF_ACORN
Index: simon.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/simon/simon.cpp,v
retrieving revision 1.439
retrieving revision 1.440
diff -u -d -r1.439 -r1.440
--- simon.cpp 27 Jul 2004 07:21:28 -0000 1.439
+++ simon.cpp 30 Jul 2004 09:00:28 -0000 1.440
@@ -28,6 +28,7 @@
#include "common/config-manager.h"
#include "common/file.h"
+#include "common/md5.h"
#include "gui/about.h"
#include "gui/message.h"
@@ -36,6 +37,7 @@
#include "simon/intern.h"
#include "simon/vga.h"
#include "simon/debugger.h"
+#include "simon/simon-md5.h"
#include "sound/mididrv.h"
@@ -61,21 +63,24 @@
static const SimonGameSettings simon_settings[] = {
// Simon the Sorcerer 1 & 2 (not SCUMM games)
- {"simon1acorn", "Simon the Sorcerer 1 (Acorn)", GAME_SIMON1ACORN, "DATA"},
+ {"simon1acorn", "Simon the Sorcerer 1 (Acorn)", GAME_SIMON1ACORN, "GAMEBASE"},
{"simon1dos", "Simon the Sorcerer 1 (DOS)", GAME_SIMON1DOS, "GAMEPC"},
{"simon1amiga", "Simon the Sorcerer 1 (Amiga)", GAME_SIMON1AMIGA, "gameamiga"},
{"simon2dos", "Simon the Sorcerer 2 (DOS)", GAME_SIMON2DOS, "GAME32"},
- {"simon1talkie", "Simon the Sorcerer 1 Talkie (DOS)", GAME_SIMON1TALKIE, "SIMON.GME"},
- {"simon2talkie", "Simon the Sorcerer 2 Talkie (DOS)", GAME_SIMON2TALKIE, "GSPTR30"},
- {"simon1win", "Simon the Sorcerer 1 Talkie (Windows)", GAME_SIMON1WIN, "SIMON.GME"},
+ {"simon1talkie", "Simon the Sorcerer 1 Talkie", GAME_SIMON1TALKIE, "GAMEPC"},
+ {"simon2talkie", "Simon the Sorcerer 2 Talkie", GAME_SIMON2TALKIE, "GSPTR30"},
{"simon1cd32", "Simon the Sorcerer 1 Talkie (Amiga CD32)", GAME_SIMON1CD32, "gameamiga"},
- {"simon2win", "Simon the Sorcerer 2 Talkie (Windows)", GAME_SIMON2WIN, "GSPTR30"},
- {"simon2mac", "Simon the Sorcerer 2 Talkie (Amiga or Mac)", GAME_SIMON2MAC, "simon2.dic"},
{"simon1demo", "Simon the Sorcerer 1 (DOS Demo)", GAME_SIMON1DEMO, "GDEMO"},
{NULL, NULL, 0, NULL}
};
+static int compareMD5Table(const void *a, const void *b) {
+ const char *key = (const char *)a;
+ const MD5Table *elem = (const MD5Table *)b;
+ return strcmp(key, elem->md5);
+}
+
GameList Engine_SIMON_gameList() {
const SimonGameSettings *g = simon_settings;
GameList games;
@@ -92,6 +97,9 @@
char detectName[128];
char detectName2[128];
+ typedef Common::Map<Common::String, bool> StringSet;
+ StringSet fileSet;
+
for (g = simon_settings; g->name; ++g) {
strcpy(detectName, g->detectname);
strcpy(detectName2, g->detectname);
@@ -105,14 +113,70 @@
(0 == scumm_stricmp(detectName2, name))) {
// Match found, add to list of candidates, then abort inner loop.
detectedGames.push_back(g->toGameSettings());
+ fileSet.addKey(file->path());
break;
}
}
}
+
+ // Now, we check the MD5 sums of the 'candidate' files. If we have an exact match,
+ // only return that.
+ bool exactMatch = false;
+ for (StringSet::const_iterator iter = fileSet.begin(); iter != fileSet.end(); ++iter) {
+ uint8 md5sum[16];
+ const char *name = iter->_key.c_str();
+ if (md5_file(name, md5sum)) {
+ char md5str[32+1];
+ for (int j = 0; j < 16; j++) {
+ sprintf(md5str + j*2, "%02x", (int)md5sum[j]);
+ }
+
+ const MD5Table *elem;
+ elem = (const MD5Table *)bsearch(md5str, md5table, ARRAYSIZE(md5table)-1, sizeof(MD5Table), compareMD5Table);
+ if (elem) {
+ if (!exactMatch)
+ detectedGames.clear(); // Clear all the non-exact candidates
+ // Find the GameSettings for that target
+ for (g = simon_settings; g->name; ++g) {
+ if (0 == scumm_stricmp(g->name, elem->target))
+ break;
+ }
+ assert(g->name);
+ // Insert the 'enhanced' game data into the candidate list
+ detectedGames.push_back(DetectedGame(g->toGameSettings(), elem->language, elem->platform));
+ exactMatch = true;
+ }
+ }
+ }
+
return detectedGames;
}
Engine *Engine_SIMON_create(GameDetector *detector, OSystem *syst) {
+ const SimonGameSettings *g = simon_settings;
+ while (g->name) {
+ if (!scumm_stricmp(detector->_game.name, g->name))
+ break;
+ g++;
+ }
+ if (!g->name)
+ error("Invalid game '%s'\n", detector->_game.name);
+
+ SimonGameSettings game = *g;
+
+ switch (Common::parsePlatform(ConfMan.get("platform"))) {
+ case Common::kPlatformAmiga:
+ case Common::kPlatformMacintosh:
+ if (game.features & GF_SIMON2)
+ game.features |= GF_WIN;
+ break;
+ case Common::kPlatformWindows:
+ game.features |= GF_WIN;
+ break;
+ default:
+ break;
+ }
+
return new Simon::SimonEngine(detector, syst);
}
@@ -127,7 +191,6 @@
static const GameSpecificSettings *simon1amiga_settings;
static const GameSpecificSettings *simon1demo_settings;
static const GameSpecificSettings *simon2win_settings;
-static const GameSpecificSettings *simon2mac_settings;
static const GameSpecificSettings *simon2dos_settings;
#else
#define PTR(a) &a
@@ -201,20 +264,6 @@
"GSPTR30", // gamepc_filename
};
-static const GameSpecificSettings simon2mac_settings = {
- "Simon2.gme", // gme_filename
- "", // wav_filename
- "", // voc_filename
- "SIMON2.MP3", // mp3_filename
- "SIMON2.OGG", // vorbis_filename
- "SIMON2.FLA", // flac_filename
- "", // voc_effects_filename
- "", // mp3_effects_filename
- "", // vorbis_effects_filename
- "", // flac_effects_filename
- "gsptr30", // gamepc_filename
-};
-
static const GameSpecificSettings simon2dos_settings = {
"SIMON2.GME", // gme_filename
"", // wav_filename
@@ -269,15 +318,13 @@
SOUND_INDEX_BASE = 0;
}
- if (_game & GF_MAC) {
- gss = PTR(simon2mac_settings);
+ if ((_game & GF_SIMON2) && (_game & GF_TALKIE)) {
+ gss = PTR(simon2win_settings);
// Add default file directories
File::addDefaultDirectory(_gameDataPath + "/voices/");
File::addDefaultDirectory(_gameDataPath + "/VOICES/");
- } else if ((_game & GF_SIMON2) && (_game & GF_TALKIE))
- gss = PTR(simon2win_settings);
- else if (_game & GF_SIMON2)
+ } else if (_game & GF_SIMON2)
gss = PTR(simon2dos_settings);
else if (_game & GF_ACORN) {
gss = PTR(simon1acorn_settings);
@@ -1224,11 +1271,11 @@
readSubroutineBlock(in);
closeTablesFile(in);
- if (_game == GAME_SIMON1WIN) {
+ if (_game & GF_SIMON2) {
+ _sound->loadSfxTable(_game_file, _game_offsets_ptr[atoi(filename + 6) - 1 + SOUND_INDEX_BASE]);
+ } else if (_game & GF_WIN) {
memcpy(filename, "SFXXXX", 6);
_sound->readSfxFile(filename);
- } else if (_game & GF_SIMON2) {
- _sound->loadSfxTable(_game_file, _game_offsets_ptr[atoi(filename + 6) - 1 + SOUND_INDEX_BASE]);
}
alignTableMem();
@@ -5127,7 +5174,6 @@
_GSETPTR(Simon::simon1amiga_settings, GBVARS_SIMON1AMIGASETTINGS_INDEX, Simon::GameSpecificSettings, GBVARS_SIMON)
_GSETPTR(Simon::simon1demo_settings, GBVARS_SIMON1DEMOSETTINGS_INDEX, Simon::GameSpecificSettings, GBVARS_SIMON)
_GSETPTR(Simon::simon2win_settings, GBVARS_SIMON2WINSETTINGS_INDEX, Simon::GameSpecificSettings, GBVARS_SIMON)
-_GSETPTR(Simon::simon2mac_settings, GBVARS_SIMON2MACSETTINGS_INDEX, Simon::GameSpecificSettings, GBVARS_SIMON)
_GSETPTR(Simon::simon2dos_settings, GBVARS_SIMON2DOSSETTINGS_INDEX, Simon::GameSpecificSettings, GBVARS_SIMON)
_GSETPTR(Simon::_simon1_cursor, GBVARS_SIMON1CURSOR_INDEX, byte, GBVARS_SIMON)
_GEND
@@ -5138,7 +5184,6 @@
_GRELEASEPTR(GBVARS_SIMON1AMIGASETTINGS_INDEX, GBVARS_SIMON)
_GRELEASEPTR(GBVARS_SIMON1DEMOSETTINGS_INDEX, GBVARS_SIMON)
_GRELEASEPTR(GBVARS_SIMON2WINSETTINGS_INDEX, GBVARS_SIMON)
-_GRELEASEPTR(GBVARS_SIMON2MACSETTINGS_INDEX, GBVARS_SIMON)
_GRELEASEPTR(GBVARS_SIMON2DOSSETTINGS_INDEX, GBVARS_SIMON)
_GRELEASEPTR(GBVARS_SIMON1CURSOR_INDEX, GBVARS_SIMON)
_GEND
Index: sound.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/simon/sound.cpp,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -d -r1.66 -r1.67
--- sound.cpp 27 Jun 2004 22:14:34 -0000 1.66
+++ sound.cpp 30 Jul 2004 09:00:29 -0000 1.67
@@ -312,23 +312,19 @@
#endif
if (!_voice) {
// for simon2 mac/amiga, only read index file
- if (_game == GAME_SIMON2MAC) {
- file->open("voices.idx");
- if (file->isOpen() == false) {
- warning("Can't open voice index file 'voices.idx'");
- } else {
- file->seek(0, SEEK_END);
- int end = file->pos();
- file->seek(0, SEEK_SET);
- _filenums = (uint16 *)malloc((end / 6 + 1) * 2);
- _offsets = (uint32 *)malloc((end / 6 + 1) * 4);
+ file->open("voices.idx");
+ if (file->isOpen() == true) {
+ file->seek(0, SEEK_END);
+ int end = file->pos();
+ file->seek(0, SEEK_SET);
+ _filenums = (uint16 *)malloc((end / 6 + 1) * 2);
+ _offsets = (uint32 *)malloc((end / 6 + 1) * 4);
- for (int i = 1; i <= end / 6; i++) {
- _filenums[i] = file->readUint16BE();
- _offsets[i] = file->readUint32BE();
- }
- _voice_file = true;
+ for (int i = 1; i <= end / 6; i++) {
+ _filenums[i] = file->readUint16BE();
+ _offsets[i] = file->readUint32BE();
}
+ _voice_file = true;
delete file;
} else if (_game & GF_WIN) {
s = gss->wav_filename;
@@ -462,7 +458,7 @@
}
void Sound::playVoice(uint sound) {
- if (_game == GAME_SIMON2MAC && _filenums) {
+ if (_filenums) {
if (_last_voice_file != _filenums[sound]) {
stopAll();
More information about the Scummvm-git-logs
mailing list