aboutsummaryrefslogtreecommitdiff
path: root/engines/tucker/tucker.h
diff options
context:
space:
mode:
authorAdrian Frühwirth2018-03-02 19:10:57 +0100
committerAdrian Frühwirth2018-03-02 19:41:45 +0100
commit5b89fd7dab3dfb5b4c30f12dde00aa203657cda6 (patch)
tree52fc160b287550efd72ff03cbc3fcdd8ec61ce07 /engines/tucker/tucker.h
parent7aee8f4e4298f2a7c440dc9ffba3eff4d3f25702 (diff)
downloadscummvm-rg350-5b89fd7dab3dfb5b4c30f12dde00aa203657cda6.tar.gz
scummvm-rg350-5b89fd7dab3dfb5b4c30f12dde00aa203657cda6.tar.bz2
scummvm-rg350-5b89fd7dab3dfb5b4c30f12dde00aa203657cda6.zip
Add PanelState, PanelStyle and PanelType enums
The new _panelState tells if the panel is currently in the process of being toggled between icon-style and text-style verbs and thus animated. The new _panelStyle tells wich verb-style the panel currently uses. The new _panelType tells which mode the panel currently is in: - verbs + inventory (normal) - empty (used for dialogs) - save, load, play, quit buttons - save/load savegame Also, switchPanelType() has been renamed to togglePanelStyle() and kInputKeyToggleInventory to kInputKeyTogglePanelStyle to better match the above changes. _switchPanelFlag has been dropped in favor of using the new _panelState. TODO: Store _panelStyle in savegames.
Diffstat (limited to 'engines/tucker/tucker.h')
-rw-r--r--engines/tucker/tucker.h28
1 files changed, 23 insertions, 5 deletions
diff --git a/engines/tucker/tucker.h b/engines/tucker/tucker.h
index 0a2f0a9a4c..03046f67de 100644
--- a/engines/tucker/tucker.h
+++ b/engines/tucker/tucker.h
@@ -68,6 +68,24 @@ enum CursorState {
kCursorStateDisabledHidden = 2
};
+enum PanelState {
+ kPanelStateNormal = 0,
+ kPanelStateShrinking = 1,
+ kPanelStateExpanding = 2
+};
+
+enum PanelStyle {
+ kPanelStyleVerbs = 0,
+ kPanelStyleIcons = 1
+};
+
+enum PanelType {
+ kPanelTypeNormal = 0,
+ kPanelTypeEmpty = 1,
+ kPanelTypeLoadSavePlayQuit = 2,
+ kPanelTypeLoadSaveSavegame = 3
+};
+
enum Verb {
kVerbWalk = 0,
kVerbLook = 1,
@@ -232,7 +250,7 @@ enum {
enum InputKey {
kInputKeyPause = 0,
kInputKeyEscape,
- kInputKeyToggleInventory,
+ kInputKeyTogglePanelStyle,
kInputKeyToggleTextSpeech,
kInputKeyHelp,
kInputKeyCount,
@@ -346,7 +364,7 @@ protected:
void updateSfxData3_2();
void saveOrLoad();
void handleMouseOnPanel();
- void switchPanelType();
+ void togglePanelStyle();
void redrawPanelOverBackground();
void drawConversationTexts();
void updateScreenScrolling();
@@ -715,11 +733,11 @@ protected:
CursorState _cursorState;
bool _updateCursorFlag;
- int _panelNum;
- int _panelState;
+ PanelStyle _panelStyle;
+ PanelState _panelState;
+ PanelType _panelType;
bool _forceRedrawPanelItems;
int _redrawPanelItemsCounter;
- int _switchPanelFlag;
int _panelObjectsOffsetTable[50];
int _switchPanelCounter;
int _conversationOptionsCount;