aboutsummaryrefslogtreecommitdiff
path: root/scumm
diff options
context:
space:
mode:
authorChris Apers2004-09-12 10:51:00 +0000
committerChris Apers2004-09-12 10:51:00 +0000
commit6b58b000c60c2810fda5b5ac4ac882ef16ce27da (patch)
treee9a3d3a5c42a7cf2244d720c15423f3c0e6cefd7 /scumm
parent0a44ef3d3c2d6d957581e1d451b430e70a4a8a6a (diff)
downloadscummvm-rg350-6b58b000c60c2810fda5b5ac4ac882ef16ce27da.tar.gz
scummvm-rg350-6b58b000c60c2810fda5b5ac4ac882ef16ce27da.tar.bz2
scummvm-rg350-6b58b000c60c2810fda5b5ac4ac882ef16ce27da.zip
Correct variable name
svn-id: r15025
Diffstat (limited to 'scumm')
-rw-r--r--scumm/akos.cpp4
-rw-r--r--scumm/object.cpp2
2 files changed, 4 insertions, 2 deletions
diff --git a/scumm/akos.cpp b/scumm/akos.cpp
index b753ad6c13..3108a7d504 100644
--- a/scumm/akos.cpp
+++ b/scumm/akos.cpp
@@ -589,7 +589,7 @@ void AkosRenderer::codec1_genericDecode() {
#ifdef __PALM_OS__
const byte *defaultScaleTable;
-const byte *old_scaleTable;
+const byte *oldScaleTable;
#else
const byte oldScaleTable[256] = {
0xFF, 0xFD, 0x7D, 0xBD, 0x3D, 0xDD, 0x5D, 0x9D,
@@ -1718,10 +1718,12 @@ void ScummEngine::akos_processQueue() {
_GINIT(Akos)
_GSETPTR(Scumm::defaultScaleTable, GBVARS_DEFAULTSCALETABLE_INDEX, byte, GBVARS_SCUMM)
+_GSETPTR(Scumm::oldScaleTable, GBVARS_OLDSCALETABLE_INDEX, byte, GBVARS_SCUMM)
_GEND
_GRELEASE(Akos)
_GRELEASEPTR(GBVARS_DEFAULTSCALETABLE_INDEX, GBVARS_SCUMM)
+_GRELEASEPTR(GBVARS_OLDSCALETABLE_INDEX, GBVARS_SCUMM)
_GEND
#endif
diff --git a/scumm/object.cpp b/scumm/object.cpp
index c5b4a4bbb9..5b78bfe568 100644
--- a/scumm/object.cpp
+++ b/scumm/object.cpp
@@ -852,7 +852,7 @@ void ScummEngine::addObjectToDrawQue(int object) {
}
void ScummEngine::removeObjectFromDrawQue(int object) {
- if (_drawObjectQue <= 0)
+ if (_drawObjectQueNr <= 0)
return;
int i;