diff options
| author | Strangerke | 2013-07-29 01:58:03 +0200 |
|---|---|---|
| committer | Strangerke | 2013-07-29 01:58:03 +0200 |
| commit | b50f0e2a0d657c64dedb5800912b9e6558e0529d (patch) | |
| tree | 24787ffdca1075a61256ebc4bbdd5263e062822c /engines/mortevielle/mortevielle.h | |
| parent | 1b2adafefa6512ce8f3d9b85b0d55a3c8fad4672 (diff) | |
| download | scummvm-rg350-b50f0e2a0d657c64dedb5800912b9e6558e0529d.tar.gz scummvm-rg350-b50f0e2a0d657c64dedb5800912b9e6558e0529d.tar.bz2 scummvm-rg350-b50f0e2a0d657c64dedb5800912b9e6558e0529d.zip | |
MORTEVIELLE: Remove remaining macros, start refactoring menus, modify the way _cfiphBuffer is read/written
Diffstat (limited to 'engines/mortevielle/mortevielle.h')
| -rw-r--r-- | engines/mortevielle/mortevielle.h | 20 |
1 files changed, 0 insertions, 20 deletions
diff --git a/engines/mortevielle/mortevielle.h b/engines/mortevielle/mortevielle.h index 6f5d4b4fac..4d07d3000f 100644 --- a/engines/mortevielle/mortevielle.h +++ b/engines/mortevielle/mortevielle.h @@ -65,12 +65,6 @@ namespace Mortevielle { */ const int kAdrMusic = 0x5000; -#define ord(v) ((int) v) -#define chr(v) ((unsigned char) v) -#define lo(v) ((v) & 0xff) -#define hi(v) (((v) >> 8) & 0xff) -#define swap(v) (((lo(v)) << 8) | ((hi(v)) >> 8)) - // Debug channels enum { kMortevielleCore = 1 << 0, @@ -137,20 +131,6 @@ const int kMenuSelfStringIndex = 497; const int kMenuSayStringIndex = 502; const int kMaxPatt = 20; -const int OPCODE_NONE = 0; -enum verbs {OPCODE_ATTACH = 0x301, OPCODE_WAIT = 0x302, OPCODE_FORCE = 0x303, OPCODE_SLEEP = 0x304, OPCODE_LISTEN = 0x305, - OPCODE_ENTER = 0x306, OPCODE_CLOSE = 0x307, OPCODE_SEARCH = 0x308, OPCODE_KNOCK = 0x309, OPCODE_SCRATCH = 0x30a, - OPCODE_READ = 0x30b, OPCODE_EAT = 0x30c, OPCODE_PLACE = 0x30d, OPCODE_OPEN = 0x30e, OPCODE_TAKE = 0x30f, - OPCODE_LOOK = 0x310, OPCODE_SMELL = 0x311, OPCODE_SOUND = 0x312, OPCODE_LEAVE = 0x313, OPCODE_LIFT = 0x314, - OPCODE_TURN = 0x315, OPCODE_SHIDE = 0x401, OPCODE_SSEARCH = 0x402, OPCODE_SREAD = 0x403, OPCODE_SPUT = 0x404, - OPCODE_SLOOK = 0x405}; - -static const int _actionMenu[12] = { OPCODE_NONE, - OPCODE_SHIDE, OPCODE_ATTACH, OPCODE_FORCE, OPCODE_SLEEP, - OPCODE_ENTER, OPCODE_CLOSE, OPCODE_KNOCK, OPCODE_EAT, - OPCODE_PLACE, OPCODE_OPEN, OPCODE_LEAVE -}; - /* 9 "A glance at the forbidden$", 18 "It's already open$", |