diff options
| author | Paweł Kołodziejski | 2002-12-23 09:45:20 +0000 |
|---|---|---|
| committer | Paweł Kołodziejski | 2002-12-23 09:45:20 +0000 |
| commit | 034bfddd7e0da20dfe0bcc11a08af97fef9c8f7b (patch) | |
| tree | fc99901a6515408d60a2d92dcf50a5abd4260341 | |
| parent | af86ee50322270cadbc9458bb9c55ae1a919472a (diff) | |
| download | scummvm-rg350-034bfddd7e0da20dfe0bcc11a08af97fef9c8f7b.tar.gz scummvm-rg350-034bfddd7e0da20dfe0bcc11a08af97fef9c8f7b.tar.bz2 scummvm-rg350-034bfddd7e0da20dfe0bcc11a08af97fef9c8f7b.zip | |
changed Dword to Uint32, I hope, Filgolfin will be happy :)
svn-id: r6067
| -rw-r--r-- | scumm/intern.h | 4 | ||||
| -rw-r--r-- | scumm/script_v8.cpp | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/scumm/intern.h b/scumm/intern.h index e65152caf4..3845efa993 100644 --- a/scumm/intern.h +++ b/scumm/intern.h @@ -396,8 +396,8 @@ protected: virtual void executeOpcode(int i); virtual const char *getOpcodeDesc(int i); - virtual uint32 fetchScriptDword(); - virtual int fetchScriptDwordSigned(); + virtual uint32 fetchScriptUint32(); + virtual int fetchScriptInt32(); /* Version 8 script opcodes */ void o8_unknown(); diff --git a/scumm/script_v8.cpp b/scumm/script_v8.cpp index a6e5934ea1..d88a11cbe4 100644 --- a/scumm/script_v8.cpp +++ b/scumm/script_v8.cpp @@ -370,7 +370,7 @@ const char *Scumm_v8::getOpcodeDesc(int i) return _opcodesV8[i].desc; } -uint32 Scumm_v8::fetchScriptDword() +uint32 Scumm_v8::fetchScriptUint32() { int a; if (*_lastCodePtr + sizeof(MemBlkHeader) != _scriptOrgPointer) { @@ -383,9 +383,9 @@ uint32 Scumm_v8::fetchScriptDword() return a; } -int Scumm_v8::fetchScriptDwordSigned() +int Scumm_v8::fetchScriptInt32() { - return (int32)fetchScriptDword(); + return (int32)fetchScriptUint32(); } void Scumm_v8::o8_invalid() |