[Scummvm-cvs-logs] SF.net SVN: scummvm: [22994] scummvm/trunk/engines/scumm/he/script_v60he.cpp
kirben at users.sourceforge.net
kirben at users.sourceforge.net
Fri Jun 9 11:01:12 CEST 2006
Revision: 22994
Author: kirben
Date: 2006-06-09 02:01:06 -0700 (Fri, 09 Jun 2006)
ViewCVS: http://svn.sourceforge.net/scummvm/?rev=22994&view=rev
Log Message:
-----------
Use convertFilePath for HE6x games too, for safety
Modified Paths:
--------------
scummvm/trunk/engines/scumm/he/script_v60he.cpp
Modified: scummvm/trunk/engines/scumm/he/script_v60he.cpp
===================================================================
--- scummvm/trunk/engines/scumm/he/script_v60he.cpp 2006-06-09 08:10:00 UTC (rev 22993)
+++ scummvm/trunk/engines/scumm/he/script_v60he.cpp 2006-06-09 09:01:06 UTC (rev 22994)
@@ -976,7 +976,7 @@
}
void ScummEngine_v60he::o60_openFile() {
- int mode, len, slot, i, r;
+ int mode, len, slot, i;
byte buffer[100];
const char *filename;
@@ -1036,47 +1036,39 @@
}
void ScummEngine_v60he::o60_deleteFile() {
- int len, r;
- byte filename[100];
+ int len;
+ byte buffer[100];
+ const char *filename;
- convertMessageToString(_scriptPointer, filename, sizeof(filename));
+ convertMessageToString(_scriptPointer, buffer, sizeof(buffer));
len = resStrLen(_scriptPointer);
_scriptPointer += len + 1;
- for (r = strlen((char*)filename); r != 0; r--) {
- if (filename[r - 1] == '\\')
- break;
- }
-
- debug(1, "stub o60_deleteFile(\"%s\")", filename + r);
+ filename = (char *)buffer + convertFilePath(buffer);
+ debug(1, "o60_deleteFile stub (\"%s\")", filename);
}
void ScummEngine_v60he::o60_rename() {
- int len, r1, r2;
- byte filename[100],filename2[100];
+ int len;
+ byte buffer1[100], buffer2[100];
+ const char *filename1, *filename2;
- convertMessageToString(_scriptPointer, filename, sizeof(filename));
+ convertMessageToString(_scriptPointer, buffer1, sizeof(buffer1));
len = resStrLen(_scriptPointer);
_scriptPointer += len + 1;
- for (r1 = strlen((char*)filename); r1 != 0; r1--) {
- if (filename[r1 - 1] == '\\')
- break;
- }
+ filename1 = (char *)buffer1 + convertFilePath(buffer1);
- convertMessageToString(_scriptPointer, filename2, sizeof(filename2));
+ convertMessageToString(_scriptPointer, buffer2, sizeof(buffer2));
len = resStrLen(_scriptPointer);
_scriptPointer += len + 1;
- for (r2 = strlen((char*)filename2); r2 != 0; r2--) {
- if (filename2[r2 - 1] == '\\')
- break;
- }
+ filename2 = (char *)buffer2 + convertFilePath(buffer2);
- debug(1, "stub o60_rename(\"%s\" to \"%s\")", filename + r1, filename2 + r2);
+ debug(1, "o60_rename stub (\"%s\" to \"%s\")", filename1, filename2);
}
int ScummEngine_v60he::readFileToArray(int slot, int32 size) {
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