diff options
author | Paul Gilbert | 2018-01-28 12:15:32 -0500 |
---|---|---|
committer | Paul Gilbert | 2018-01-28 12:15:32 -0500 |
commit | 6f05085af3d0b720eca6a47e3407d38f842acb56 (patch) | |
tree | 0dd38d765dfb0231b43817c189bbadf89ab9d95d /engines/xeen/locations.h | |
parent | 319b2c29d5e68973917556798e86dd846c7d719c (diff) | |
download | scummvm-rg350-6f05085af3d0b720eca6a47e3407d38f842acb56.tar.gz scummvm-rg350-6f05085af3d0b720eca6a47e3407d38f842acb56.tar.bz2 scummvm-rg350-6f05085af3d0b720eca6a47e3407d38f842acb56.zip |
XEEN: Flesh out missing ErrorDialog code
Diffstat (limited to 'engines/xeen/locations.h')
-rw-r--r-- | engines/xeen/locations.h | 27 |
1 files changed, 16 insertions, 11 deletions
diff --git a/engines/xeen/locations.h b/engines/xeen/locations.h index 7331760d5b..2df4b9240d 100644 --- a/engines/xeen/locations.h +++ b/engines/xeen/locations.h @@ -62,11 +62,6 @@ protected: void drawWindow(); /** - * Waits for a brief pause, checking for any key or mouse events - */ - int wait(); - - /** * Generates the display text for the location, for a given character */ virtual Common::String createLocationText(Character &ch) { return ""; } @@ -98,6 +93,11 @@ public: * Draws the animated parts */ void drawAnim(bool flag); + + /** + * Waits for a brief pause, checking for any key or mouse events + */ + int wait(); }; class BankLocation : public BaseLocation { @@ -368,19 +368,24 @@ public: LocationManager(); /** - * Show a given location, and return any result - */ + * Show a given location, and return any result + */ int doAction(LocationAction actionId); /** - * Returns true if a town location (bank, blacksmith, etc.) is currently active - */ + * Returns true if a town location (bank, blacksmith, etc.) is currently active + */ bool isActive() const; /** - * Draws a currently active town location's animation - */ + * Draws a currently active town location's animation + */ void drawAnim(bool flag); + + /** + * Calls the waiting for any currently active town location + */ + int wait(); }; } // End of namespace Xeen |