diff options
Diffstat (limited to 'engines')
| -rw-r--r-- | engines/sci/resource.h | 16 | ||||
| -rw-r--r-- | engines/sword2/memory.h | 4 |
2 files changed, 14 insertions, 6 deletions
diff --git a/engines/sci/resource.h b/engines/sci/resource.h index d7aa5d954b..c6ae2ed1ab 100644 --- a/engines/sci/resource.h +++ b/engines/sci/resource.h @@ -69,7 +69,9 @@ enum { /* the first critical error number */ }; -#define MAX_OPENED_VOLUMES 5 // Max number of simultaneously opened volumes +enum { + MAX_OPENED_VOLUMES = 5 // Max number of simultaneously opened volumes +}; enum ResSourceType { kSourceDirectory = 0, @@ -81,9 +83,11 @@ enum ResSourceType { kSourceExtAudioMap }; -#define SCI0_RESMAP_ENTRIES_SIZE 6 -#define SCI1_RESMAP_ENTRIES_SIZE 6 -#define SCI11_RESMAP_ENTRIES_SIZE 5 +enum { + SCI0_RESMAP_ENTRIES_SIZE = 6, + SCI1_RESMAP_ENTRIES_SIZE = 6, + SCI11_RESMAP_ENTRIES_SIZE = 5 +}; enum ResourceType { kResourceTypeView = 0, @@ -278,7 +282,9 @@ protected: // Note: maxMemory will not be interpreted as a hard limit, only as a restriction // for resources which are not explicitly locked. However, a warning will be // issued whenever this limit is exceeded. - #define MAX_MEMORY 256 * 1024 // 256KB + enum { + MAX_MEMORY = 256 * 1024 // 256KB + }; ViewType _viewType; // Used to determine if the game has EGA or VGA graphics Common::List<ResourceSource *> _sources; diff --git a/engines/sword2/memory.h b/engines/sword2/memory.h index f01b85f4b3..e00eacb032 100644 --- a/engines/sword2/memory.h +++ b/engines/sword2/memory.h @@ -28,7 +28,9 @@ #ifndef SWORD2_MEMORY_H #define SWORD2_MEMORY_H -#define MAX_MEMORY_BLOCKS 999 +enum { + MAX_MEMORY_BLOCKS = 999 +}; namespace Sword2 { |