diff options
| author | Willem Jan Palenstijn | 2016-07-21 13:30:47 +0200 |
|---|---|---|
| committer | Willem Jan Palenstijn | 2016-07-21 13:30:47 +0200 |
| commit | 6f001d831623a46f643379554d20e94463d8c2f1 (patch) | |
| tree | 901caa296592814b48a98ac2e3d381331c5a7821 /engines/wage/world.h | |
| parent | 75fdd1504de98c7c6937344877685bfef6514344 (diff) | |
| parent | 5f301b24002fffb3e8e05061a92ae2e0ee3a92ec (diff) | |
| download | scummvm-rg350-6f001d831623a46f643379554d20e94463d8c2f1.tar.gz scummvm-rg350-6f001d831623a46f643379554d20e94463d8c2f1.tar.bz2 scummvm-rg350-6f001d831623a46f643379554d20e94463d8c2f1.zip | |
Merge branch 'master' into titanic
Diffstat (limited to 'engines/wage/world.h')
| -rw-r--r-- | engines/wage/world.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/engines/wage/world.h b/engines/wage/world.h index e9041139df..468bedbc59 100644 --- a/engines/wage/world.h +++ b/engines/wage/world.h @@ -48,9 +48,9 @@ #ifndef WAGE_WORLD_H #define WAGE_WORLD_H -namespace Wage { +#include "wage/macwindowmanager.h" -#define STORAGESCENE "STORAGE@" +namespace Wage { class Sound; @@ -87,7 +87,7 @@ public: ObjArray _orderedObjs; ChrArray _orderedChrs; Common::Array<Sound *> _orderedSounds; - Patterns _patterns; + Patterns *_patterns; Scene *_storageScene; Chr *_player; //List<MoveListener> moveListeners; |