aboutsummaryrefslogtreecommitdiff
path: root/engines/wage/world.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'engines/wage/world.cpp')
-rw-r--r--engines/wage/world.cpp16
1 files changed, 8 insertions, 8 deletions
diff --git a/engines/wage/world.cpp b/engines/wage/world.cpp
index 0e3850c930..db71b7ea85 100644
--- a/engines/wage/world.cpp
+++ b/engines/wage/world.cpp
@@ -24,7 +24,7 @@
*/
#include "wage/wage.h"
-#include "wage/macresman.h"
+#include "common/macresman.h"
#include "wage/entities.h"
#include "wage/script.h"
#include "wage/world.h"
@@ -39,11 +39,11 @@ World::World() {
_scenes[STORAGESCENE] = &_storageScene;
}
-bool World::loadWorld(MacResManager *resMan) {
+bool World::loadWorld(Common::MacResManager *resMan) {
int resSize;
- MacResIDArray resArray;
+ Common::MacResIDArray resArray;
byte *res;
- MacResIDArray::const_iterator iter;
+ Common::MacResIDArray::const_iterator iter;
if ((resArray = resMan->getResIDArray("GCOD")).size() == 0)
return false;
@@ -169,13 +169,13 @@ void World::loadExternalSounds(String fname) {
}
in.close();
- MacResManager *resMan;
- resMan = new MacResManager(fname);
+ Common::MacResManager *resMan;
+ resMan = new Common::MacResManager(fname);
int resSize;
- MacResIDArray resArray;
+ Common::MacResIDArray resArray;
byte *res;
- MacResIDArray::const_iterator iter;
+ Common::MacResIDArray::const_iterator iter;
resArray = resMan->getResIDArray("ASND");
for (iter = resArray.begin(); iter != resArray.end(); ++iter) {