[Scummvm-cvs-logs] SF.net SVN: scummvm:[54570] scummvm/trunk/engines/mohawk

[mthreepwood at users.sourceforge.net]

Revision: 54570
          http://scummvm.svn.sourceforge.net/scummvm/?rev=54570&view=rev
Author:   mthreepwood
Date:     2010-11-29 12:51:53 +0000 (Mon, 29 Nov 2010)

Log Message:
-----------
MOHAWK: Divide GType_LIVINGBOOKSV3 into V2 and V3

Modified Paths:
--------------
    scummvm/trunk/engines/mohawk/detection.cpp
    scummvm/trunk/engines/mohawk/detection_tables.h
    scummvm/trunk/engines/mohawk/livingbooks.cpp
    scummvm/trunk/engines/mohawk/livingbooks.h
    scummvm/trunk/engines/mohawk/mohawk.h

Modified: scummvm/trunk/engines/mohawk/detection.cpp
===================================================================
--- scummvm/trunk/engines/mohawk/detection.cpp	2010-11-29 10:43:14 UTC (rev 54569)
+++ scummvm/trunk/engines/mohawk/detection.cpp	2010-11-29 12:51:53 UTC (rev 54570)
@@ -228,6 +228,7 @@
 			*engine = new Mohawk::MohawkEngine_Riven(syst, gd);
 			break;
 		case Mohawk::GType_LIVINGBOOKSV1:
+		case Mohawk::GType_LIVINGBOOKSV2:
 		case Mohawk::GType_LIVINGBOOKSV3:
 			*engine = new Mohawk::MohawkEngine_LivingBooks(syst, gd);
 			break;

Modified: scummvm/trunk/engines/mohawk/detection_tables.h
===================================================================
--- scummvm/trunk/engines/mohawk/detection_tables.h	2010-11-29 10:43:14 UTC (rev 54569)
+++ scummvm/trunk/engines/mohawk/detection_tables.h	2010-11-29 12:51:53 UTC (rev 54570)
@@ -533,7 +533,7 @@
 			ADGF_NO_FLAGS,
 			Common::GUIO_NONE
 		},
-		GType_LIVINGBOOKSV3,
+		GType_LIVINGBOOKSV2,
 		0,
 		"GREEN.EXE"
 	},
@@ -549,7 +549,7 @@
 			ADGF_NO_FLAGS,
 			Common::GUIO_NONE
 		},
-		GType_LIVINGBOOKSV3,
+		GType_LIVINGBOOKSV2,
 		0,
 		"GREEN32.EXE"
 	},
@@ -564,7 +564,7 @@
 			ADGF_NO_FLAGS,
 			Common::GUIO_NONE
 		},
-		GType_LIVINGBOOKSV3,
+		GType_LIVINGBOOKSV2,
 		0,
 		"Green Eggs and Ham"
 	},
@@ -579,7 +579,7 @@
 			ADGF_NO_FLAGS,
 			Common::GUIO_NONE
 		},
-		GType_LIVINGBOOKSV3,
+		GType_LIVINGBOOKSV2,
 		0,
 		"ABC.EXE"
 	},
@@ -595,7 +595,7 @@
 			ADGF_NO_FLAGS,
 			Common::GUIO_NONE
 		},
-		GType_LIVINGBOOKSV3,
+		GType_LIVINGBOOKSV2,
 		0,
 		"ABC32.EXE"
 	},
@@ -928,7 +928,7 @@
 			ADGF_NO_FLAGS,
 			Common::GUIO_NONE
 		},
-		GType_LIVINGBOOKSV3,
+		GType_LIVINGBOOKSV2,
 		0,
 		0 // FIXME: ST?
 	},
@@ -944,7 +944,7 @@
 			ADGF_NO_FLAGS,
 			Common::GUIO_NONE
 		},
-		GType_LIVINGBOOKSV3,
+		GType_LIVINGBOOKSV2,
 		0,
 		0 // FIXME: ST?
 	},

Modified: scummvm/trunk/engines/mohawk/livingbooks.cpp
===================================================================
--- scummvm/trunk/engines/mohawk/livingbooks.cpp	2010-11-29 10:43:14 UTC (rev 54569)
+++ scummvm/trunk/engines/mohawk/livingbooks.cpp	2010-11-29 12:51:53 UTC (rev 54570)
@@ -2039,7 +2039,7 @@
 void LBLiveTextItem::notify(uint16 data, uint16 from) {
 	if (!_paletteIndex) {
 		// TODO
-		warning("Zero palette-index for LiveText; V3 game?");
+		warning("Zero palette-index for LiveText; V2 game?");
 		return;
 	}
 

Modified: scummvm/trunk/engines/mohawk/livingbooks.h
===================================================================
--- scummvm/trunk/engines/mohawk/livingbooks.h	2010-11-29 10:43:14 UTC (rev 54569)
+++ scummvm/trunk/engines/mohawk/livingbooks.h	2010-11-29 12:51:53 UTC (rev 54570)
@@ -409,7 +409,7 @@
 	void notifyAll(uint16 data, uint16 from);
 	void queueDelayedEvent(DelayedEvent event);
 
-	bool isBigEndian() const { return getGameType() == GType_LIVINGBOOKSV3 || getPlatform() == Common::kPlatformMacintosh; }
+	bool isBigEndian() const { return getGameType() != GType_LIVINGBOOKSV1 || getPlatform() == Common::kPlatformMacintosh; }
 
 private:
 	LivingBooksConsole *_console;

Modified: scummvm/trunk/engines/mohawk/mohawk.h
===================================================================
--- scummvm/trunk/engines/mohawk/mohawk.h	2010-11-29 10:43:14 UTC (rev 54569)
+++ scummvm/trunk/engines/mohawk/mohawk.h	2010-11-29 12:51:53 UTC (rev 54570)
@@ -60,6 +60,7 @@
 	GType_1STDEGREE,
 	GType_CSUSA,
 	GType_LIVINGBOOKSV1,
+	GType_LIVINGBOOKSV2,
 	GType_LIVINGBOOKSV3
 };
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.