libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2024-12-27 04:07:05 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Convert windows path separators before opening wiz files.

Browse Source 
svn-id: r17874
This commit is contained in:
Eugene Sandulenko 2005-04-30 20:48:59 +00:00
parent 13a13ae10a
commit 280abe9e91
1 changed files with 23 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
scumm/wiz_he.cpp
View File

@ -1631,6 +1631,9 @@ void ScummEngine_v90he::fillWizParallelogram(const WizParameters *params) {
} }
void ScummEngine_v90he::processWizImage(const WizParameters *params) { void ScummEngine_v90he::processWizImage(const WizParameters *params) {
char buf[512];
unsigned int i;
debug(2, "processWizImage: processMode %d", params->processMode); debug(2, "processWizImage: processMode %d", params->processMode);
switch (params->processMode) { switch (params->processMode) {
case 0: case 0:
@ -1645,7 +1648,15 @@ void ScummEngine_v90he::processWizImage(const WizParameters *params) {
case 3: case 3:
if (params->processFlags & kWPFUseFile) { if (params->processFlags & kWPFUseFile) {
File f; File f;
if (f.open((const char *)params->filename, File::kFileReadMode)) {
// Convert Windows path separators to something more portable
strncpy(buf, (const char *)params->filename, 512);
for (i = 0; i < strlen(buf); i++) {
if (buf[i] == '\\')
buf[i] = '/';
}
if (f.open((const char *)buf, File::kFileReadMode)) {
uint32 id = f.readUint32LE(); uint32 id = f.readUint32LE();
if (id == TO_LE_32(MKID('AWIZ')) || id == TO_LE_32(MKID('MULT'))) { if (id == TO_LE_32(MKID('AWIZ')) || id == TO_LE_32(MKID('MULT'))) {
uint32 size = f.readUint32BE(); uint32 size = f.readUint32BE();
@ -1653,7 +1664,7 @@ void ScummEngine_v90he::processWizImage(const WizParameters *params) {
byte *p = res.createResource(rtImage, params->img.resNum, size); byte *p = res.createResource(rtImage, params->img.resNum, size);
if (f.read(p, size) != size) { if (f.read(p, size) != size) {
res.nukeResource(rtImage, params->img.resNum); res.nukeResource(rtImage, params->img.resNum);
warning("i/o error when reading '%s'", params->filename); warning("i/o error when reading '%s'", buf);
VAR(VAR_GAME_LOADED) = -2; VAR(VAR_GAME_LOADED) = -2;
VAR(119) = -2; VAR(119) = -2;
} else { } else {
@ -1668,7 +1679,7 @@ void ScummEngine_v90he::processWizImage(const WizParameters *params) {
} else { } else {
VAR(VAR_GAME_LOADED) = -3; VAR(VAR_GAME_LOADED) = -3;
VAR(119) = -3; VAR(119) = -3;
warning("Unable to open for read '%s'", params->filename); warning("Unable to open for read '%s'", buf);
} }
} }
break; break;
@ -1684,8 +1695,15 @@ void ScummEngine_v90he::processWizImage(const WizParameters *params) {
// TODO Write image to file // TODO Write image to file
break; break;
case 0: case 0:
if (!f.open((const char *)params->filename, File::kFileWriteMode)) { // Convert Windows path separators to something more portable
warning("Unable to open for write '%s'", params->filename); strncpy(buf, (const char *)params->filename, 512);
for (i = 0; i < strlen(buf); i++) {
if (buf[i] == '\\')
buf[i] = '/';
}
if (!f.open((const char *)buf, File::kFileWriteMode)) {
warning("Unable to open for write '%s'", buf);
VAR(119) = -3; VAR(119) = -3;
} else { } else {
byte *p = getResourceAddress(rtImage, params->img.resNum); byte *p = getResourceAddress(rtImage, params->img.resNum);