[Scummvm-cvs-logs] scummvm master -> fdafc7c39102dc0643537028755f0a89e347cb4d

sev- sev at scummvm.org
Sun Sep 8 23:39:11 CEST 2013


This automated email contains information about 4 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
6384cfdeaa AD: Introduce ADGF_DROPPLATFORM
693ed1e988 FULLPIPE: Drop game platform in autogenerated gameid since only Windows version existed
b165dd8a06 FULLPIPE: Fix warnings
fdafc7c391 FULLPIPE: Fix warning


Commit: 6384cfdeaabec261ce1abed95860fdc7ea1ca978
    https://github.com/scummvm/scummvm/commit/6384cfdeaabec261ce1abed95860fdc7ea1ca978
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2013-09-08T14:38:06-07:00

Commit Message:
AD: Introduce ADGF_DROPPLATFORM

Changed paths:
    engines/advancedDetector.cpp
    engines/advancedDetector.h



diff --git a/engines/advancedDetector.cpp b/engines/advancedDetector.cpp
index fd0c8dc..40783a2 100644
--- a/engines/advancedDetector.cpp
+++ b/engines/advancedDetector.cpp
@@ -78,7 +78,7 @@ static Common::String generatePreferredTarget(const Common::String &id, const AD
 		res = res + "-cd";
 	}
 
-	if (desc->platform != Common::kPlatformDOS && desc->platform != Common::kPlatformUnknown) {
+	if (desc->platform != Common::kPlatformDOS && desc->platform != Common::kPlatformUnknown && !(desc->flags & ADGF_DROPPLATFORM)) {
 		res = res + "-" + getPlatformAbbrev(desc->platform);
 	}
 
diff --git a/engines/advancedDetector.h b/engines/advancedDetector.h
index 71d2c4a..376a59e 100644
--- a/engines/advancedDetector.h
+++ b/engines/advancedDetector.h
@@ -87,7 +87,8 @@ enum ADGameFlags {
 	ADGF_ADDENGLISH = (1 << 24), ///< always add English as language option
 	ADGF_MACRESFORK = (1 << 25), ///< the md5 for this entry will be calculated from the resource fork
 	ADGF_USEEXTRAASTITLE = (1 << 26), ///< Extra field value will be used as main game title, not gameid
-	ADGF_DROPLANGUAGE = (1 << 28), ///< don't add language to gameid
+	ADGF_DROPLANGUAGE = (1 << 27), ///< don't add language to gameid
+	ADGF_DROPPLATFORM = (1 << 28), ///< don't add platform to gameid
 	ADGF_CD = (1 << 29),    	///< add "-cd" to gameid
 	ADGF_DEMO = (1 << 30)   	///< add "-demo" to gameid
 };


Commit: 693ed1e988e164b738e019aaf9e7b5999d2b14a4
    https://github.com/scummvm/scummvm/commit/693ed1e988e164b738e019aaf9e7b5999d2b14a4
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2013-09-08T14:38:06-07:00

Commit Message:
FULLPIPE: Drop game platform in autogenerated gameid since only Windows version existed

Changed paths:
    engines/fullpipe/detection.cpp



diff --git a/engines/fullpipe/detection.cpp b/engines/fullpipe/detection.cpp
index 4cb46ba..8c4a422 100644
--- a/engines/fullpipe/detection.cpp
+++ b/engines/fullpipe/detection.cpp
@@ -52,7 +52,7 @@ static const ADGameDescription gameDescriptions[] = {
 		AD_ENTRY1s("0654.sc2", "099f54f86d33ad2395f3b854b7e05058", 2272),
 		Common::RU_RUS,
 		Common::kPlatformWindows,
-		ADGF_NO_FLAGS,
+		ADGF_DROPPLATFORM,
 		GUIO1(GUIO_NONE)
 	},
 
@@ -63,7 +63,7 @@ static const ADGameDescription gameDescriptions[] = {
 		AD_ENTRY1s("0654.sc2", "d8743351fc53d205f42d91f6d791e51b", 2272),
 		Common::RU_RUS,
 		Common::kPlatformWindows,
-		ADGF_NO_FLAGS,
+		ADGF_DROPPLATFORM,
 		GUIO1(GUIO_NONE)
 	},
 


Commit: b165dd8a06971d182c623d913f4306a945e7ecbc
    https://github.com/scummvm/scummvm/commit/b165dd8a06971d182c623d913f4306a945e7ecbc
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2013-09-08T14:38:07-07:00

Commit Message:
FULLPIPE: Fix warnings

Changed paths:
    engines/fullpipe/interaction.cpp



diff --git a/engines/fullpipe/interaction.cpp b/engines/fullpipe/interaction.cpp
index 4153724..cdf39d2 100644
--- a/engines/fullpipe/interaction.cpp
+++ b/engines/fullpipe/interaction.cpp
@@ -472,8 +472,8 @@ bool CInteraction::isOverlapping(StaticANIObject *subj, GameObject *obj) {
 
 	if (abs(_xOffs + obj->_ox - subj->_ox) <= 1
 		&& abs(obj->_oy + _yOffs - subj->_oy) <= 1) {
-		if (!_staticsId2 || subj->_statics != 0 && subj->_statics->_staticsId == _staticsId2) {
-			if (!_staticsId1 || !(_flags & 1) || ani->_statics != 0 && ani->_statics->_staticsId == _staticsId1)
+		if (!_staticsId2 || (subj->_statics != 0 && subj->_statics->_staticsId == _staticsId2)) {
+			if (!_staticsId1 || !(_flags & 1) || (ani->_statics != 0 && ani->_statics->_staticsId == _staticsId1))
 				return true;
 		}
 	}


Commit: fdafc7c39102dc0643537028755f0a89e347cb4d
    https://github.com/scummvm/scummvm/commit/fdafc7c39102dc0643537028755f0a89e347cb4d
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2013-09-08T14:38:07-07:00

Commit Message:
FULLPIPE: Fix warning

Changed paths:
    engines/fullpipe/messages.cpp



diff --git a/engines/fullpipe/messages.cpp b/engines/fullpipe/messages.cpp
index acf44f5..818753a 100644
--- a/engines/fullpipe/messages.cpp
+++ b/engines/fullpipe/messages.cpp
@@ -446,7 +446,7 @@ void MessageQueue::replaceKeyCode(int key1, int key2) {
 }
 
 int MessageQueue::calcDuration(StaticANIObject *obj) {
-	int res;
+	int res = 0;
 	ExCommand *ex;
 	Movement *mov;
 






More information about the Scummvm-git-logs mailing list