diff options
| author | Gregory Montoir | 2003-12-02 16:49:56 +0000 |
|---|---|---|
| committer | Gregory Montoir | 2003-12-02 16:49:56 +0000 |
| commit | 25921847885051963adb4f0f1c81e9f7dfd52def (patch) | |
| tree | e4f8e9becef5b902c1ad8a066b2bf5e83bba5540 /queen/command.h | |
| parent | 4f418c3aa99e8ccea3273300073a9dfecb21ca7f (diff) | |
| download | scummvm-rg350-25921847885051963adb4f0f1c81e9f7dfd52def.tar.gz scummvm-rg350-25921847885051963adb4f0f1c81e9f7dfd52def.tar.bz2 scummvm-rg350-25921847885051963adb4f0f1c81e9f7dfd52def.zip | |
- some Command code refactoring (removed unused code, splitted some methods)
- game is now playable up to floda basement (at least)
svn-id: r11477
Diffstat (limited to 'queen/command.h')
| -rw-r--r-- | queen/command.h | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/queen/command.h b/queen/command.h index 0b7f29e61a..24d24a5175 100644 --- a/queen/command.h +++ b/queen/command.h @@ -66,7 +66,6 @@ struct CurrentCmdState { Verb action; int16 oldNoun; int16 noun; - //! current level of the command (max=2 for GIVE and USE verbs) int commandLevel; int16 subject1; int16 subject2; @@ -77,7 +76,6 @@ struct SelectedCmdState { void init(); - //! locked verb (using 2nd mouse button) Verb defaultVerb; Verb action; int16 noun; @@ -108,8 +106,11 @@ public: MAX_MATCHING_CMDS = 50 }; + private: + void executeCommand(uint16 comId, int16 condResult); + int16 makeJoeWalkTo(int16 x, int16 y, int16 objNum, const Verb &v, bool mustWalk); void grabCurrentSelection(); @@ -121,7 +122,7 @@ private: bool executeIfCutaway(const char *description); bool executeIfDialog(const char *description); - bool handleBadCommand(bool walk); + bool handleDefaultCommand(bool walk); void executeStandardStuff(const Verb& action, int16 subj1, int16 subj2); void changeObjectState(const Verb& action, int16 obj, int16 song, bool cutDone); void cleanupCurrentAction(); |