diff options
| author | Max Horn | 2005-04-20 23:53:29 +0000 |
|---|---|---|
| committer | Max Horn | 2005-04-20 23:53:29 +0000 |
| commit | 7b93b0e079456018fdbc59e780925103ee345ca9 (patch) | |
| tree | b173249f962fdb50948807960db638d2fb5cd7eb /scumm/scumm.h | |
| parent | bd5f93cece55bf5d75fa05d5623bed0da0cb3672 (diff) | |
| download | scummvm-rg350-7b93b0e079456018fdbc59e780925103ee345ca9.tar.gz scummvm-rg350-7b93b0e079456018fdbc59e780925103ee345ca9.tar.bz2 scummvm-rg350-7b93b0e079456018fdbc59e780925103ee345ca9.zip | |
Moved v2 verb code into class ScummEngine_v2
svn-id: r17725
Diffstat (limited to 'scumm/scumm.h')
| -rw-r--r-- | scumm/scumm.h | 12 |
1 files changed, 1 insertions, 11 deletions
diff --git a/scumm/scumm.h b/scumm/scumm.h index e7eb497e3d..2b135a0567 100644 --- a/scumm/scumm.h +++ b/scumm/scumm.h @@ -613,7 +613,7 @@ protected: void runScriptNested(int script); void executeScript(); void updateScriptPtr(); - void runInventoryScript(int i); + virtual void runInventoryScript(int i); void checkAndRunSentenceScript(); void runExitScript(); void runEntryScript(); @@ -788,7 +788,6 @@ protected: int getDistanceBetween(bool is_obj_1, int b, int c, bool is_obj_2, int e, int f); - protected: /* Should be in Verb class */ uint16 _verbMouseOver; @@ -808,15 +807,6 @@ protected: void killVerb(int slot); void setVerbObject(uint room, uint object, uint verb); - - // TODO: This should be moved into ScummEngine_v2 if possible - V2MouseoverBox v2_mouseover_boxes[7]; - int8 v2_mouseover_box; - - void checkV2MouseOver(Common::Point pos); - void checkV2Inventory(int x, int y); - void redrawV2Inventory(); - public: /* Should be in Actor class */ Actor *derefActor(int id, const char *errmsg = 0) const; |