aboutsummaryrefslogtreecommitdiff
path: root/scumm
diff options
context:
space:
mode:
Diffstat (limited to 'scumm')
-rw-r--r--scumm/base-costume.h2
-rw-r--r--scumm/bundle.cpp7
-rw-r--r--scumm/bundle.h4
-rw-r--r--scumm/imuse.h2
-rw-r--r--scumm/imuse_digi.h2
-rw-r--r--scumm/saveload.h2
-rw-r--r--scumm/sound.h2
7 files changed, 10 insertions, 11 deletions
diff --git a/scumm/base-costume.h b/scumm/base-costume.h
index 391b592439..bd20a07767 100644
--- a/scumm/base-costume.h
+++ b/scumm/base-costume.h
@@ -23,7 +23,7 @@
#ifndef BASE_COSTUME_H
#define BASE_COSTUME_H
-#include "scummsys.h"
+#include "common/scummsys.h"
#include "actor.h" // for CostumeData
#if !defined(__GNUC__)
diff --git a/scumm/bundle.cpp b/scumm/bundle.cpp
index 2f4ab2f487..329929a4a9 100644
--- a/scumm/bundle.cpp
+++ b/scumm/bundle.cpp
@@ -19,10 +19,9 @@
*/
#include "stdafx.h"
-#include "scumm.h"
-#include "scummsys.h"
-#include "bundle.h"
-#include "file.h"
+#include "common/scummsys.h"
+#include "scumm/scumm.h"
+#include "scumm/bundle.h"
static const int16 imcTable[] = {
0x0007, 0x0008, 0x0009, 0x000A, 0x000B, 0x000C, 0x000D, 0x000E, 0x0010, 0x0011,
diff --git a/scumm/bundle.h b/scumm/bundle.h
index 851e816c87..a94ce6fe17 100644
--- a/scumm/bundle.h
+++ b/scumm/bundle.h
@@ -21,8 +21,8 @@
#ifndef BUNDLE_H
#define BUNDLE_H
-#include "scummsys.h"
-#include "file.h"
+#include "common/scummsys.h"
+#include "common/file.h"
class Bundle {
diff --git a/scumm/imuse.h b/scumm/imuse.h
index ff3d809101..e436e0ab20 100644
--- a/scumm/imuse.h
+++ b/scumm/imuse.h
@@ -23,7 +23,7 @@
#ifndef IMUSE_H
#define IMUSE_H
-#include "scummsys.h"
+#include "common/scummsys.h"
#include "common/system.h"
class IMuseInternal;
diff --git a/scumm/imuse_digi.h b/scumm/imuse_digi.h
index 9c1bc431cc..1c4a854890 100644
--- a/scumm/imuse_digi.h
+++ b/scumm/imuse_digi.h
@@ -23,7 +23,7 @@
#ifndef IMUSE_DIGI_H
#define IMUSE_DIGI_H
-#include "scummsys.h"
+#include "common/scummsys.h"
#define MAX_DIGITAL_CHANNELS 8
#define MAX_IMUSE_JUMPS 1
diff --git a/scumm/saveload.h b/scumm/saveload.h
index 79de7528bd..722420b914 100644
--- a/scumm/saveload.h
+++ b/scumm/saveload.h
@@ -22,7 +22,7 @@
#ifndef SAVELOAD_H
#define SAVELOAD_H
-#include "scummsys.h"
+#include "common/scummsys.h"
// Support for "old" savegames (made with 2501 CVS build)
// Can be useful for other ports too :)
diff --git a/scumm/sound.h b/scumm/sound.h
index 8e9183659b..2cd1763233 100644
--- a/scumm/sound.h
+++ b/scumm/sound.h
@@ -21,7 +21,7 @@
#ifndef SOUND_H
#define SOUND_H
-#include "scummsys.h"
+#include "common/scummsys.h"
#include "sound/mixer.h"
class Bundle;