From 0673fa4aa53abc3f52d8f413d9e035b6392bae21 Mon Sep 17 00:00:00 2001
From: Travis Howell
Date: Sun, 8 Apr 2007 11:50:31 +0000
Subject: Rename setFilePath opcode to createDirectory, in order to reflect the
 opcodes true purpose.

svn-id: r26418
---
 engines/scumm/he/intern_he.h       |  4 ++--
 engines/scumm/he/script_v100he.cpp |  2 +-
 engines/scumm/he/script_v70he.cpp  | 10 +++++-----
 engines/scumm/he/script_v72he.cpp  | 13 ++++++++-----
 engines/scumm/he/script_v80he.cpp  |  2 +-
 engines/scumm/he/script_v90he.cpp  |  2 +-
 6 files changed, 18 insertions(+), 15 deletions(-)

(limited to 'engines/scumm/he')

diff --git a/engines/scumm/he/intern_he.h b/engines/scumm/he/intern_he.h
index 7cc172dcd7..2a59e02126 100644
--- a/engines/scumm/he/intern_he.h
+++ b/engines/scumm/he/intern_he.h
@@ -197,7 +197,7 @@ protected:
 	void o70_writeINI();
 	void o70_getStringLenForWidth();
 	void o70_getCharIndexInString();
-	void o70_setFilePath();
+	void o70_createDirectory();
 	void o70_findBox();
 	void o70_setSystemMessage();
 	void o70_polygonOps();
@@ -346,7 +346,7 @@ protected:
 	void o72_readINI();
 	void o72_writeINI();
 	void o72_getResourceSize();
-	void o72_setFilePath();
+	void o72_createDirectory();
 	void o72_setSystemMessage();
 
 	byte VAR_NUM_ROOMS;
diff --git a/engines/scumm/he/script_v100he.cpp b/engines/scumm/he/script_v100he.cpp
index 302c886c4d..2139359232 100644
--- a/engines/scumm/he/script_v100he.cpp
+++ b/engines/scumm/he/script_v100he.cpp
@@ -71,7 +71,7 @@ void ScummEngine_v100he::setupOpcodes() {
 		/* 14 */
 		OPCODE(o6_loadRoomWithEgo),
 		OPCODE(o6_invalid),
-		OPCODE(o72_setFilePath),
+		OPCODE(o72_createDirectory),
 		OPCODE(o100_createSound),
 		/* 18 */
 		OPCODE(o6_cutscene),
diff --git a/engines/scumm/he/script_v70he.cpp b/engines/scumm/he/script_v70he.cpp
index 3faa01ef4e..c70ff136c4 100644
--- a/engines/scumm/he/script_v70he.cpp
+++ b/engines/scumm/he/script_v70he.cpp
@@ -354,7 +354,7 @@ void ScummEngine_v70he::setupOpcodes() {
 		OPCODE(o70_findBox),
 		/* F8 */
 		OPCODE(o6_invalid),
-		OPCODE(o70_setFilePath),
+		OPCODE(o70_createDirectory),
 		OPCODE(o70_setSystemMessage),
 		OPCODE(o70_polygonOps),
 		/* FC */
@@ -1062,15 +1062,15 @@ void ScummEngine_v70he::o70_findBox() {
 	push(getSpecialBox(x, y));
 }
 
-void ScummEngine_v70he::o70_setFilePath() {
+void ScummEngine_v70he::o70_createDirectory() {
 	int len;
-	byte filename[100];
+	byte directoryName[100];
 
-	convertMessageToString(_scriptPointer, filename, sizeof(filename));
+	convertMessageToString(_scriptPointer, directoryName, sizeof(directoryName));
 	len = resStrLen(_scriptPointer);
 	_scriptPointer += len + 1;
 
-	debug(1,"stub o70_setFilePath(%s)", filename);
+	debug(1,"stub o70_createDirectory(%s)", directoryName);
 }
 
 void ScummEngine_v70he::o70_setSystemMessage() {
diff --git a/engines/scumm/he/script_v72he.cpp b/engines/scumm/he/script_v72he.cpp
index 2258ea58d6..518eb7d765 100644
--- a/engines/scumm/he/script_v72he.cpp
+++ b/engines/scumm/he/script_v72he.cpp
@@ -357,7 +357,7 @@ void ScummEngine_v72he::setupOpcodes() {
 		OPCODE(o70_findBox),
 		/* F8 */
 		OPCODE(o72_getResourceSize),
-		OPCODE(o72_setFilePath),
+		OPCODE(o72_createDirectory),
 		OPCODE(o72_setSystemMessage),
 		OPCODE(o70_polygonOps),
 		/* FC */
@@ -2124,6 +2124,9 @@ void ScummEngine_v72he::o72_readINI() {
 	case 7: // string
 		writeVar(0, 0);
 		if (!strcmp((char *)option, "SaveGamePath")) {
+			// We set SaveGamePath in order to detect where it used
+			// in convertFilePath and to avoid warning about invalid
+			// path in Macintosh verisons.
 			data = defineArray(0, kStringArray, 0, 0, 0, 1);
 			memcpy(data, (const char *)"*", 1);
 		} else {
@@ -2220,11 +2223,11 @@ void ScummEngine_v72he::o72_getResourceSize() {
 	push(size);
 }
 
-void ScummEngine_v72he::o72_setFilePath() {
-	byte filename[255];
+void ScummEngine_v72he::o72_createDirectory() {
+	byte directoryName[255];
 
-	copyScriptString(filename, sizeof(filename));
-	debug(1,"o72_setFilePath: %s", filename);
+	copyScriptString(directoryName, sizeof(directoryName));
+	debug(1,"o72_createDirectory: %s", directoryName);
 }
 
 void ScummEngine_v72he::o72_setSystemMessage() {
diff --git a/engines/scumm/he/script_v80he.cpp b/engines/scumm/he/script_v80he.cpp
index 1d7cc37e33..9b0adb258e 100644
--- a/engines/scumm/he/script_v80he.cpp
+++ b/engines/scumm/he/script_v80he.cpp
@@ -355,7 +355,7 @@ void ScummEngine_v80he::setupOpcodes() {
 		OPCODE(o70_findBox),
 		/* F8 */
 		OPCODE(o72_getResourceSize),
-		OPCODE(o72_setFilePath),
+		OPCODE(o72_createDirectory),
 		OPCODE(o72_setSystemMessage),
 		OPCODE(o70_polygonOps),
 		/* FC */
diff --git a/engines/scumm/he/script_v90he.cpp b/engines/scumm/he/script_v90he.cpp
index 031a4a7478..fdca6172bd 100644
--- a/engines/scumm/he/script_v90he.cpp
+++ b/engines/scumm/he/script_v90he.cpp
@@ -354,7 +354,7 @@ void ScummEngine_v90he::setupOpcodes() {
 		OPCODE(o70_findBox),
 		/* F8 */
 		OPCODE(o72_getResourceSize),
-		OPCODE(o72_setFilePath),
+		OPCODE(o72_createDirectory),
 		OPCODE(o72_setSystemMessage),
 		OPCODE(o70_polygonOps),
 		/* FC */
-- 
cgit v1.2.3