[Scummvm-cvs-logs] SF.net SVN: scummvm:[52942] scummvm/trunk/engines/gob
drmccoy at users.sourceforge.net
drmccoy at users.sourceforge.net
Thu Sep 30 14:58:53 CEST 2010
Revision: 52942
http://scummvm.svn.sourceforge.net/scummvm/?rev=52942&view=rev
Author: drmccoy
Date: 2010-09-30 12:58:52 +0000 (Thu, 30 Sep 2010)
Log Message:
-----------
GOB: Rename kFeatures640 to kFeatures640x480
Modified Paths:
--------------
scummvm/trunk/engines/gob/demos/demoplayer.cpp
scummvm/trunk/engines/gob/detection_tables.h
scummvm/trunk/engines/gob/gob.cpp
scummvm/trunk/engines/gob/gob.h
Modified: scummvm/trunk/engines/gob/demos/demoplayer.cpp
===================================================================
--- scummvm/trunk/engines/gob/demos/demoplayer.cpp 2010-09-29 02:57:11 UTC (rev 52941)
+++ scummvm/trunk/engines/gob/demos/demoplayer.cpp 2010-09-30 12:58:52 UTC (rev 52942)
@@ -297,10 +297,10 @@
_doubleMode = false;
// Only applicable when we actually can double
- if (_vm->is640()) {
- if (!scumm_strnicmp(mode, "AUTO", 4))
+ if (_vm->is640x480() || _vm->is800x600()) {
+ if (!scumm_strnicmp(mode, "AUTO", 4))
_autoDouble = true;
- else if (!scumm_strnicmp(mode, "VGA", 3) && _vm->is640())
+ else if (!scumm_strnicmp(mode, "VGA", 3))
_doubleMode = true;
}
}
Modified: scummvm/trunk/engines/gob/detection_tables.h
===================================================================
--- scummvm/trunk/engines/gob/detection_tables.h 2010-09-29 02:57:11 UTC (rev 52941)
+++ scummvm/trunk/engines/gob/detection_tables.h 2010-09-30 12:58:52 UTC (rev 52942)
@@ -3242,7 +3242,7 @@
GUIO_NOSPEECH
},
kGameTypeWoodruff,
- kFeatures640,
+ kFeatures640x480,
0, 0, 0
},
{
@@ -3256,7 +3256,7 @@
GUIO_NOSPEECH
},
kGameTypeWoodruff,
- kFeatures640,
+ kFeatures640x480,
0, 0, 0
},
{
@@ -3270,7 +3270,7 @@
GUIO_NOSPEECH
},
kGameTypeWoodruff,
- kFeatures640,
+ kFeatures640x480,
0, 0, 0
},
{
@@ -3284,7 +3284,7 @@
GUIO_NOSPEECH
},
kGameTypeWoodruff,
- kFeatures640,
+ kFeatures640x480,
0, 0, 0
},
{
@@ -3298,7 +3298,7 @@
GUIO_NOSPEECH
},
kGameTypeWoodruff,
- kFeatures640,
+ kFeatures640x480,
0, 0, 0
},
{
@@ -3312,7 +3312,7 @@
GUIO_NOSPEECH
},
kGameTypeWoodruff,
- kFeatures640,
+ kFeatures640x480,
0, 0, 0
},
{
@@ -3326,7 +3326,7 @@
GUIO_NOSPEECH
},
kGameTypeWoodruff,
- kFeatures640,
+ kFeatures640x480,
0, 0, 0
},
{
@@ -3340,7 +3340,7 @@
GUIO_NOSPEECH
},
kGameTypeWoodruff,
- kFeatures640,
+ kFeatures640x480,
0, 0, 0
},
{
@@ -3354,7 +3354,7 @@
GUIO_NOSPEECH
},
kGameTypeWoodruff,
- kFeatures640,
+ kFeatures640x480,
0, 0, 0
},
{
@@ -3368,7 +3368,7 @@
GUIO_NOSPEECH
},
kGameTypeWoodruff,
- kFeatures640,
+ kFeatures640x480,
0, 0, 0
},
{
@@ -3382,7 +3382,7 @@
GUIO_NOSPEECH
},
kGameTypeWoodruff,
- kFeatures640,
+ kFeatures640x480,
0, 0, 0
},
{ // Supplied by jvprat on #scummvm
@@ -3396,7 +3396,7 @@
GUIO_NOSPEECH
},
kGameTypeWoodruff,
- kFeatures640,
+ kFeatures640x480,
0, 0, 0
},
{ // Supplied by jvprat on #scummvm
@@ -3410,7 +3410,7 @@
GUIO_NOSPEECH
},
kGameTypeWoodruff,
- kFeatures640,
+ kFeatures640x480,
0, 0, 0
},
{ // Supplied by jvprat on #scummvm
@@ -3424,7 +3424,7 @@
GUIO_NOSPEECH
},
kGameTypeWoodruff,
- kFeatures640,
+ kFeatures640x480,
0, 0, 0
},
{ // Supplied by jvprat on #scummvm
@@ -3438,7 +3438,7 @@
GUIO_NOSPEECH
},
kGameTypeWoodruff,
- kFeatures640,
+ kFeatures640x480,
0, 0, 0
},
{ // Supplied by jvprat on #scummvm
@@ -3452,7 +3452,7 @@
GUIO_NOSPEECH
},
kGameTypeWoodruff,
- kFeatures640,
+ kFeatures640x480,
0, 0, 0
},
{ // Supplied by Hkz on #scummvm
@@ -3466,7 +3466,7 @@
GUIO_NOSPEECH
},
kGameTypeWoodruff,
- kFeatures640,
+ kFeatures640x480,
0, 0, 0
},
{ // Supplied by Hkz on #scummvm
@@ -3480,7 +3480,7 @@
GUIO_NOSPEECH
},
kGameTypeWoodruff,
- kFeatures640,
+ kFeatures640x480,
0, 0, 0
},
{ // Supplied by Hkz on #scummvm
@@ -3494,7 +3494,7 @@
GUIO_NOSPEECH
},
kGameTypeWoodruff,
- kFeatures640,
+ kFeatures640x480,
0, 0, 0
},
{ // Supplied by DjDiabolik in bug report #1971294
@@ -3508,7 +3508,7 @@
GUIO_NOSPEECH
},
kGameTypeWoodruff,
- kFeatures640,
+ kFeatures640x480,
0, 0, 0
},
{ // Supplied by DjDiabolik in bug report #1971294
@@ -3522,7 +3522,7 @@
GUIO_NOSPEECH
},
kGameTypeWoodruff,
- kFeatures640,
+ kFeatures640x480,
0, 0, 0
},
{ // Supplied by DjDiabolik in bug report #1971294
@@ -3536,7 +3536,7 @@
GUIO_NOSPEECH
},
kGameTypeWoodruff,
- kFeatures640,
+ kFeatures640x480,
0, 0, 0
},
{ // Supplied by DjDiabolik in bug report #1971294
@@ -3550,7 +3550,7 @@
GUIO_NOSPEECH
},
kGameTypeWoodruff,
- kFeatures640,
+ kFeatures640x480,
0, 0, 0
},
{ // Supplied by DjDiabolik in bug report #1971294
@@ -3564,7 +3564,7 @@
GUIO_NOSPEECH
},
kGameTypeWoodruff,
- kFeatures640,
+ kFeatures640x480,
0, 0, 0
},
{ // Supplied by goodoldgeorg in bug report #2098838
@@ -3578,7 +3578,7 @@
GUIO_NOSPEECH
},
kGameTypeWoodruff,
- kFeatures640,
+ kFeatures640x480,
0, 0, 0
},
{
@@ -3596,7 +3596,7 @@
GUIO_NOSUBTITLES | GUIO_NOSPEECH
},
kGameTypeWoodruff,
- kFeatures640 | kFeaturesSCNDemo,
+ kFeatures640x480 | kFeaturesSCNDemo,
0, 0, 1
},
{
@@ -3610,7 +3610,7 @@
GUIO_NOSUBTITLES | GUIO_NOSPEECH
},
kGameTypeDynasty,
- kFeatures640,
+ kFeatures640x480,
0, 0, 0
},
{
@@ -3624,7 +3624,7 @@
GUIO_NOSUBTITLES | GUIO_NOSPEECH
},
kGameTypeDynasty,
- kFeatures640,
+ kFeatures640x480,
0, 0, 0
},
{
@@ -3638,7 +3638,7 @@
GUIO_NOSUBTITLES | GUIO_NOSPEECH
},
kGameTypeDynasty,
- kFeatures640,
+ kFeatures640x480,
0, 0, 0
},
{
@@ -3652,7 +3652,7 @@
GUIO_NOSUBTITLES | GUIO_NOSPEECH
},
kGameTypeDynasty,
- kFeatures640,
+ kFeatures640x480,
0, 0, 0
},
{
@@ -3666,7 +3666,7 @@
GUIO_NOSUBTITLES | GUIO_NOSPEECH
},
kGameTypeDynasty,
- kFeatures640,
+ kFeatures640x480,
0, 0, 0
},
{
@@ -3680,7 +3680,7 @@
GUIO_NONE
},
kGameTypeDynasty,
- kFeatures640,
+ kFeatures640x480,
0, 0, 0
},
{
@@ -3694,7 +3694,7 @@
GUIO_NONE
},
kGameTypeDynasty,
- kFeatures640,
+ kFeatures640x480,
"lda1.stk", 0, 0
},
{
@@ -3708,7 +3708,7 @@
GUIO_NONE
},
kGameTypeDynasty,
- kFeatures640,
+ kFeatures640x480,
"lda1.stk", 0, 0
},
{
@@ -3722,7 +3722,7 @@
GUIO_NOSUBTITLES | GUIO_NOSPEECH
},
kGameTypeUrban,
- kFeatures640,
+ kFeatures640x480,
0, 0, 0
},
{ // Supplied by gamin in the forums
@@ -3736,7 +3736,7 @@
GUIO_NOSUBTITLES | GUIO_NOSPEECH
},
kGameTypeUrban,
- kFeatures640,
+ kFeatures640x480,
0, 0, 0
},
{ // Supplied by jvprat on #scummvm
@@ -3750,7 +3750,7 @@
GUIO_NOSUBTITLES | GUIO_NOSPEECH
},
kGameTypeUrban,
- kFeatures640,
+ kFeatures640x480,
0, 0, 0
},
{ // Supplied by goodoldgeorg in bug report #2770340
@@ -3764,7 +3764,7 @@
GUIO_NOSUBTITLES | GUIO_NOSPEECH
},
kGameTypeUrban,
- kFeatures640,
+ kFeatures640x480,
0, 0, 0
},
{
@@ -3783,7 +3783,7 @@
GUIO_NONE
},
kGameTypeUrban,
- kFeatures640 | kFeaturesSCNDemo,
+ kFeatures640x480 | kFeaturesSCNDemo,
0, 0, 2
},
{
@@ -3801,7 +3801,7 @@
GUIO_NOSUBTITLES | GUIO_NOSPEECH
},
kGameTypePlaytoons,
- kFeatures640,
+ kFeatures640x480,
"intro2.stk", 0, 0
},
{
@@ -3819,7 +3819,7 @@
GUIO_NOSUBTITLES | GUIO_NOSPEECH
},
kGameTypePlaytoons,
- kFeatures640,
+ kFeatures640x480,
"intro2.stk", 0, 0
},
{
@@ -3837,7 +3837,7 @@
GUIO_NOSUBTITLES | GUIO_NOSPEECH
},
kGameTypePlaytoons,
- kFeatures640,
+ kFeatures640x480,
"intro2.stk", 0, 0
},
{ // Supplied by scoriae in the forums
@@ -3855,7 +3855,7 @@
GUIO_NOSUBTITLES | GUIO_NOSPEECH
},
kGameTypePlaytoons,
- kFeatures640,
+ kFeatures640x480,
"intro2.stk", 0, 0
},
{
@@ -3878,7 +3878,7 @@
GUIO_NOSUBTITLES | GUIO_NOSPEECH
},
kGameTypePlaytoons,
- kFeatures640 | kFeaturesSCNDemo,
+ kFeatures640x480 | kFeaturesSCNDemo,
0, 0, 3
},
{
@@ -3896,7 +3896,7 @@
GUIO_NOSUBTITLES | GUIO_NOSPEECH
},
kGameTypePlaytoons,
- kFeatures640 | kFeaturesSCNDemo,
+ kFeatures640x480 | kFeaturesSCNDemo,
0, 0, 4
},
{
@@ -3918,7 +3918,7 @@
GUIO_NOSUBTITLES | GUIO_NOSPEECH
},
kGameTypePlaytoons,
- kFeatures640 | kFeaturesSCNDemo,
+ kFeatures640x480 | kFeaturesSCNDemo,
0, 0, 5
},
{
@@ -3939,7 +3939,7 @@
GUIO_NOSUBTITLES | GUIO_NOSPEECH
},
kGameTypePlaytoons,
- kFeatures640 | kFeaturesSCNDemo,
+ kFeatures640x480 | kFeaturesSCNDemo,
0, 0, 6
},
{
@@ -3957,7 +3957,7 @@
GUIO_NOSUBTITLES | GUIO_NOSPEECH
},
kGameTypePlaytoons,
- kFeatures640,
+ kFeatures640x480,
"intro2.stk", 0, 0
},
{
@@ -3975,7 +3975,7 @@
GUIO_NOSUBTITLES | GUIO_NOSPEECH
},
kGameTypePlaytoons,
- kFeatures640,
+ kFeatures640x480,
"intro2.stk", 0, 0
},
{
@@ -3993,7 +3993,7 @@
GUIO_NOSUBTITLES | GUIO_NOSPEECH
},
kGameTypePlaytoons,
- kFeatures640,
+ kFeatures640x480,
"intro2.stk", 0, 0
},
{ // Supplied by scoriae in the forums
@@ -4011,7 +4011,7 @@
GUIO_NOSUBTITLES | GUIO_NOSPEECH
},
kGameTypePlaytoons,
- kFeatures640,
+ kFeatures640x480,
"intro2.stk", 0, 0
},
{
@@ -4029,7 +4029,7 @@
GUIO_NOSUBTITLES | GUIO_NOSPEECH
},
kGameTypePlaytoons,
- kFeatures640,
+ kFeatures640x480,
"intro2.stk", 0, 0
},
{
@@ -4047,7 +4047,7 @@
GUIO_NOSUBTITLES | GUIO_NOSPEECH
},
kGameTypePlaytoons,
- kFeatures640,
+ kFeatures640x480,
"intro2.stk", 0, 0
},
{
@@ -4065,7 +4065,7 @@
GUIO_NOSUBTITLES | GUIO_NOSPEECH
},
kGameTypePlaytoons,
- kFeatures640,
+ kFeatures640x480,
"intro2.stk", 0, 0
},
{
@@ -4083,7 +4083,7 @@
GUIO_NOSUBTITLES | GUIO_NOSPEECH
},
kGameTypePlaytoons,
- kFeatures640,
+ kFeatures640x480,
"intro2.stk", 0, 0
},
{ // Supplied by Hkz on #scummvm
@@ -4101,7 +4101,7 @@
GUIO_NOSUBTITLES | GUIO_NOSPEECH
},
kGameTypePlaytoons,
- kFeatures640,
+ kFeatures640x480,
"intro2.stk", 0, 0
},
{
@@ -4119,7 +4119,7 @@
GUIO_NOSUBTITLES | GUIO_NOSPEECH
},
kGameTypePlaytoons,
- kFeatures640,
+ kFeatures640x480,
"intro2.stk", 0, 0
},
{ //Supplied by goodoldgeorg in bug report #2820006
@@ -4137,7 +4137,7 @@
GUIO_NOSUBTITLES | GUIO_NOSPEECH
},
kGameTypePlaytoons,
- kFeatures640,
+ kFeatures640x480,
"intro2.stk", 0, 0
},
{
@@ -4155,7 +4155,7 @@
GUIO_NOSUBTITLES | GUIO_NOSPEECH
},
kGameTypePlaytoons,
- kFeatures640,
+ kFeatures640x480,
"intro2.stk", 0, 0
},
{
@@ -4173,7 +4173,7 @@
GUIO_NOSUBTITLES | GUIO_NOSPEECH
},
kGameTypeBambou,
- kFeatures640,
+ kFeatures640x480,
"intro.stk", "intro.tot", 0
},
{
@@ -4191,7 +4191,7 @@
GUIO_NOSUBTITLES | GUIO_NOSPEECH
},
kGameTypePlaytoons,
- kFeatures640,
+ kFeatures640x480,
"intro2.stk", 0, 0
},
{
@@ -4209,7 +4209,7 @@
GUIO_NOSUBTITLES | GUIO_NOSPEECH
},
kGameTypePlaytoons,
- kFeatures640,
+ kFeatures640x480,
"intro2.stk", 0, 0
},
{
@@ -4227,7 +4227,7 @@
GUIO_NOSUBTITLES | GUIO_NOSPEECH
},
kGameTypePlaytoons,
- kFeatures640,
+ kFeatures640x480,
"intro2.stk", 0, 0
},
{
@@ -4255,7 +4255,7 @@
GUIO_NONE
},
kGameTypeAdi2,
- kFeatures640,
+ kFeatures640x480,
"adi2.stk", "ediintro.tot", 0
},
{ // Found in french ADI 2 Francais-Maths CE2. Exact version not specified.
@@ -4269,7 +4269,7 @@
GUIO_NONE
},
kGameTypeAdi2,
- kFeatures640,
+ kFeatures640x480,
"adi2.stk", "ediintro.tot", 0
},
{
@@ -4297,7 +4297,7 @@
GUIO_NONE
},
kGameTypeAdi2,
- kFeatures640,
+ kFeatures640x480,
"adi2.stk", "ediintro.tot", 0
},
{
@@ -4311,7 +4311,7 @@
GUIO_NONE
},
kGameTypeAdi2,
- kFeatures640,
+ kFeatures640x480,
"adi2.stk", "ediintro.tot", 0
},
{
@@ -4325,7 +4325,7 @@
GUIO_NONE
},
kGameTypeAdi2,
- kFeatures640,
+ kFeatures640x480,
"adi2.stk", "ediintro.tot", 0
},
{
@@ -4339,7 +4339,7 @@
GUIO_NONE
},
kGameTypeAdi2,
- kFeatures640,
+ kFeatures640x480,
"adi2.stk", "ediintro.tot", 0
},
{
@@ -4353,7 +4353,7 @@
GUIO_NONE
},
kGameTypeAdi2,
- kFeatures640,
+ kFeatures640x480,
"adi2.stk", "ediintro.tot", 0
},
{
@@ -4367,7 +4367,7 @@
GUIO_NONE
},
kGameTypeAdi2,
- kFeatures640,
+ kFeatures640x480,
"adi2.stk", "ediintro.tot", 0
},
{
@@ -4387,7 +4387,7 @@
GUIO_NOSUBTITLES | GUIO_NOSPEECH
},
kGameTypeAdi2,
- kFeatures640 | kFeaturesSCNDemo,
+ kFeatures640x480 | kFeaturesSCNDemo,
0, 0, 1
},
{
@@ -4401,7 +4401,7 @@
GUIO_NONE
},
kGameTypeAdi4,
- kFeatures640,
+ kFeatures640x480,
0, 0, 0
},
{
@@ -4415,7 +4415,7 @@
GUIO_NONE
},
kGameTypeAdi4,
- kFeatures640,
+ kFeatures640x480,
0, 0, 0
},
{
@@ -4429,7 +4429,7 @@
GUIO_NONE
},
kGameTypeAdi4,
- kFeatures640,
+ kFeatures640x480,
0, 0, 0
},
{
@@ -4443,7 +4443,7 @@
GUIO_NONE
},
kGameTypeAdi4,
- kFeatures640,
+ kFeatures640x480,
0, 0, 0
},
{
@@ -4457,7 +4457,7 @@
GUIO_NONE
},
kGameTypeAdi4,
- kFeatures640,
+ kFeatures640x480,
0, 0, 0
},
{
@@ -4471,7 +4471,7 @@
GUIO_NONE
},
kGameTypeAdi4,
- kFeatures640,
+ kFeatures640x480,
0, 0, 0
},
{
@@ -4527,7 +4527,7 @@
GUIO_NONE
},
kGameTypeAdi4,
- kFeatures640,
+ kFeatures640x480,
0, 0, 0
},
{
@@ -4555,7 +4555,7 @@
GUIO_NONE
},
kGameTypeAdi4,
- kFeatures640,
+ kFeatures640x480,
0, 0, 0
},
{
@@ -4569,7 +4569,7 @@
GUIO_NONE
},
kGameTypeAdi4,
- kFeatures640,
+ kFeatures640x480,
0, 0, 0
},
{
@@ -4867,7 +4867,7 @@
GUIO_NOSUBTITLES | GUIO_NOSPEECH
},
kGameTypeWoodruff,
- kFeatures640,
+ kFeatures640x480,
0, 0, 0
},
{ //9
@@ -4937,7 +4937,7 @@
GUIO_NOSUBTITLES | GUIO_NOSPEECH
},
kGameTypePlaytoons,
- kFeatures640,
+ kFeatures640x480,
0, 0, 0
},
{ //14
@@ -4951,7 +4951,7 @@
GUIO_NOSUBTITLES | GUIO_NOSPEECH
},
kGameTypePlaytoons,
- kFeatures640,
+ kFeatures640x480,
0, 0, 0
},
{ //15
@@ -4965,7 +4965,7 @@
GUIO_NOSUBTITLES | GUIO_NOSPEECH
},
kGameTypePlaytoons,
- kFeatures640,
+ kFeatures640x480,
0, 0, 0
},
{ //16
@@ -4979,7 +4979,7 @@
GUIO_NOSUBTITLES | GUIO_NOSPEECH
},
kGameTypePlaytoons,
- kFeatures640,
+ kFeatures640x480,
0, 0, 0
},
{ //17
@@ -4993,7 +4993,7 @@
GUIO_NOSUBTITLES | GUIO_NOSPEECH
},
kGameTypePlaytoons,
- kFeatures640,
+ kFeatures640x480,
0, 0, 0
},
{ //18
@@ -5007,7 +5007,7 @@
GUIO_NOSUBTITLES | GUIO_NOSPEECH
},
kGameTypePlaytoons,
- kFeatures640,
+ kFeatures640x480,
0, 0, 0
},
{ //19
@@ -5021,7 +5021,7 @@
GUIO_NOSUBTITLES | GUIO_NOSPEECH
},
kGameTypeBambou,
- kFeatures640,
+ kFeatures640x480,
0, 0, 0
},
{ //20
@@ -5063,7 +5063,7 @@
GUIO_NOSUBTITLES | GUIO_NOSPEECH
},
kGameTypeAdi2,
- kFeatures640,
+ kFeatures640x480,
"adi2.stk", 0, 0
},
{ //23
@@ -5077,7 +5077,7 @@
GUIO_NOSUBTITLES | GUIO_NOSPEECH
},
kGameTypeAdi4,
- kFeatures640,
+ kFeatures640x480,
"adif41.stk", 0, 0
},
{ //24
@@ -5091,7 +5091,7 @@
GUIO_NONE
},
kGameTypeUrban,
- kFeaturesAdLib | kFeatures640 | kFeaturesSCNDemo,
+ kFeaturesAdLib | kFeatures640x480 | kFeaturesSCNDemo,
"", "", 8
}
};
Modified: scummvm/trunk/engines/gob/gob.cpp
===================================================================
--- scummvm/trunk/engines/gob/gob.cpp 2010-09-29 02:57:11 UTC (rev 52941)
+++ scummvm/trunk/engines/gob/gob.cpp 2010-09-30 12:58:52 UTC (rev 52942)
@@ -209,10 +209,6 @@
return (_features & kFeaturesEGA) != 0;
}
-bool GobEngine::is640() const {
- return (_features & kFeatures640) != 0;
-}
-
bool GobEngine::hasAdLib() const {
return (_features & kFeaturesAdLib) != 0;
}
@@ -225,6 +221,10 @@
return (_features & kFeaturesBATDemo) != 0;
}
+bool GobEngine::is640x480() const {
+ return (_features & kFeatures640x480) != 0;
+}
+
bool GobEngine::is800x600() const {
return (_features & kFeatures800x600) != 0;
}
@@ -239,7 +239,7 @@
return Common::kUnknownError;
}
- _video->setSize(is640());
+ _video->setSize(is640x480());
_video->init();
// On some systems it's not safe to run CD audio games from the CD.
@@ -518,7 +518,7 @@
_inter->setupOpcodes();
- if (is640()) {
+ if (is640x480()) {
_video->_surfWidth = _width = 640;
_video->_surfHeight = _video->_splitHeight1 = _height = 480;
_global->_mouseMaxX = 640;
Modified: scummvm/trunk/engines/gob/gob.h
===================================================================
--- scummvm/trunk/engines/gob/gob.h 2010-09-29 02:57:11 UTC (rev 52941)
+++ scummvm/trunk/engines/gob/gob.h 2010-09-30 12:58:52 UTC (rev 52942)
@@ -123,9 +123,9 @@
kFeaturesCD = 1 << 0,
kFeaturesEGA = 1 << 1,
kFeaturesAdLib = 1 << 2,
- kFeatures640 = 1 << 3,
- kFeaturesSCNDemo = 1 << 4,
- kFeaturesBATDemo = 1 << 5,
+ kFeaturesSCNDemo = 1 << 3,
+ kFeaturesBATDemo = 1 << 4,
+ kFeatures640x480 = 1 << 5,
kFeatures800x600 = 1 << 6
};
@@ -208,10 +208,10 @@
GameType getGameType() const;
bool isCD() const;
bool isEGA() const;
- bool is640() const;
bool hasAdLib() const;
bool isSCNDemo() const;
bool isBATDemo() const;
+ bool is640x480() const;
bool is800x600() const;
bool isDemo() const;
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