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

mthreepwood at users.sourceforge.net mthreepwood at users.sourceforge.net
Wed Dec 1 15:57:06 CET 2010


Revision: 54702
          http://scummvm.svn.sourceforge.net/scummvm/?rev=54702&view=rev
Author:   mthreepwood
Date:     2010-12-01 14:57:05 +0000 (Wed, 01 Dec 2010)

Log Message:
-----------
MOHAWK: Rename the Myst stack/card link maps

Modified Paths:
--------------
    scummvm/trunk/engines/mohawk/myst_scripts.cpp
    scummvm/trunk/engines/mohawk/myst_scripts.h
    scummvm/trunk/engines/mohawk/myst_stacks/myst.cpp

Modified: scummvm/trunk/engines/mohawk/myst_scripts.cpp
===================================================================
--- scummvm/trunk/engines/mohawk/myst_scripts.cpp	2010-12-01 14:56:06 UTC (rev 54701)
+++ scummvm/trunk/engines/mohawk/myst_scripts.cpp	2010-12-01 14:57:05 UTC (rev 54702)
@@ -49,7 +49,7 @@
 	delete[] argv;
 }
 
-const uint8 MystScriptParser::stack_map[11] = {
+const uint8 MystScriptParser::_stackMap[11] = {
 	kSeleniticStack,
 	kStoneshipStack,
 	kMystStack,
@@ -63,7 +63,7 @@
 	kMystStack
 };
 
-const uint16 MystScriptParser::start_card[11] = {
+const uint16 MystScriptParser::_startCard[11] = {
 	1282,
 	2029,
 	4396,
@@ -863,8 +863,8 @@
 
 			// TODO: Play Flyby Entry Movie on Masterpiece Edition..? Only on Myst to Age Link?
 
-			_vm->changeToStack(stack_map[targetStack]);
-			_vm->changeToCard(start_card[targetStack], true);
+			_vm->changeToStack(_stackMap[targetStack]);
+			_vm->changeToCard(_startCard[targetStack], true);
 
 			handle = _vm->_sound->playSound(soundIdLinkDst);
 			while (_vm->_mixer->isSoundHandleActive(*handle))

Modified: scummvm/trunk/engines/mohawk/myst_scripts.h
===================================================================
--- scummvm/trunk/engines/mohawk/myst_scripts.h	2010-12-01 14:56:06 UTC (rev 54701)
+++ scummvm/trunk/engines/mohawk/myst_scripts.h	2010-12-01 14:57:05 UTC (rev 54702)
@@ -141,8 +141,8 @@
 	uint16 _savedCursorId;
 	uint16 _tempVar; // Generic temp var used by the scripts
 
-	static const uint8 stack_map[];
-	static const uint16 start_card[];
+	static const uint8 _stackMap[];
+	static const uint16 _startCard[];
 
 	void setupCommonOpcodes();
 	void varUnusedCheck(uint16 op, uint16 var);

Modified: scummvm/trunk/engines/mohawk/myst_stacks/myst.cpp
===================================================================
--- scummvm/trunk/engines/mohawk/myst_stacks/myst.cpp	2010-12-01 14:56:06 UTC (rev 54701)
+++ scummvm/trunk/engines/mohawk/myst_stacks/myst.cpp	2010-12-01 14:57:05 UTC (rev 54702)
@@ -178,7 +178,7 @@
 			// Play Flyby Entry Movie on Masterpiece Edition. The Macintosh version is currently hooked
 			// up to the Cinepak versions of the video (the 'c' suffix) until the SVQ1 decoder is completed.
 			if ((_vm->getFeatures() & GF_ME)) {
-				switch (stack_map[_vm->_varStore->getVar(var)]) {
+				switch (_stackMap[_vm->_varStore->getVar(var)]) {
 				case kSeleniticStack:
 					if (_vm->getPlatform() == Common::kPlatformMacintosh)
 						_vm->_video->playMovieCentered(_vm->wrapMovieFilename("FLY_SEc", kMasterpieceOnly));
@@ -218,8 +218,8 @@
 			}
 
 			uint16 varValue = _vm->_varStore->getVar(var);
-			_vm->changeToStack(stack_map[varValue]);
-			_vm->changeToCard(start_card[varValue], true);
+			_vm->changeToStack(_stackMap[varValue]);
+			_vm->changeToCard(_startCard[varValue], true);
 
 			// TODO: No soundIdLinkDst for Opcode 100 link? Check Original.
 		}


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