aboutsummaryrefslogtreecommitdiff
path: root/gui/Actions.h
diff options
context:
space:
mode:
authorMax Horn2006-06-03 15:01:37 +0000
committerMax Horn2006-06-03 15:01:37 +0000
commitcb50b454e7e734309f6c6aee3e58b2a5a743c3bf (patch)
treeb73a4e84f449a25707d132e865bf9e76c608a7fb /gui/Actions.h
parente44e5d9be00771864f2c2760738478c64aab459b (diff)
downloadscummvm-rg350-cb50b454e7e734309f6c6aee3e58b2a5a743c3bf.tar.gz
scummvm-rg350-cb50b454e7e734309f6c6aee3e58b2a5a743c3bf.tar.bz2
scummvm-rg350-cb50b454e7e734309f6c6aee3e58b2a5a743c3bf.zip
Use full path in #include guard, to avoid name clashes; also, to declare constants, enum is preferred over #define (causes less hard-to-debug errors)
svn-id: r22885
Diffstat (limited to 'gui/Actions.h')
-rw-r--r--gui/Actions.h11
1 files changed, 7 insertions, 4 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];