diff options
author | Eugene Sandulenko | 2005-01-07 00:57:43 +0000 |
---|---|---|
committer | Eugene Sandulenko | 2005-01-07 00:57:43 +0000 |
commit | 1fe593995d98939c0d2e2dc2d6c6e11b647e1ca0 (patch) | |
tree | 01bb948cbcbbaf729cb167ad407c4f4f5c1d9bd2 /saga/interface.h | |
parent | d5d801b01c2990f8e07e42abebd9ccbf33d39407 (diff) | |
download | scummvm-rg350-1fe593995d98939c0d2e2dc2d6c6e11b647e1ca0.tar.gz scummvm-rg350-1fe593995d98939c0d2e2dc2d6c6e11b647e1ca0.tar.bz2 scummvm-rg350-1fe593995d98939c0d2e2dc2d6c6e11b647e1ca0.zip |
o Fix for popped up actors at initial scene fade out
o Stub for new Wyrmkeep demos with substituted scenes
o Converted some script func parameters to apropriate types
o More panel fixes
svn-id: r16472
Diffstat (limited to 'saga/interface.h')
-rw-r--r-- | saga/interface.h | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/saga/interface.h b/saga/interface.h index f827191fa8..8939566bf6 100644 --- a/saga/interface.h +++ b/saga/interface.h @@ -113,7 +113,8 @@ enum PANEL_MODES { kPanelProtect, kPanelPlacard, kPanelMap, - kPanelInventory + kPanelInventory, + kPanelFade }; enum BUTTON_FLAGS { @@ -208,10 +209,10 @@ public: int registerLang(); int activate(); int deactivate(); - int setMode(int mode); + int setMode(int mode, bool force = false); int getMode(void) { return _panelMode; } - void rememberMode() { _savedMode = _panelMode; } - void restoreMode() { _panelMode = _savedMode; } + void rememberMode(); + void restoreMode(); void lockMode() { _lockedMode = _panelMode; } void unlockMode() { _panelMode = _lockedMode; } bool isInMainMode() { return _inMainMode; } @@ -239,7 +240,7 @@ private: SagaEngine *_vm; bool _initialized; - int _active; + bool _active; RSCFILE_CONTEXT *_interfaceContext; INTERFACE_DESC _iDesc; int _panelMode; |