[Scummvm-cvs-logs] SF.net SVN: scummvm: [25294] scummvm/trunk/engines/gob

sev at users.sourceforge.net sev at users.sourceforge.net
Tue Jan 30 23:32:52 CET 2007


Revision: 25294
          http://scummvm.svn.sourceforge.net/scummvm/?rev=25294&view=rev
Author:   sev
Date:     2007-01-30 14:32:51 -0800 (Tue, 30 Jan 2007)

Log Message:
-----------
eplaced platform-specific game features with common platform setting.

Modified Paths:
--------------
    scummvm/trunk/engines/gob/detection.cpp
    scummvm/trunk/engines/gob/game_v1.cpp
    scummvm/trunk/engines/gob/game_v2.cpp
    scummvm/trunk/engines/gob/gob.cpp
    scummvm/trunk/engines/gob/gob.h
    scummvm/trunk/engines/gob/inter_v1.cpp

Modified: scummvm/trunk/engines/gob/detection.cpp
===================================================================
--- scummvm/trunk/engines/gob/detection.cpp	2007-01-30 22:22:48 UTC (rev 25293)
+++ scummvm/trunk/engines/gob/detection.cpp	2007-01-30 22:32:51 UTC (rev 25294)
@@ -129,7 +129,7 @@
 			UNK_LANG,
 			kPlatformAmiga,
 		},
-		GF_GOB1 | GF_AMIGA,
+		GF_GOB1,
 		"intro"
 	},
 	{
@@ -151,7 +151,7 @@
 			UNK_LANG,
 			kPlatformMacintosh,
 		},
-		GF_GOB1 | GF_MAC,
+		GF_GOB1,
 		"intro"
 	},
 	{
@@ -217,7 +217,7 @@
 			DE_DEU,
 			kPlatformAmiga,
 		},
-		GF_GOB2 | GF_AMIGA,
+		GF_GOB2,
 		"intro"
 	},
 	{ // Supplied by blackwhiteeagle in bug report #1605235
@@ -283,7 +283,7 @@
 			UNK_LANG,
 			kPlatformPC,
 		},
-		GF_GOB2 | GF_AMIGA,
+		GF_GOB2,
 		"intro"
 	},
 	{
@@ -510,6 +510,7 @@
 
 	_features = gameDescriptions[i].features;
 	_language = gameDescriptions[i].desc.language;
+	_platform = gameDescriptions[i].desc.platform;
 
 	return true;
 }

Modified: scummvm/trunk/engines/gob/game_v1.cpp
===================================================================
--- scummvm/trunk/engines/gob/game_v1.cpp	2007-01-30 22:22:48 UTC (rev 25293)
+++ scummvm/trunk/engines/gob/game_v1.cpp	2007-01-30 22:32:51 UTC (rev 25294)
@@ -81,7 +81,7 @@
 				_vm->_draw->_fontToSprite[i].height = -1;
 			}
 
-			if (_vm->_features & GF_MAC) {
+			if (_vm->_platform == Common::kPlatformMacintosh) {
 				if (_vm->_adlib)
 					_vm->_adlib->stopPlay();
 			} else

Modified: scummvm/trunk/engines/gob/game_v2.cpp
===================================================================
--- scummvm/trunk/engines/gob/game_v2.cpp	2007-01-30 22:22:48 UTC (rev 25293)
+++ scummvm/trunk/engines/gob/game_v2.cpp	2007-01-30 22:32:51 UTC (rev 25294)
@@ -73,7 +73,7 @@
 		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

Modified: scummvm/trunk/engines/gob/gob.cpp
===================================================================
--- scummvm/trunk/engines/gob/gob.cpp	2007-01-30 22:22:48 UTC (rev 25293)
+++ scummvm/trunk/engines/gob/gob.cpp	2007-01-30 22:32:51 UTC (rev 25294)
@@ -614,8 +614,8 @@
 	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;

Modified: scummvm/trunk/engines/gob/gob.h
===================================================================
--- scummvm/trunk/engines/gob/gob.h	2007-01-30 22:22:48 UTC (rev 25293)
+++ scummvm/trunk/engines/gob/gob.h	2007-01-30 22:32:51 UTC (rev 25294)
@@ -91,9 +91,7 @@
 	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 @@
 
 	int32 _features;
 	Common::Language _language;
+	Common::Platform _platform;
 	char *_startTot;
 	char *_startTot0;
 	bool _copyProtection;

Modified: scummvm/trunk/engines/gob/inter_v1.cpp
===================================================================
--- scummvm/trunk/engines/gob/inter_v1.cpp	2007-01-30 22:22:48 UTC (rev 25293)
+++ scummvm/trunk/engines/gob/inter_v1.cpp	2007-01-30 22:32:51 UTC (rev 25294)
@@ -1641,7 +1641,7 @@
 
 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_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_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)


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