libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-01-31 07:53:36 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

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)

Browse Source 
svn-id: r22885
This commit is contained in:
Max Horn 2006-06-03 15:01:37 +00:00
parent e44e5d9be0
commit cb50b454e7
2 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
gui/Actions.h
View File

@ -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];

4
gui/Key.h
View File

@ -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"