Ticket #8371: dekyra_v2.patch

.cpp

@@ -113 +113 @@
                 fread(chunkName, sizeof(uint8) * 4, 1, script);
                 chunkName[4] = '\0';
                 // check name of chunk
-                if (!strcmp((char*)chunkName, "FORM")) {                        
+                if (!strcmp((char*)chunkName, "FORM")) {
                         // FreeKyra swaps the size I only read it in BigEndian :)
-                        _chunks[kForm]._size = readUint32BE(script);                            
+                        _chunks[kForm]._size = readUint32BE(script);
                 } else if (!strcmp((char*)chunkName, "TEXT")) {
                         uint32 text_size = readUint32BE(script);
                         text_size += text_size % 2 != 0 ? 1 : 0;
                         
                         _chunks[kText]._data = _scriptFile + ftell(script);
-                        _chunks[kText]._size = TO_BE_16(*((uint16*)_chunks[kText]._data)) >> 1;
-                        _chunks[kText]._additional = _chunks[kText]._data + (_chunks[kText]._size << 1);                                
+                        _chunks[kText]._size = TO_BE_16(*((uint16*)(_chunks[kText]._data))) >> 1;
+                        _chunks[kText]._additional = _chunks[kText]._data + (_chunks[kText]._size << 1);
                         fseek(script, text_size, SEEK_CUR);
                 } else if (!strcmp((char*)chunkName, "DATA")) {
                         _chunks[kData]._size = readUint32BE(script);
@@ -135 +135 @@
                         chunkName[8] = '\0';
                         if (!strcmp((char*)chunkName, "EMC2ORDR")) {
                                 _chunks[kEmc2Ordr]._size = readUint32BE(script) >> 1;
-                                _chunks[kEmc2Ordr]._data = _scriptFile + ftell(script);                                 
+                                _chunks[kEmc2Ordr]._data = _scriptFile + ftell(script);
                                 fseek(script, _chunks[kEmc2Ordr]._size * 2, SEEK_CUR);
                         } else {
                                 // any unkown chunk or problems with seeking through the file
@@ -156 +156 @@
                 }
                 uint32 startoffset = TO_BE_16(((uint16*)_chunks[kText]._data)[pos]);
                 printf("Index: %d Offset: %d:\n", pos, startoffset);
-                /*uint32 endoffset = TO_BE_16(((uint16*)_chunks[kText]._data)[pos+1]);
-                printf("\nstartoffset = %d, endoffset = %d\n\n", startoffset, endoffset);
-                for (; startoffset < endoffset; ++startoffset) {
-                        printf("%c", *(char*)(_chunks[kText]._additional + startoffset));
-                }
-                printf("\n");*/
                 printf("%d(%d) : %s\n", pos, startoffset, (char*)(_chunks[kText]._data + startoffset));
         }
 }
@@ -227 +221 @@
         };
         
         static OpcodeDesc opcodeDesc[] = {
-                { 0x68, "0x68", "int" }
+                { 0x68, "o1_0x68", "int" }
         };
         
         if ((uint32)script >= _chunks[kEmc2Ordr]._size || script < 0) {
@@ -252 +246 @@
         
         uint8 _currentCommand = 0;
         uint8 _argument = 0;    
-        _currentPos = (TO_BE_16(((uint16*)_chunks[kEmc2Ordr]._data)[script]) << 1) + 2; 
+        _currentPos = TO_BE_16(((uint16*)_chunks[kEmc2Ordr]._data)[script]) << 1;       
         uint8* script_start = _chunks[kData]._data;
         bool gotArgument = true;