diff options
| author | Max Horn | 2005-04-23 16:09:22 +0000 |
|---|---|---|
| committer | Max Horn | 2005-04-23 16:09:22 +0000 |
| commit | b43e1e960fadff6b900329ec96c32121406cb92b (patch) | |
| tree | d9d2662e27b9402996447b7f214d0797e5e5e1e2 | |
| parent | 06a313f0a8290fc943a4748b3e79734f5a4faf28 (diff) | |
| download | scummvm-rg350-b43e1e960fadff6b900329ec96c32121406cb92b.tar.gz scummvm-rg350-b43e1e960fadff6b900329ec96c32121406cb92b.tar.bz2 scummvm-rg350-b43e1e960fadff6b900329ec96c32121406cb92b.zip | |
Map is only needed in intern.h
svn-id: r17776
| -rw-r--r-- | scumm/intern.h | 4 | ||||
| -rw-r--r-- | scumm/scumm.h | 3 |
2 files changed, 4 insertions, 3 deletions
diff --git a/scumm/intern.h b/scumm/intern.h index f991e92ca9..f934c6ada0 100644 --- a/scumm/intern.h +++ b/scumm/intern.h @@ -23,6 +23,8 @@ #ifndef INTERN_H #define INTERN_H +#include "common/map.h" + #include "scumm/scumm.h" #include "scumm/wiz_he.h" @@ -1262,6 +1264,8 @@ protected: const OpcodeEntryV8 *_opcodesV8; + typedef Common::Map<Common::String, int> ObjectIDMap; + ObjectIDMap _objectIDMap; public: diff --git a/scumm/scumm.h b/scumm/scumm.h index 3054488600..895b1ff084 100644 --- a/scumm/scumm.h +++ b/scumm/scumm.h @@ -25,7 +25,6 @@ #include "base/engine.h" #include "common/file.h" -#include "common/map.h" #include "common/rect.h" #include "common/str.h" @@ -60,8 +59,6 @@ struct BoxCoords; struct FindObjectInRoom; struct ScummGameSettings; -typedef Common::Map<Common::String, int> ObjectIDMap; - // Use g_scumm from error() ONLY extern ScummEngine *g_scumm; |