[Scummvm-cvs-logs] SF.net SVN: scummvm:[33654] scummvm/trunk/engines/scumm

[fingolfin at users.sourceforge.net]

Revision: 33654
          http://scummvm.svn.sourceforge.net/scummvm/?rev=33654&view=rev
Author:   fingolfin
Date:     2008-08-06 09:13:57 +0000 (Wed, 06 Aug 2008)

Log Message:
-----------
SCUMM: Renamed inventoryScript -> inventoryScriptIndy3Mac

Modified Paths:
--------------
    scummvm/trunk/engines/scumm/script.cpp
    scummvm/trunk/engines/scumm/scumm.h

Modified: scummvm/trunk/engines/scumm/script.cpp
===================================================================
--- scummvm/trunk/engines/scumm/script.cpp	2008-08-06 04:16:45 UTC (rev 33653)
+++ scummvm/trunk/engines/scumm/script.cpp	2008-08-06 09:13:57 UTC (rev 33654)
@@ -769,14 +769,14 @@
 	args[0] = i;
 	if (VAR(VAR_INVENTORY_SCRIPT)) {
 		if (_game.id == GID_INDY3 && _game.platform == Common::kPlatformMacintosh) {
-			inventoryScript();
+			inventoryScriptIndy3Mac();
 		} else {
 			runScript(VAR(VAR_INVENTORY_SCRIPT), 0, 0, args);
 		}
 	}
 }
 
-void ScummEngine::inventoryScript() {
+void ScummEngine::inventoryScriptIndy3Mac() {
 	VerbSlot *vs;
 	int args[24];
 	int j, slot;
@@ -1201,11 +1201,11 @@
 		if (clickArea == kVerbClickArea && (val >= 101 && val <= 108)) {
 			if (val == 107) {
 				VAR(67) -= 2;
-				inventoryScript();
+				inventoryScriptIndy3Mac();
 				return;
 			} else if (val == 108) {
 				VAR(67) += 2;
-				inventoryScript();
+				inventoryScriptIndy3Mac();
 				return;
 			} else {
 				args[0] = 3;

Modified: scummvm/trunk/engines/scumm/scumm.h
===================================================================
--- scummvm/trunk/engines/scumm/scumm.h	2008-08-06 04:16:45 UTC (rev 33653)
+++ scummvm/trunk/engines/scumm/scumm.h	2008-08-06 09:13:57 UTC (rev 33654)
@@ -673,7 +673,7 @@
 	void executeScript();
 	void updateScriptPtr();
 	virtual void runInventoryScript(int i);
-	void inventoryScript();
+	void inventoryScriptIndy3Mac();
 	void checkAndRunSentenceScript();
 	void runExitScript();
 	void runEntryScript();


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