[Scummvm-cvs-logs] SF.net SVN: scummvm:[42181] scummvm/trunk/engines/sci
thebluegr at users.sourceforge.net
thebluegr at users.sourceforge.net
Mon Jul 6 18:22:14 CEST 2009
Revision: 42181
http://scummvm.svn.sourceforge.net/scummvm/?rev=42181&view=rev
Author: thebluegr
Date: 2009-07-06 16:22:14 +0000 (Mon, 06 Jul 2009)
Log Message:
-----------
Renamed SCI_VERSION_01 -> SCI_VERSION_01_EGA
Modified Paths:
--------------
scummvm/trunk/engines/sci/detection.cpp
scummvm/trunk/engines/sci/engine/game.cpp
scummvm/trunk/engines/sci/engine/kernel.cpp
scummvm/trunk/engines/sci/engine/ksound.cpp
scummvm/trunk/engines/sci/engine/savegame.cpp
scummvm/trunk/engines/sci/engine/script.cpp
scummvm/trunk/engines/sci/gfx/gfx_resmgr.cpp
scummvm/trunk/engines/sci/resource.cpp
scummvm/trunk/engines/sci/sci.h
Modified: scummvm/trunk/engines/sci/detection.cpp
===================================================================
--- scummvm/trunk/engines/sci/detection.cpp 2009-07-06 16:17:03 UTC (rev 42180)
+++ scummvm/trunk/engines/sci/detection.cpp 2009-07-06 16:22:14 UTC (rev 42181)
@@ -949,8 +949,8 @@
{"resource.004", 0, "9ae2a13708d691cd42f9129173c4b39d", 820443},
{NULL, 0, NULL, 0}}, Common::EN_ANY, Common::kPlatformAmiga, 0, GUIO_NOSPEECH},
0,
- SCI_VERSION_01,
- SCI_VERSION_01
+ SCI_VERSION_01_EGA,
+ SCI_VERSION_01_EGA
},
// King's Quest 1 SCI Remake - English DOS Non-Interactive Demo
@@ -2066,8 +2066,8 @@
{"resource.001", 0, "9e33566515b18bee7915db448063bba2", 871853},
{NULL, 0, NULL, 0}}, Common::EN_ANY, Common::kPlatformPC, ADGF_DEMO, GUIO_NOSPEECH},
0,
- SCI_VERSION_01,
- SCI_VERSION_01
+ SCI_VERSION_01_EGA,
+ SCI_VERSION_01_EGA
},
// Mixed-Up Fairy Tales v1.000 - English DOS (supplied by markcoolio in bug report #2723791)
@@ -2081,8 +2081,8 @@
{"resource.004", 0, "f79daa70390d73746742ffcfc3dc4471", 937580},
{NULL, 0, NULL, 0}}, Common::EN_ANY, Common::kPlatformPC, 0, GUIO_NOSPEECH},
0,
- SCI_VERSION_01,
- SCI_VERSION_01
+ SCI_VERSION_01_EGA,
+ SCI_VERSION_01_EGA
},
// Mixed-Up Fairy Tales - English DOS Floppy (from jvprat)
@@ -2095,8 +2095,8 @@
{"resource.003", 0, "dd6cef0c592eadb7e6be9a25307c57a2", 1344719},
{NULL, 0, NULL, 0}}, Common::EN_ANY, Common::kPlatformPC, 0, GUIO_NOSPEECH},
0,
- SCI_VERSION_01,
- SCI_VERSION_01
+ SCI_VERSION_01_EGA,
+ SCI_VERSION_01_EGA
},
// Mixed-Up Mother Goose - English Amiga (from www.back2roots.org)
@@ -2108,8 +2108,8 @@
{"resource.002", 0, "fb552ae550ca1dac19ed8f6a3767612d", 817191},
{NULL, 0, NULL, 0}}, Common::EN_ANY, Common::kPlatformAmiga, 0, GUIO_NOSPEECH},
0,
- SCI_VERSION_01,
- SCI_VERSION_01
+ SCI_VERSION_01_EGA,
+ SCI_VERSION_01_EGA
},
// Mixed-Up Mother Goose v2.000 - English DOS Floppy (supplied by markcoolio in bug report #2723795)
@@ -2119,8 +2119,8 @@
{"resource.000", 0, "b7ecd8ae9e254e80310b5a668b276e6e", 2948975},
{NULL, 0, NULL, 0}}, Common::EN_ANY, Common::kPlatformPC, 0, GUIO_NOSPEECH},
0,
- SCI_VERSION_01,
- SCI_VERSION_01
+ SCI_VERSION_01_EGA,
+ SCI_VERSION_01_EGA
},
// Mixed-Up Mother Goose - English DOS CD (from jvprat)
@@ -2520,7 +2520,7 @@
{NULL, 0, NULL, 0}}, Common::JA_JPN, Common::kPlatformPC98, 0, GUIO_NOSPEECH},
0,
SCI_VERSION_AUTODETECT,
- SCI_VERSION_01
+ SCI_VERSION_01_EGA
},
// Quest for Glory 1 - Japanese PC-98 5.25" Floppy
@@ -2533,7 +2533,7 @@
{NULL, 0, NULL, 0}}, Common::JA_JPN, Common::kPlatformPC98, 0, GUIO_NOSPEECH},
0,
SCI_VERSION_AUTODETECT,
- SCI_VERSION_01
+ SCI_VERSION_01_EGA
},
// Quest for Glory 1 - English Amiga
@@ -2606,7 +2606,7 @@
{NULL, 0, NULL, 0}}, Common::EN_ANY, Common::kPlatformAmiga, 0, GUIO_NOSPEECH},
0,
SCI_VERSION_AUTODETECT,
- SCI_VERSION_01
+ SCI_VERSION_01_EGA
},
// Quest for Glory 2 - English (from FRG)
@@ -2621,7 +2621,7 @@
{NULL, 0, NULL, 0}}, Common::EN_ANY, Common::kPlatformPC, 0, GUIO_NOSPEECH},
0,
SCI_VERSION_AUTODETECT,
- SCI_VERSION_01
+ SCI_VERSION_01_EGA
},
// Quest for Glory 2 - English DOS
@@ -2639,7 +2639,7 @@
{NULL, 0, NULL, 0}}, Common::EN_ANY, Common::kPlatformPC, 0, GUIO_NOSPEECH},
0,
SCI_VERSION_AUTODETECT,
- SCI_VERSION_01
+ SCI_VERSION_01_EGA
},
// Quest for Glory 3 - English DOS Non-Interactive Demo (from FRG)
Modified: scummvm/trunk/engines/sci/engine/game.cpp
===================================================================
--- scummvm/trunk/engines/sci/engine/game.cpp 2009-07-06 16:17:03 UTC (rev 42180)
+++ scummvm/trunk/engines/sci/engine/game.cpp 2009-07-06 16:22:14 UTC (rev 42181)
@@ -43,7 +43,7 @@
gfx_color_t transparent = { PaletteEntry(), 0, -1, -1, 0 };
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;
for (i = 0; i < 16; i++) {
@@ -181,7 +181,7 @@
}
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;
s->sfx_init_flags = sound_flags;
Modified: scummvm/trunk/engines/sci/engine/kernel.cpp
===================================================================
--- scummvm/trunk/engines/sci/engine/kernel.cpp 2009-07-06 16:17:03 UTC (rev 42180)
+++ scummvm/trunk/engines/sci/engine/kernel.cpp 2009-07-06 16:22:14 UTC (rev 42181)
@@ -832,7 +832,7 @@
switch (_resmgr->_sciVersion) {
case SCI_VERSION_0:
- case SCI_VERSION_01:
+ case SCI_VERSION_01_EGA:
case SCI_VERSION_01_VGA:
case SCI_VERSION_01_VGA_ODD:
case SCI_VERSION_1:
Modified: scummvm/trunk/engines/sci/engine/ksound.cpp
===================================================================
--- scummvm/trunk/engines/sci/engine/ksound.cpp 2009-07-06 16:17:03 UTC (rev 42180)
+++ scummvm/trunk/engines/sci/engine/ksound.cpp 2009-07-06 16:22:14 UTC (rev 42181)
@@ -154,7 +154,7 @@
SongHandle handle;
int cue;
- if (s->_version >= SCI_VERSION_01)
+ if (s->_version >= SCI_VERSION_01_EGA)
return;
/* SCI01 and later explicitly poll for everything */
Modified: scummvm/trunk/engines/sci/engine/savegame.cpp
===================================================================
--- scummvm/trunk/engines/sci/engine/savegame.cpp 2009-07-06 16:17:03 UTC (rev 42180)
+++ scummvm/trunk/engines/sci/engine/savegame.cpp 2009-07-06 16:22:14 UTC (rev 42181)
@@ -693,7 +693,7 @@
static void reconstruct_sounds(EngineState *s) {
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;
Modified: scummvm/trunk/engines/sci/engine/script.cpp
===================================================================
--- scummvm/trunk/engines/sci/engine/script.cpp 2009-07-06 16:17:03 UTC (rev 42180)
+++ scummvm/trunk/engines/sci/engine/script.cpp 2009-07-06 16:22:14 UTC (rev 42181)
@@ -93,7 +93,7 @@
void script_adjust_opcode_formats(int res_version) {
switch (res_version) {
case SCI_VERSION_0:
- case SCI_VERSION_01:
+ case SCI_VERSION_01_EGA:
break;
case SCI_VERSION_01_VGA:
case SCI_VERSION_01_VGA_ODD:
Modified: scummvm/trunk/engines/sci/gfx/gfx_resmgr.cpp
===================================================================
--- scummvm/trunk/engines/sci/gfx/gfx_resmgr.cpp 2009-07-06 16:17:03 UTC (rev 42180)
+++ scummvm/trunk/engines/sci/gfx/gfx_resmgr.cpp 2009-07-06 16:22:14 UTC (rev 42181)
@@ -530,9 +530,9 @@
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);
- 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);
else if (_version >= SCI_VERSION_01_VGA && _version <= SCI_VERSION_1)
view = gfxr_draw_view1(resid, viewRes->data, viewRes->size, _staticPalette, false);
Modified: scummvm/trunk/engines/sci/resource.cpp
===================================================================
--- scummvm/trunk/engines/sci/resource.cpp 2009-07-06 16:17:03 UTC (rev 42180)
+++ scummvm/trunk/engines/sci/resource.cpp 2009-07-06 16:22:14 UTC (rev 42181)
@@ -499,7 +499,7 @@
} else if (testResource(ResourceId(kResourceTypeVocab, VOCAB_RESOURCE_SCI1_MAIN_VOCAB))) {
version = guessSciVersion();
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 {
version = guessSciVersion() ? SCI_VERSION_01_VGA : SCI_VERSION_0;
@@ -525,7 +525,7 @@
case SCI_VERSION_0:
debug("Resmgr: Detected SCI0");
break;
- case SCI_VERSION_01:
+ case SCI_VERSION_01_EGA:
debug("Resmgr: Detected SCI01");
break;
case SCI_VERSION_01_VGA:
Modified: scummvm/trunk/engines/sci/sci.h
===================================================================
--- scummvm/trunk/engines/sci/sci.h 2009-07-06 16:17:03 UTC (rev 42180)
+++ scummvm/trunk/engines/sci/sci.h 2009-07-06 16:22:14 UTC (rev 42181)
@@ -71,7 +71,7 @@
enum SciGameVersions {
SCI_VERSION_AUTODETECT = 0,
SCI_VERSION_0 = 1,
- SCI_VERSION_01 = 2,
+ SCI_VERSION_01_EGA = 2,
SCI_VERSION_01_VGA = 3,
SCI_VERSION_01_VGA_ODD = 4,
SCI_VERSION_1 = 5,
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the Scummvm-git-logs
mailing list