[Scummvm-cvs-logs] SF.net SVN: scummvm: [20484] scummvm/trunk/tools
kirben at users.sourceforge.net
kirben at users.sourceforge.net
Fri Feb 10 16:45:02 CET 2006
Revision: 20484
Author: kirben
Date: 2006-02-10 16:44:04 -0800 (Fri, 10 Feb 2006)
ViewCVS: http://svn.sourceforge.net/scummvm?rev=20484&view=rev
Log Message:
-----------
Add support for Spanish version of balloon
Modified Paths:
--------------
scummvm/trunk/scumm/intern_he.h
scummvm/trunk/scumm/script.cpp
scummvm/trunk/scumm/script_v100he.cpp
scummvm/trunk/scumm/script_v72he.cpp
scummvm/trunk/scumm/script_v8.cpp
scummvm/trunk/scumm/script_v80he.cpp
scummvm/trunk/scumm/script_v90he.cpp
scummvm/trunk/scumm/scumm-md5.h
scummvm/trunk/scumm/scumm.h
scummvm/trunk/tools/scumm-md5.txt
Modified: scummvm/trunk/scumm/intern_he.h
===================================================================
--- scummvm/trunk/scumm/intern_he.h 2006-02-11 00:17:20 UTC (rev 20483)
+++ scummvm/trunk/scumm/intern_he.h 2006-02-11 00:44:04 UTC (rev 20484)
@@ -370,6 +370,7 @@
void o80_stringToInt();
void o80_getSoundVar();
void o80_localizeArrayToRoom();
+ void o80_sourceDebug();
void o80_readConfigFile();
void o80_writeConfigFile();
void o80_cursorCommand();
Modified: scummvm/trunk/scumm/script.cpp
===================================================================
--- scummvm/trunk/scumm/script.cpp 2006-02-11 00:17:20 UTC (rev 20483)
+++ scummvm/trunk/scumm/script.cpp 2006-02-11 00:44:04 UTC (rev 20484)
@@ -495,6 +495,22 @@
return (int16)fetchScriptWord();
}
+uint ScummEngine::fetchScriptDWord() {
+ int a;
+ if (*_lastCodePtr + sizeof(MemBlkHeader) != _scriptOrgPointer) {
+ uint32 oldoffs = _scriptPointer - _scriptOrgPointer;
+ getScriptBaseAddress();
+ _scriptPointer = _scriptOrgPointer + oldoffs;
+ }
+ a = READ_LE_UINT32(_scriptPointer);
+ _scriptPointer += 4;
+ return a;
+}
+
+int ScummEngine::fetchScriptDWordSigned() {
+ return (int32)fetchScriptDWord();
+}
+
int ScummEngine::readVar(uint var) {
int a;
Modified: scummvm/trunk/scumm/script_v100he.cpp
===================================================================
--- scummvm/trunk/scumm/script_v100he.cpp 2006-02-11 00:17:20 UTC (rev 20483)
+++ scummvm/trunk/scumm/script_v100he.cpp 2006-02-11 00:44:04 UTC (rev 20484)
@@ -190,7 +190,7 @@
OPCODE(o6_delaySeconds),
OPCODE(o100_startSound),
/* 78 */
- OPCODE(o6_invalid),
+ OPCODE(o80_sourceDebug),
OPCODE(o100_setSpriteInfo),
OPCODE(o6_stampObject),
OPCODE(o72_startObject),
Modified: scummvm/trunk/scumm/script_v72he.cpp
===================================================================
--- scummvm/trunk/scumm/script_v72he.cpp 2006-02-11 00:17:20 UTC (rev 20483)
+++ scummvm/trunk/scumm/script_v72he.cpp 2006-02-11 00:44:04 UTC (rev 20484)
@@ -766,15 +766,7 @@
}
void ScummEngine_v72he::o72_pushDWord() {
- int a;
- if (*_lastCodePtr + sizeof(MemBlkHeader) != _scriptOrgPointer) {
- uint32 oldoffs = _scriptPointer - _scriptOrgPointer;
- getScriptBaseAddress();
- _scriptPointer = _scriptOrgPointer + oldoffs;
- }
- a = READ_LE_UINT32(_scriptPointer);
- _scriptPointer += 4;
- push(a);
+ push(fetchScriptDWordSigned());
}
void ScummEngine_v72he::o72_getScriptString() {
Modified: scummvm/trunk/scumm/script_v8.cpp
===================================================================
--- scummvm/trunk/scumm/script_v8.cpp 2006-02-11 00:17:20 UTC (rev 20483)
+++ scummvm/trunk/scumm/script_v8.cpp 2006-02-11 00:44:04 UTC (rev 20484)
@@ -377,19 +377,11 @@
// In V8, the word size is 4 byte, not 2 bytes as in V6/V7 games
uint ScummEngine_v8::fetchScriptWord() {
- int a;
- if (*_lastCodePtr + sizeof(MemBlkHeader) != _scriptOrgPointer) {
- uint32 oldoffs = _scriptPointer - _scriptOrgPointer;
- getScriptBaseAddress();
- _scriptPointer = _scriptOrgPointer + oldoffs;
- }
- a = READ_LE_UINT32(_scriptPointer);
- _scriptPointer += 4;
- return a;
+ return fetchScriptDWord();
}
int ScummEngine_v8::fetchScriptWordSigned() {
- return (int32)fetchScriptWord();
+ return (int32)fetchScriptDWordSigned();
}
int ScummEngine_v8::readVar(uint var) {
Modified: scummvm/trunk/scumm/script_v80he.cpp
===================================================================
--- scummvm/trunk/scumm/script_v80he.cpp 2006-02-11 00:17:20 UTC (rev 20483)
+++ scummvm/trunk/scumm/script_v80he.cpp 2006-02-11 00:44:04 UTC (rev 20484)
@@ -138,7 +138,7 @@
OPCODE(o80_localizeArrayToRoom),
OPCODE(o6_wordArrayIndexedWrite),
/* 4C */
- OPCODE(o6_invalid),
+ OPCODE(o80_sourceDebug),
OPCODE(o80_readConfigFile),
OPCODE(o80_writeConfigFile),
OPCODE(o6_wordVarInc),
@@ -439,6 +439,11 @@
localizeArray(slot, 0xFF);
}
+void ScummEngine_v80he::o80_sourceDebug() {
+ fetchScriptDWord();
+ fetchScriptDWord();
+}
+
void ScummEngine_v80he::o80_readConfigFile() {
byte option[128], section[128], filename[256];
ArrayHeader *ah;
Modified: scummvm/trunk/scumm/script_v90he.cpp
===================================================================
--- scummvm/trunk/scumm/script_v90he.cpp 2006-02-11 00:17:20 UTC (rev 20483)
+++ scummvm/trunk/scumm/script_v90he.cpp 2006-02-11 00:44:04 UTC (rev 20484)
@@ -136,7 +136,7 @@
OPCODE(o80_localizeArrayToRoom),
OPCODE(o6_wordArrayIndexedWrite),
/* 4C */
- OPCODE(o6_invalid),
+ OPCODE(o80_sourceDebug),
OPCODE(o80_readConfigFile),
OPCODE(o80_writeConfigFile),
OPCODE(o6_wordVarInc),
Modified: scummvm/trunk/scumm/scumm-md5.h
===================================================================
--- scummvm/trunk/scumm/scumm-md5.h 2006-02-11 00:17:20 UTC (rev 20483)
+++ scummvm/trunk/scumm/scumm-md5.h 2006-02-11 00:44:04 UTC (rev 20484)
@@ -1,5 +1,5 @@
/*
- This file was generated by the md5table tool on Sat Jan 21 12:36:17 2006
+ This file was generated by the md5table tool on Sat Feb 11 00:38:53 2006
DO NOT EDIT MANUALLY!
*/
@@ -80,6 +80,7 @@
{ "2108d83dcf09f8adb4bc524669c8cf51", "PuttTime", Common::EN_USA, Common::kPlatformUnknown },
{ "21a6592322f92550f144f68a8a4e685e", "dig", Common::FR_FRA, Common::kPlatformMacintosh },
{ "21abe302e1b1e2b66d6f5c12e241ebfd", "freddicove", Common::RU_RUS, Common::kPlatformWindows },
+ { "2232b0b9411575b1f9961713ebc9de61", "balloon", Common::ES_ESP, Common::kPlatformWindows },
{ "225e18566e810c634bf7de63e7568e3e", "mustard", Common::EN_USA, Common::kPlatformUnknown },
{ "22c9eb04455440131ffc157aeb8d40a8", "fbear", Common::EN_USA, Common::kPlatformWindows },
{ "22d07d6c386c9c25aca5dac2a0c0d94b", "maniac", Common::SE_SWE, Common::kPlatformNES },
Modified: scummvm/trunk/scumm/scumm.h
===================================================================
--- scummvm/trunk/scumm/scumm.h 2006-02-11 00:17:20 UTC (rev 20483)
+++ scummvm/trunk/scumm/scumm.h 2006-02-11 00:44:04 UTC (rev 20484)
@@ -677,6 +677,8 @@
byte fetchScriptByte();
virtual uint fetchScriptWord();
virtual int fetchScriptWordSigned();
+ uint fetchScriptDWord();
+ int fetchScriptDWordSigned();
void ignoreScriptWord() { fetchScriptWord(); }
void ignoreScriptByte() { fetchScriptByte(); }
virtual void getResultPos();
Modified: scummvm/trunk/tools/scumm-md5.txt
===================================================================
--- scummvm/trunk/tools/scumm-md5.txt 2006-02-11 00:17:20 UTC (rev 20483)
+++ scummvm/trunk/tools/scumm-md5.txt 2006-02-11 00:44:04 UTC (rev 20484)
@@ -565,6 +565,7 @@
CD All en 8e3241ddd6c8dadf64305e8740d45e13 balloon Kirben
CD Windows en d7b247c26bf1f01f8f7daf142be84de3 balloon iziku
CD Windows ru 145bd3373574feb668cc2eea2ec6cf86 balloon sev
+ CD Windows es 2232b0b9411575b1f9961713ebc9de61 balloon exiltd
Putt-Putt and Pep's Dog on a Stick
CD All en eae95b2b3546d8ba86ae1d397c383253 dog Kirben
More information about the Scummvm-git-logs
mailing list