diff options
Diffstat (limited to 'gui')
| -rw-r--r-- | gui/Actions.h | 11 | ||||
| -rw-r--r-- | gui/Key.h | 4 |
2 files changed, 9 insertions, 6 deletions
diff --git a/gui/Actions.h b/gui/Actions.h index 3e9bd4d8f8..5f90a2f864 100644 --- a/gui/Actions.h +++ b/gui/Actions.h @@ -20,16 +20,15 @@ * */ -#ifndef ACTIONS_H -#define ACTIONS_H +#ifndef GUI_ACTIONS_H +#define GUI_ACTIONS_H #include "common/stdafx.h" #include "common/scummsys.h" #include "common/system.h" #include "gui/Key.h" -namespace GUI { -#define MAX_ACTIONS 20 +namespace GUI { typedef int ActionType; @@ -69,6 +68,10 @@ protected: Actions(); protected: + enum { + MAX_ACTIONS = 20 + }; + static Actions* _instance; OSystem *_mainSystem; Key _key_action[MAX_ACTIONS + 1]; @@ -20,8 +20,8 @@ * */ -#ifndef KEY_H -#define KEY_H +#ifndef GUI_KEY_H +#define GUI_KEY_H #include "common/stdafx.h" #include "common/scummsys.h" |