diff options
author | johndoe123 | 2014-03-25 19:57:21 +0100 |
---|---|---|
committer | Eugene Sandulenko | 2018-07-20 06:43:33 +0000 |
commit | e05a7899755011f860f2b09ce6d5b4e0a15107b9 (patch) | |
tree | b16815bcf51d3b776e63563d04f9997cb4a4567f /engines/illusions/actor.h | |
parent | 28cb39eb2b48d8c6e80e35ef6e26e02cc209fc0f (diff) | |
download | scummvm-rg350-e05a7899755011f860f2b09ce6d5b4e0a15107b9.tar.gz scummvm-rg350-e05a7899755011f860f2b09ce6d5b4e0a15107b9.tar.bz2 scummvm-rg350-e05a7899755011f860f2b09ce6d5b4e0a15107b9.zip |
ILLUSIONS: More work on BBDOU specific code (cursor, bubble)
- Add input handling code
Diffstat (limited to 'engines/illusions/actor.h')
-rw-r--r-- | engines/illusions/actor.h | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/engines/illusions/actor.h b/engines/illusions/actor.h index fe5564e0a7..9ddfc9cf16 100644 --- a/engines/illusions/actor.h +++ b/engines/illusions/actor.h @@ -134,7 +134,6 @@ public: int _pathCtrY; int _path40; - }; class Control { @@ -162,6 +161,7 @@ public: Common::Point calcPosition(Common::Point posDelta); uint32 getSubActorParent(); void getCollisionRectAccurate(Common::Rect &collisionRect); + void getCollisionRect(Common::Rect &collisionRect); void setActorUsePan(int usePan); void setActorFrameIndex(int16 frameIndex); void stopActor(); @@ -169,6 +169,8 @@ public: void stopSequenceActor(); void startTalkActor(uint32 sequenceId, byte *entryTblPtr, uint32 threadId); void sequenceActor(); + void setActorIndexTo1(); + void setActorIndexTo2(); public: IllusionsEngine *_vm; uint _flags; @@ -201,7 +203,8 @@ public: void destroyControlsByTag(uint32 tag); void pauseControlsByTag(uint32 tag); void unpauseControlsByTag(uint32 tag); - void actorControlRouine(Control *control, uint32 deltaTime); + bool getOverlappedObject(Control *control, Common::Point pt, Control **outOverlappedControl, int minPriority); + void actorControlRoutine(Control *control, uint32 deltaTime); public: typedef Common::List<Control*> Items; typedef Items::iterator ItemsIterator; |