[Scummvm-cvs-logs] SF.net SVN: scummvm: [21820] scummvm/trunk/engines/cine
sev at users.sourceforge.net
sev at users.sourceforge.net
Tue Apr 11 20:47:05 CEST 2006
Revision: 21820
Author: sev
Date: 2006-04-11 20:45:54 -0700 (Tue, 11 Apr 2006)
ViewCVS: http://svn.sourceforge.net/scummvm/?rev=21820&view=rev
Log Message:
-----------
Fix script dumping
Modified Paths:
--------------
scummvm/trunk/engines/cine/cine.h
scummvm/trunk/engines/cine/rel.cpp
scummvm/trunk/engines/cine/rel.h
scummvm/trunk/engines/cine/script.cpp
Modified: scummvm/trunk/engines/cine/cine.h
===================================================================
--- scummvm/trunk/engines/cine/cine.h 2006-04-12 03:12:56 UTC (rev 21819)
+++ scummvm/trunk/engines/cine/cine.h 2006-04-12 03:45:54 UTC (rev 21820)
@@ -43,6 +43,8 @@
#include "cine/gfx.h"
#include "cine/anim.h"
+//#define DUMP_SCRIPTS
+
namespace Cine {
enum CineGameId {
Modified: scummvm/trunk/engines/cine/rel.cpp
===================================================================
--- scummvm/trunk/engines/cine/rel.cpp 2006-04-12 03:12:56 UTC (rev 21819)
+++ scummvm/trunk/engines/cine/rel.cpp 2006-04-12 03:45:54 UTC (rev 21820)
@@ -87,7 +87,7 @@
for (i = 0; i < numEntry; i++) {
if (relTable[i].size) {
- relTable[i].data = (char *)malloc(relTable[i].size);
+ relTable[i].data = (byte *)malloc(relTable[i].size);
assert(relTable[i].data);
@@ -96,17 +96,17 @@
}
}
-#ifdef DUMP_SCRIPTS_OBJ
+#ifdef DUMP_SCRIPTS
{
- uint16 i;
- byte buffer[256];
+ uint16 s;
+ char buffer[256];
- for (i = 0; i < numEntry; i++) {
- if (relTable[i].var4) {
- sprintf(buffer, "%s_%03d.txt", pRelName, i);
+ for (s = 0; s < numEntry; s++) {
+ if (relTable[s].size) {
+ sprintf(buffer, "%s_%03d.txt", pRelName, s);
- decompileScript(relTable[i].data, NULL, relTable[i].size, i);
+ decompileScript(relTable[s].data, NULL, relTable[s].size, s);
dumpScript(buffer);
}
}
Modified: scummvm/trunk/engines/cine/rel.h
===================================================================
--- scummvm/trunk/engines/cine/rel.h 2006-04-12 03:12:56 UTC (rev 21819)
+++ scummvm/trunk/engines/cine/rel.h 2006-04-12 03:45:54 UTC (rev 21820)
@@ -28,7 +28,7 @@
namespace Cine {
struct RelObjectScript {
- char *data;
+ byte *data;
uint16 size;
uint16 obj1Param1;
uint16 obj1Param2;
Modified: scummvm/trunk/engines/cine/script.cpp
===================================================================
--- scummvm/trunk/engines/cine/script.cpp 2006-04-12 03:12:56 UTC (rev 21819)
+++ scummvm/trunk/engines/cine/script.cpp 2006-04-12 03:45:54 UTC (rev 21820)
@@ -2205,15 +2205,15 @@
#ifdef DUMP_SCRIPTS
-byte decompileBuffer[10000][1000];
+char decompileBuffer[10000][1000];
uint16 decompileBufferPosition = 0;
-byte bufferDec[256];
+char bufferDec[256];
-byte compareString1[256];
-byte compareString2[256];
+char compareString1[256];
+char compareString2[256];
-byte *getObjPramName(byte paramIdx) {
+const char *getObjPramName(byte paramIdx) {
switch (paramIdx) {
case 1:
return ".X";
@@ -2234,7 +2234,7 @@
}
void decompileScript(byte *scriptPtr, int16 *stackPtr, uint16 scriptSize, uint16 scriptIdx) {
- byte lineBuffer[256];
+ char lineBuffer[256];
byte *localScriptPtr = scriptPtr;
uint16 exitScript;
uint32 position = 0;
@@ -2892,28 +2892,28 @@
{
sprintf(lineBuffer, "loadResource(%s)\n", localScriptPtr + position);
- position += strlen(localScriptPtr + position) + 1;
+ position += strlen((char *)localScriptPtr + position) + 1;
break;
}
case 0x3C:
{
sprintf(lineBuffer, "loadBg(%s)\n", localScriptPtr + position);
- position += strlen(localScriptPtr + position) + 1;
+ position += strlen((char *)localScriptPtr + position) + 1;
break;
}
case 0x3D:
{
sprintf(lineBuffer, "loadCt(%s)\n", localScriptPtr + position);
- position += strlen(localScriptPtr + position) + 1;
+ position += strlen((char *)localScriptPtr + position) + 1;
break;
}
case OP_loadPart:
{
sprintf(lineBuffer, "loadPart(%s)\n", localScriptPtr + position);
- position += strlen(localScriptPtr + position) + 1;
+ position += strlen((char *)localScriptPtr + position) + 1;
break;
}
case 0x40:
@@ -2930,7 +2930,7 @@
sprintf(lineBuffer, "loadPrc(%d,%s)\n", param, localScriptPtr + position);
- position += strlen(localScriptPtr + position) + 1;
+ position += strlen((char *)localScriptPtr + position) + 1;
break;
}
case OP_requestCheckPendingDataLoad: // nop
@@ -2965,7 +2965,7 @@
param3 = READ_BE_UINT16(localScriptPtr + position);
position += 2;
- param4 = READ_BE_UINT16)(localScriptPtr + position);
+ param4 = READ_BE_UINT16(localScriptPtr + position);
position += 2;
param5 = READ_BE_UINT16(localScriptPtr + position);
@@ -3099,7 +3099,7 @@
{
sprintf(lineBuffer, "comment: %s\n", localScriptPtr + position);
- position += strlen(localScriptPtr + position);
+ position += strlen((char *)localScriptPtr + position);
break;
}
case 0x5A:
@@ -3178,7 +3178,7 @@
{
sprintf(lineBuffer, "loadDat(%s)\n", localScriptPtr + position);
- position += strlen(localScriptPtr + position) + 1;
+ position += strlen((char *)localScriptPtr + position) + 1;
break;
}
case 0x6E: // nop
@@ -3322,7 +3322,7 @@
param7 = READ_BE_UINT16(localScriptPtr + position);
position += 2;
- sprintf(lineBuffer, "OP_7F(%d,%d,%d,%d,%d)\n", param1, param2, param3, param4, param5, param6, param7);
+ sprintf(lineBuffer, "OP_7F(%d,%d,%d,%d,%d,%d,%d)\n", param1, param2, param3, param4, param5, param6, param7);
break;
}
@@ -3465,7 +3465,7 @@
sprintf(lineBuffer, "ADDBG(%d,%s)\n", param1, localScriptPtr + position);
- position += strlen(localScriptPtr + position);
+ position += strlen((char *)localScriptPtr + position);
break;
}
@@ -3489,7 +3489,7 @@
sprintf(lineBuffer, "loadABS(%d,%s)\n", param1, localScriptPtr + position);
- position += strlen(localScriptPtr + position);
+ position += strlen((char *)localScriptPtr + position);
break;
}
@@ -3589,17 +3589,17 @@
} while (!exitScript);
}
-void dumpScript(byte *dumpName) {
- File *fHandle;
+void dumpScript(char *dumpName) {
+ Common::File fHandle;
uint16 i;
- fHandle = fopen(dumpName, "wt+");
+ fHandle.open(dumpName, Common::File::kFileWriteMode);
for (i = 0; i < decompileBufferPosition; i++) {
- fprintf(fHandle, decompileBuffer[i]);
+ fHandle.writeString(Common::String(decompileBuffer[i]));
}
- fclose(fHandle);
+ fHandle.close();
decompileBufferPosition = 0;
}
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