thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Renamed SCI_VERSION_01 -> SCI_VERSION_01_EGA

Browse source 
svn-id: r42181
This commit is contained in:
Filippos Karapetis 2009-07-06 16:22:14 +00:00
parent c22010b3d2
commit 219b0de0d2
9 changed files with 28 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

34
engines/sci/detection.cpp
View file

@ -949,8 +949,8 @@ static const struct SciGameDescription SciGameDescriptions[] = {
{"resource.004", 0, "9ae2a13708d691cd42f9129173c4b39d", 820443}, {"resource.004", 0, "9ae2a13708d691cd42f9129173c4b39d", 820443},
{NULL, 0, NULL, 0}}, Common::EN_ANY, Common::kPlatformAmiga, 0, GUIO_NOSPEECH}, {NULL, 0, NULL, 0}}, Common::EN_ANY, Common::kPlatformAmiga, 0, GUIO_NOSPEECH},
0, 0,
SCI_VERSION_01, SCI_VERSION_01_EGA,
SCI_VERSION_01 SCI_VERSION_01_EGA
}, },
// King's Quest 1 SCI Remake - English DOS Non-Interactive Demo // King's Quest 1 SCI Remake - English DOS Non-Interactive Demo
@ -2066,8 +2066,8 @@ static const struct SciGameDescription SciGameDescriptions[] = {
{"resource.001", 0, "9e33566515b18bee7915db448063bba2", 871853}, {"resource.001", 0, "9e33566515b18bee7915db448063bba2", 871853},
{NULL, 0, NULL, 0}}, Common::EN_ANY, Common::kPlatformPC, ADGF_DEMO, GUIO_NOSPEECH}, {NULL, 0, NULL, 0}}, Common::EN_ANY, Common::kPlatformPC, ADGF_DEMO, GUIO_NOSPEECH},
0, 0,
SCI_VERSION_01, SCI_VERSION_01_EGA,
SCI_VERSION_01 SCI_VERSION_01_EGA
}, },
// Mixed-Up Fairy Tales v1.000 - English DOS (supplied by markcoolio in bug report #2723791) // Mixed-Up Fairy Tales v1.000 - English DOS (supplied by markcoolio in bug report #2723791)
@ -2081,8 +2081,8 @@ static const struct SciGameDescription SciGameDescriptions[] = {
{"resource.004", 0, "f79daa70390d73746742ffcfc3dc4471", 937580}, {"resource.004", 0, "f79daa70390d73746742ffcfc3dc4471", 937580},
{NULL, 0, NULL, 0}}, Common::EN_ANY, Common::kPlatformPC, 0, GUIO_NOSPEECH}, {NULL, 0, NULL, 0}}, Common::EN_ANY, Common::kPlatformPC, 0, GUIO_NOSPEECH},
0, 0,
SCI_VERSION_01, SCI_VERSION_01_EGA,
SCI_VERSION_01 SCI_VERSION_01_EGA
}, },
// Mixed-Up Fairy Tales - English DOS Floppy (from jvprat) // Mixed-Up Fairy Tales - English DOS Floppy (from jvprat)
@ -2095,8 +2095,8 @@ static const struct SciGameDescription SciGameDescriptions[] = {
{"resource.003", 0, "dd6cef0c592eadb7e6be9a25307c57a2", 1344719}, {"resource.003", 0, "dd6cef0c592eadb7e6be9a25307c57a2", 1344719},
{NULL, 0, NULL, 0}}, Common::EN_ANY, Common::kPlatformPC, 0, GUIO_NOSPEECH}, {NULL, 0, NULL, 0}}, Common::EN_ANY, Common::kPlatformPC, 0, GUIO_NOSPEECH},
0, 0,
SCI_VERSION_01, SCI_VERSION_01_EGA,
SCI_VERSION_01 SCI_VERSION_01_EGA
}, },
// Mixed-Up Mother Goose - English Amiga (from www.back2roots.org) // Mixed-Up Mother Goose - English Amiga (from www.back2roots.org)
@ -2108,8 +2108,8 @@ static const struct SciGameDescription SciGameDescriptions[] = {
{"resource.002", 0, "fb552ae550ca1dac19ed8f6a3767612d", 817191}, {"resource.002", 0, "fb552ae550ca1dac19ed8f6a3767612d", 817191},
{NULL, 0, NULL, 0}}, Common::EN_ANY, Common::kPlatformAmiga, 0, GUIO_NOSPEECH}, {NULL, 0, NULL, 0}}, Common::EN_ANY, Common::kPlatformAmiga, 0, GUIO_NOSPEECH},
0, 0,
SCI_VERSION_01, SCI_VERSION_01_EGA,
SCI_VERSION_01 SCI_VERSION_01_EGA
}, },
// Mixed-Up Mother Goose v2.000 - English DOS Floppy (supplied by markcoolio in bug report #2723795) // Mixed-Up Mother Goose v2.000 - English DOS Floppy (supplied by markcoolio in bug report #2723795)
@ -2119,8 +2119,8 @@ static const struct SciGameDescription SciGameDescriptions[] = {
{"resource.000", 0, "b7ecd8ae9e254e80310b5a668b276e6e", 2948975}, {"resource.000", 0, "b7ecd8ae9e254e80310b5a668b276e6e", 2948975},
{NULL, 0, NULL, 0}}, Common::EN_ANY, Common::kPlatformPC, 0, GUIO_NOSPEECH}, {NULL, 0, NULL, 0}}, Common::EN_ANY, Common::kPlatformPC, 0, GUIO_NOSPEECH},
0, 0,
SCI_VERSION_01, SCI_VERSION_01_EGA,
SCI_VERSION_01 SCI_VERSION_01_EGA
}, },
// Mixed-Up Mother Goose - English DOS CD (from jvprat) // Mixed-Up Mother Goose - English DOS CD (from jvprat)
@ -2520,7 +2520,7 @@ static const struct SciGameDescription SciGameDescriptions[] = {
{NULL, 0, NULL, 0}}, Common::JA_JPN, Common::kPlatformPC98, 0, GUIO_NOSPEECH}, {NULL, 0, NULL, 0}}, Common::JA_JPN, Common::kPlatformPC98, 0, GUIO_NOSPEECH},
0, 0,
SCI_VERSION_AUTODETECT, SCI_VERSION_AUTODETECT,
SCI_VERSION_01 SCI_VERSION_01_EGA
}, },
// Quest for Glory 1 - Japanese PC-98 5.25" Floppy // Quest for Glory 1 - Japanese PC-98 5.25" Floppy
@ -2533,7 +2533,7 @@ static const struct SciGameDescription SciGameDescriptions[] = {
{NULL, 0, NULL, 0}}, Common::JA_JPN, Common::kPlatformPC98, 0, GUIO_NOSPEECH}, {NULL, 0, NULL, 0}}, Common::JA_JPN, Common::kPlatformPC98, 0, GUIO_NOSPEECH},
0, 0,
SCI_VERSION_AUTODETECT, SCI_VERSION_AUTODETECT,
SCI_VERSION_01 SCI_VERSION_01_EGA
}, },
// Quest for Glory 1 - English Amiga // Quest for Glory 1 - English Amiga
@ -2606,7 +2606,7 @@ static const struct SciGameDescription SciGameDescriptions[] = {
{NULL, 0, NULL, 0}}, Common::EN_ANY, Common::kPlatformAmiga, 0, GUIO_NOSPEECH}, {NULL, 0, NULL, 0}}, Common::EN_ANY, Common::kPlatformAmiga, 0, GUIO_NOSPEECH},
0, 0,
SCI_VERSION_AUTODETECT, SCI_VERSION_AUTODETECT,
SCI_VERSION_01 SCI_VERSION_01_EGA
}, },
// Quest for Glory 2 - English (from FRG) // Quest for Glory 2 - English (from FRG)
@ -2621,7 +2621,7 @@ static const struct SciGameDescription SciGameDescriptions[] = {
{NULL, 0, NULL, 0}}, Common::EN_ANY, Common::kPlatformPC, 0, GUIO_NOSPEECH}, {NULL, 0, NULL, 0}}, Common::EN_ANY, Common::kPlatformPC, 0, GUIO_NOSPEECH},
0, 0,
SCI_VERSION_AUTODETECT, SCI_VERSION_AUTODETECT,
SCI_VERSION_01 SCI_VERSION_01_EGA
}, },
// Quest for Glory 2 - English DOS // Quest for Glory 2 - English DOS
@ -2639,7 +2639,7 @@ static const struct SciGameDescription SciGameDescriptions[] = {
{NULL, 0, NULL, 0}}, Common::EN_ANY, Common::kPlatformPC, 0, GUIO_NOSPEECH}, {NULL, 0, NULL, 0}}, Common::EN_ANY, Common::kPlatformPC, 0, GUIO_NOSPEECH},
0, 0,
SCI_VERSION_AUTODETECT, SCI_VERSION_AUTODETECT,
SCI_VERSION_01 SCI_VERSION_01_EGA
}, },
// Quest for Glory 3 - English DOS Non-Interactive Demo (from FRG) // Quest for Glory 3 - English DOS Non-Interactive Demo (from FRG)

4
engines/sci/engine/game.cpp
View file

@ -43,7 +43,7 @@ int _reset_graphics_input(EngineState *s) {
gfx_color_t transparent = { PaletteEntry(), 0, -1, -1, 0 }; gfx_color_t transparent = { PaletteEntry(), 0, -1, -1, 0 };
debug(2, "Initializing graphics"); debug(2, "Initializing graphics");
if (s->resmgr->_sciVersion <= SCI_VERSION_01 || (s->_flags & GF_SCI1_EGA)) { if (s->resmgr->_sciVersion <= SCI_VERSION_01_EGA || (s->_flags & GF_SCI1_EGA)) {
int i; int i;
for (i = 0; i < 16; i++) { for (i = 0; i < 16; i++) {
@ -181,7 +181,7 @@ static void _free_graphics_input(EngineState *s) {
} }
int game_init_sound(EngineState *s, int sound_flags) { int game_init_sound(EngineState *s, int sound_flags) {
if (s->resmgr->_sciVersion >= SCI_VERSION_01) if (s->resmgr->_sciVersion >= SCI_VERSION_01_EGA)
sound_flags |= SFX_STATE_FLAG_MULTIPLAY; sound_flags |= SFX_STATE_FLAG_MULTIPLAY;
s->sfx_init_flags = sound_flags; s->sfx_init_flags = sound_flags;

2
engines/sci/engine/kernel.cpp
View file

@ -832,7 +832,7 @@ bool Kernel::loadKernelNames() {
switch (_resmgr->_sciVersion) { switch (_resmgr->_sciVersion) {
case SCI_VERSION_0: case SCI_VERSION_0:
case SCI_VERSION_01: case SCI_VERSION_01_EGA:
case SCI_VERSION_01_VGA: case SCI_VERSION_01_VGA:
case SCI_VERSION_01_VGA_ODD: case SCI_VERSION_01_VGA_ODD:
case SCI_VERSION_1: case SCI_VERSION_1:

2
engines/sci/engine/ksound.cpp
View file

@ -154,7 +154,7 @@ void process_sound_events(EngineState *s) { /* Get all sound events, apply their
SongHandle handle; SongHandle handle;
int cue; int cue;
if (s->_version >= SCI_VERSION_01) if (s->_version >= SCI_VERSION_01_EGA)
return; return;
/* SCI01 and later explicitly poll for everything */ /* SCI01 and later explicitly poll for everything */

2
engines/sci/engine/savegame.cpp
View file

@ -693,7 +693,7 @@ int _reset_graphics_input(EngineState *s);
static void reconstruct_sounds(EngineState *s) { static void reconstruct_sounds(EngineState *s) {
Song *seeker; Song *seeker;
SongIteratorType it_type = s->resmgr->_sciVersion >= SCI_VERSION_01 ? SCI_SONG_ITERATOR_TYPE_SCI1 : SCI_SONG_ITERATOR_TYPE_SCI0; SongIteratorType it_type = s->resmgr->_sciVersion >= SCI_VERSION_01_EGA ? SCI_SONG_ITERATOR_TYPE_SCI1 : SCI_SONG_ITERATOR_TYPE_SCI0;
seeker = s->_sound._songlib._lib; seeker = s->_sound._songlib._lib;

2
engines/sci/engine/script.cpp
View file

@ -93,7 +93,7 @@ opcode_format g_opcode_formats[128][4] = {
void script_adjust_opcode_formats(int res_version) { void script_adjust_opcode_formats(int res_version) {
switch (res_version) { switch (res_version) {
case SCI_VERSION_0: case SCI_VERSION_0:
case SCI_VERSION_01: case SCI_VERSION_01_EGA:
break; break;
case SCI_VERSION_01_VGA: case SCI_VERSION_01_VGA:
case SCI_VERSION_01_VGA_ODD: case SCI_VERSION_01_VGA_ODD:

4
engines/sci/gfx/gfx_resmgr.cpp
View file

@ -530,9 +530,9 @@ gfxr_view_t *GfxResManager::getView(int nr, int *loop, int *cel, int palette) {
int resid = GFXR_RES_ID(GFX_RESOURCE_TYPE_VIEW, nr); int resid = GFXR_RES_ID(GFX_RESOURCE_TYPE_VIEW, nr);
if (_version < SCI_VERSION_01) if (_version < SCI_VERSION_01_EGA)
view = gfxr_draw_view0(resid, viewRes->data, viewRes->size, -1); view = gfxr_draw_view0(resid, viewRes->data, viewRes->size, -1);
else if (_version == SCI_VERSION_01 || !_isVGA) else if (_version == SCI_VERSION_01_EGA || !_isVGA)
view = gfxr_draw_view0(resid, viewRes->data, viewRes->size, palette); view = gfxr_draw_view0(resid, viewRes->data, viewRes->size, palette);
else if (_version >= SCI_VERSION_01_VGA && _version <= SCI_VERSION_1) else if (_version >= SCI_VERSION_01_VGA && _version <= SCI_VERSION_1)
view = gfxr_draw_view1(resid, viewRes->data, viewRes->size, _staticPalette, false); view = gfxr_draw_view1(resid, viewRes->data, viewRes->size, _staticPalette, false);

4
engines/sci/resource.cpp
View file

@ -499,7 +499,7 @@ ResourceManager::ResourceManager(int version, int maxMemory) {
} else if (testResource(ResourceId(kResourceTypeVocab, VOCAB_RESOURCE_SCI1_MAIN_VOCAB))) { } else if (testResource(ResourceId(kResourceTypeVocab, VOCAB_RESOURCE_SCI1_MAIN_VOCAB))) {
version = guessSciVersion(); version = guessSciVersion();
if (version != SCI_VERSION_01_VGA) { if (version != SCI_VERSION_01_VGA) {
version = testResource(ResourceId(kResourceTypeVocab, 912)) ? SCI_VERSION_0 : SCI_VERSION_01; version = testResource(ResourceId(kResourceTypeVocab, 912)) ? SCI_VERSION_0 : SCI_VERSION_01_EGA;
} }
} else { } else {
version = guessSciVersion() ? SCI_VERSION_01_VGA : SCI_VERSION_0; version = guessSciVersion() ? SCI_VERSION_01_VGA : SCI_VERSION_0;
@ -525,7 +525,7 @@ ResourceManager::ResourceManager(int version, int maxMemory) {
case SCI_VERSION_0: case SCI_VERSION_0:
debug("Resmgr: Detected SCI0"); debug("Resmgr: Detected SCI0");
break; break;
case SCI_VERSION_01: case SCI_VERSION_01_EGA:
debug("Resmgr: Detected SCI01"); debug("Resmgr: Detected SCI01");
break; break;
case SCI_VERSION_01_VGA: case SCI_VERSION_01_VGA:

2
engines/sci/sci.h
View file

@ -71,7 +71,7 @@ struct SciGameDescription {
enum SciGameVersions { enum SciGameVersions {
SCI_VERSION_AUTODETECT = 0, SCI_VERSION_AUTODETECT = 0,
SCI_VERSION_0 = 1, SCI_VERSION_0 = 1,
SCI_VERSION_01 = 2, SCI_VERSION_01_EGA = 2,
SCI_VERSION_01_VGA = 3, SCI_VERSION_01_VGA = 3,
SCI_VERSION_01_VGA_ODD = 4, SCI_VERSION_01_VGA_ODD = 4,
SCI_VERSION_1 = 5, SCI_VERSION_1 = 5,