Revision: 26418
http://scummvm.svn.sourceforge.net/scummvm/?rev=26418&view=rev
Author: kirben
Date: 2007-04-08 04:50:31 -0700 (Sun, 08 Apr 2007)
Log Message:
-----------
Rename setFilePath opcode to createDirectory, in order to reflect the opcodes true purpose.
Modified Paths:
--------------
scummvm/trunk/engines/scumm/he/intern_he.h
scummvm/trunk/engines/scumm/he/script_v100he.cpp
scummvm/trunk/engines/scumm/he/script_v70he.cpp
scummvm/trunk/engines/scumm/he/script_v72he.cpp
scummvm/trunk/engines/scumm/he/script_v80he.cpp
scummvm/trunk/engines/scumm/he/script_v90he.cpp
Modified: scummvm/trunk/engines/scumm/he/intern_he.h
===================================================================
--- scummvm/trunk/engines/scumm/he/intern_he.h 2007-04-08 11:42:27 UTC (rev 26417)
+++ scummvm/trunk/engines/scumm/he/intern_he.h 2007-04-08 11:50:31 UTC (rev 26418)
@@ -197,7 +197,7 @@
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 @@
void o72_readINI();
void o72_writeINI();
void o72_getResourceSize();
- void o72_setFilePath();
+ void o72_createDirectory();
void o72_setSystemMessage();
byte VAR_NUM_ROOMS;
Modified: scummvm/trunk/engines/scumm/he/script_v100he.cpp
===================================================================
--- scummvm/trunk/engines/scumm/he/script_v100he.cpp 2007-04-08 11:42:27 UTC (rev 26417)
+++ scummvm/trunk/engines/scumm/he/script_v100he.cpp 2007-04-08 11:50:31 UTC (rev 26418)
@@ -71,7 +71,7 @@
/* 14 */
OPCODE(o6_loadRoomWithEgo),
OPCODE(o6_invalid),
- OPCODE(o72_setFilePath),
+ OPCODE(o72_createDirectory),
OPCODE(o100_createSound),
/* 18 */
OPCODE(o6_cutscene),
Modified: scummvm/trunk/engines/scumm/he/script_v70he.cpp
===================================================================
--- scummvm/trunk/engines/scumm/he/script_v70he.cpp 2007-04-08 11:42:27 UTC (rev 26417)
+++ scummvm/trunk/engines/scumm/he/script_v70he.cpp 2007-04-08 11:50:31 UTC (rev 26418)
@@ -354,7 +354,7 @@
OPCODE(o70_findBox),
/* F8 */
OPCODE(o6_invalid),
- OPCODE(o70_setFilePath),
+ OPCODE(o70_createDirectory),
OPCODE(o70_setSystemMessage),
OPCODE(o70_polygonOps),
/* FC */
@@ -1062,15 +1062,15 @@
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() {
Modified: scummvm/trunk/engines/scumm/he/script_v72he.cpp
===================================================================
--- scummvm/trunk/engines/scumm/he/script_v72he.cpp 2007-04-08 11:42:27 UTC (rev 26417)
+++ scummvm/trunk/engines/scumm/he/script_v72he.cpp 2007-04-08 11:50:31 UTC (rev 26418)
@@ -357,7 +357,7 @@
OPCODE(o70_findBox),
/* F8 */
OPCODE(o72_getResourceSize),
- OPCODE(o72_setFilePath),
+ OPCODE(o72_createDirectory),
OPCODE(o72_setSystemMessage),
OPCODE(o70_polygonOps),
/* FC */
@@ -2124,6 +2124,9 @@
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 @@
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() {
Modified: scummvm/trunk/engines/scumm/he/script_v80he.cpp
===================================================================
--- scummvm/trunk/engines/scumm/he/script_v80he.cpp 2007-04-08 11:42:27 UTC (rev 26417)
+++ scummvm/trunk/engines/scumm/he/script_v80he.cpp 2007-04-08 11:50:31 UTC (rev 26418)
@@ -355,7 +355,7 @@
OPCODE(o70_findBox),
/* F8 */
OPCODE(o72_getResourceSize),
- OPCODE(o72_setFilePath),
+ OPCODE(o72_createDirectory),
OPCODE(o72_setSystemMessage),
OPCODE(o70_polygonOps),
/* FC */
Modified: scummvm/trunk/engines/scumm/he/script_v90he.cpp
===================================================================
--- scummvm/trunk/engines/scumm/he/script_v90he.cpp 2007-04-08 11:42:27 UTC (rev 26417)
+++ scummvm/trunk/engines/scumm/he/script_v90he.cpp 2007-04-08 11:50:31 UTC (rev 26418)
@@ -354,7 +354,7 @@
OPCODE(o70_findBox),
/* F8 */
OPCODE(o72_getResourceSize),
- OPCODE(o72_setFilePath),
+ OPCODE(o72_createDirectory),
OPCODE(o72_setSystemMessage),
OPCODE(o70_polygonOps),
/* FC */
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.