libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2024-12-14 13:50:13 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

eplaced platform-specific game features with common platform setting.

Browse Source 
svn-id: r25294
This commit is contained in:
Eugene Sandulenko 2007-01-30 22:32:51 +00:00
parent f395822aa6
commit 3766e0a77d
6 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
engines/gob/detection.cpp
View File

@ -129,7 +129,7 @@ static const GOBGameDescription gameDescriptions[] = {
UNK_LANG,
kPlatformAmiga,
},
GF_GOB1 | GF_AMIGA,
GF_GOB1,
"intro"
},
{
@ -151,7 +151,7 @@ static const GOBGameDescription gameDescriptions[] = {
UNK_LANG,
kPlatformMacintosh,
},
GF_GOB1 | GF_MAC,
GF_GOB1,
"intro"
},
{
@ -217,7 +217,7 @@ static const GOBGameDescription gameDescriptions[] = {
DE_DEU,
kPlatformAmiga,
},
GF_GOB2 | GF_AMIGA,
GF_GOB2,
"intro"
},
{ // Supplied by blackwhiteeagle in bug report #1605235
@ -283,7 +283,7 @@ static const GOBGameDescription gameDescriptions[] = {
UNK_LANG,
kPlatformPC,
},
GF_GOB2 | GF_AMIGA,
GF_GOB2,
"intro"
},
{
@ -510,6 +510,7 @@ bool GobEngine::detectGame() {
_features = gameDescriptions[i].features;
_language = gameDescriptions[i].desc.language;
_platform = gameDescriptions[i].desc.platform;
return true;
}

2
engines/gob/game_v1.cpp
View File

@ -81,7 +81,7 @@ void Game_v1::playTot(int16 skipPlay) {
_vm->_draw->_fontToSprite[i].height = -1;
}
if (_vm->_features & GF_MAC) {
if (_vm->_platform == Common::kPlatformMacintosh) {
if (_vm->_adlib)
_vm->_adlib->stopPlay();
} else

2
engines/gob/game_v2.cpp
View File

@ -73,7 +73,7 @@ void Game_v2::playTot(int16 skipPlay) {
while (!_vm->_quitRequested) {
if (_vm->_global->_inter_variables != 0)
_vm->_draw->animateCursor(4);
if (_vm->_features & GF_MAC) {
if (_vm->_platform == Common::kPlatformMacintosh) {
if (_vm->_adlib)
_vm->_adlib->stopPlay();
} else

4
engines/gob/gob.cpp
View File

@ -614,8 +614,8 @@ int GobEngine::init() {
else
error("GobEngine::init(): Unknown version of game engine");
_noMusic = MidiDriver::parseMusicDriver(ConfMan.get("music_driver")) == MD_NULL;
if (!_noMusic && !(_features & Gob::GF_AMIGA) &&
(((_features & Gob::GF_MAC) && (_features & Gob::GF_GOB1)) ||
if (!_noMusic && !(_platform == Common::kPlatformAmiga) &&
(((_platform == Common::kPlatformMacintosh) && (_features & Gob::GF_GOB1)) ||
(_features & Gob::GF_GOB2)))
_adlib = new Adlib(this);
_vm = this;

5
engines/gob/gob.h
View File

@ -91,9 +91,7 @@ enum {
GF_GOB3 = 1 << 2,
GF_WOODRUFF = 1 << 3,
GF_CD = 1 << 4,
GF_MAC = 1 << 5,
GF_EGA = 1 << 6,
GF_AMIGA = 1 << 7
GF_EGA = 1 << 5
};
enum {
@ -144,6 +142,7 @@ public:
int32 _features;
Common::Language _language;
Common::Platform _platform;
char *_startTot;
char *_startTot0;
bool _copyProtection;

6
engines/gob/inter_v1.cpp
View File

@ -1641,7 +1641,7 @@ void Inter_v1::o1_loadCurLayer(void) {
void Inter_v1::o1_playCDTrack(void) {
evalExpr(0);
if (_vm->_features & GF_MAC) {
if (_vm->_platform == Common::kPlatformMacintosh) {
if (_vm->_adlib)
_vm->_adlib->playTrack(_vm->_global->_inter_resStr);
} else
@ -1665,7 +1665,7 @@ void Inter_v1::o1_getCDTrackPos(void) {
}
void Inter_v1::o1_stopCD(void) {
if (_vm->_features & GF_MAC) {
if (_vm->_platform == Common::kPlatformMacintosh) {
if (_vm->_adlib)
_vm->_adlib->stopPlay();
} else
@ -2590,7 +2590,7 @@ void Inter_v1::o1_animateObjects(int16 &extraData, int32 *retVarPtr, Goblin::Gob
void Inter_v1::o1_drawObjects(int16 &extraData, int32 *retVarPtr, Goblin::Gob_Object *objDesc) {
_vm->_goblin->drawObjects();
if (_vm->_features & GF_MAC) {
if (_vm->_platform == Common::kPlatformMacintosh) {
if (_vm->_adlib)
_vm->_adlib->playBgMusic();
} else if (_vm->_cdrom->getTrackPos() == -1)