aboutsummaryrefslogtreecommitdiff
path: root/queen/logic.h
diff options
context:
space:
mode:
authorGregory Montoir2003-12-11 21:04:02 +0000
committerGregory Montoir2003-12-11 21:04:02 +0000
commit38c4321f5965c5872e2d4e73d0a9e6ec05a35a2e (patch)
tree33bc8901f1810f0a7686d268f417136586d6b5b5 /queen/logic.h
parent3080be97e0567efa78fbcbe8d2daa9906523eb8f (diff)
downloadscummvm-rg350-38c4321f5965c5872e2d4e73d0a9e6ec05a35a2e.tar.gz
scummvm-rg350-38c4321f5965c5872e2d4e73d0a9e6ec05a35a2e.tar.bz2
scummvm-rg350-38c4321f5965c5872e2d4e73d0a9e6ec05a35a2e.zip
cleanup
svn-id: r11588
Diffstat (limited to 'queen/logic.h')
-rw-r--r--queen/logic.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/queen/logic.h b/queen/logic.h
index 25c4f63e90..97110e6929 100644
--- a/queen/logic.h
+++ b/queen/logic.h
@@ -148,8 +148,6 @@ public:
const char *objectName(uint16 objNum) const { return _objName[objNum]; }
const char *objectTextualDescription(uint16 objNum) const { return _objDescription[objNum]; }
- uint16 numFrames() const { return _numFrames; }
-
void zoneSet(uint16 screen, uint16 zone, uint16 x1, uint16 y1, uint16 x2, uint16 y2);
void zoneSet(uint16 screen, uint16 zone, const Box& box);
uint16 zoneIn(uint16 screen, uint16 x, uint16 y) const;
@@ -171,15 +169,17 @@ public:
int16 entryObj() const { return _entryObj; }
void entryObj(int16 obj) { _entryObj = obj; }
+ uint16 numFrames() const { return _numFrames; }
+
void personSetData(int16 noun, const char *actorName, bool loadBank, Person *pp); // SET_PERSON_DATA
uint16 personSetup(uint16 noun, uint16 curImage); // SETUP_PERSON
uint16 personAllocate(uint16 noun, uint16 curImage); // ALLOCATE_PERSON
+ uint16 personFrames(uint16 bobNum) const { return _personFrames[bobNum]; }
uint16 animCreate(uint16 curImage, const Person *person); // CREATE_ANIM
void animErase(uint16 bobNum);
void animReset(uint16 bobNum);
void animSetup(const GraphicData *gd, uint16 firstImage, uint16 bobNum, bool visible); // FIND_GRAPHIC_ANIMS
- uint16 personFrames(uint16 bobNum) const { return _personFrames[bobNum]; }
void joeSetupFromBanks(const char *animBank, const char *standBank);