aboutsummaryrefslogtreecommitdiff
path: root/scumm/scumm.h
diff options
context:
space:
mode:
authorMax Horn2002-12-26 21:50:13 +0000
committerMax Horn2002-12-26 21:50:13 +0000
commitad7fefd34eb81ab473293c4072432b36608d93aa (patch)
treee510c3c891268394cf1659241bf8e079be017c98 /scumm/scumm.h
parent966d435a19930ae357b333d731f6b70e91b5a351 (diff)
downloadscummvm-rg350-ad7fefd34eb81ab473293c4072432b36608d93aa.tar.gz
scummvm-rg350-ad7fefd34eb81ab473293c4072432b36608d93aa.tar.bz2
scummvm-rg350-ad7fefd34eb81ab473293c4072432b36608d93aa.zip
map V8 talk opcodes to the right V6 opcodes; however, talking still locks up after the first sentence is uttered (looking into that now); various cleanup; added a guess at VAR_EGO (based on what cmidec says is the 'default_actor')
svn-id: r6176
Diffstat (limited to 'scumm/scumm.h')
-rw-r--r--scumm/scumm.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/scumm/scumm.h b/scumm/scumm.h
index fd84740f36..50ee8aff45 100644
--- a/scumm/scumm.h
+++ b/scumm/scumm.h
@@ -510,7 +510,7 @@ public:
bool isResourceLoaded(int type, int index);
void initRoomSubBlocks();
void loadRoomObjects();
- void loadRoomObjectsSmall();
+ void loadRoomObjectsSmall();
void readArrayFromIndexFile();
void readMAXS();
bool isGlobInMemory(int type, int index);
@@ -783,7 +783,7 @@ public:
BlastObject _enqueuedObjects[128];
void enqueueObject(int objectNumber, int objectX, int objectY, int objectWidth,
- int objectHeight, int scaleX, int scaleY, int image, int mode);
+ int objectHeight, int scaleX, int scaleY, int image, int mode);
void clearEnqueue() { _enqueuePos = 0; }
void drawBlastObjects();
void drawBlastObject(BlastObject *eo);