aboutsummaryrefslogtreecommitdiff
path: root/kyra
diff options
context:
space:
mode:
authorTorbjörn Andersson2005-06-24 16:01:42 +0000
committerTorbjörn Andersson2005-06-24 16:01:42 +0000
commit35cb8fb875c7993725875a659907e1c61afc4c94 (patch)
tree7c97cbf65da3d4f1511eab2f82ab9ab2319cd584 /kyra
parent5f511510bc5058e7198e8972cf3809117135b42f (diff)
downloadscummvm-rg350-35cb8fb875c7993725875a659907e1c61afc4c94.tar.gz
scummvm-rg350-35cb8fb875c7993725875a659907e1c61afc4c94.tar.bz2
scummvm-rg350-35cb8fb875c7993725875a659907e1c61afc4c94.zip
For consistency, specify directory when including files.
svn-id: r18447
Diffstat (limited to 'kyra')
-rw-r--r--kyra/codecs.cpp2
-rw-r--r--kyra/cpsimage.cpp4
-rw-r--r--kyra/font.cpp2
-rw-r--r--kyra/kyra.cpp10
-rw-r--r--kyra/palette.cpp4
-rw-r--r--kyra/resource.cpp6
-rw-r--r--kyra/resource.h2
-rw-r--r--kyra/script.cpp6
-rw-r--r--kyra/script_v1.cpp4
-rw-r--r--kyra/sound.cpp4
-rw-r--r--kyra/sound.h2
-rw-r--r--kyra/wsamovie.cpp4
-rw-r--r--kyra/wsamovie.h2
13 files changed, 26 insertions, 26 deletions
diff --git a/kyra/codecs.cpp b/kyra/codecs.cpp
index 930b2e0866..a51e896802 100644
--- a/kyra/codecs.cpp
+++ b/kyra/codecs.cpp
@@ -20,7 +20,7 @@
*/
#include "common/stdafx.h"
-#include "codecs.h"
+#include "kyra/codecs.h"
/*****************************************************************************
* decode.c - Decoding routines for format80, format40, format20
diff --git a/kyra/cpsimage.cpp b/kyra/cpsimage.cpp
index 51f1d8332b..18d8e04293 100644
--- a/kyra/cpsimage.cpp
+++ b/kyra/cpsimage.cpp
@@ -20,8 +20,8 @@
*/
#include "common/stdafx.h"
-#include "resource.h"
-#include "codecs.h"
+#include "kyra/resource.h"
+#include "kyra/codecs.h"
#include "common/stream.h"
diff --git a/kyra/font.cpp b/kyra/font.cpp
index 08c9282206..669030b3b2 100644
--- a/kyra/font.cpp
+++ b/kyra/font.cpp
@@ -20,7 +20,7 @@
*/
#include "common/stdafx.h"
-#include "resource.h"
+#include "kyra/resource.h"
#include "common/stream.h"
#include "common/array.h"
diff --git a/kyra/kyra.cpp b/kyra/kyra.cpp
index 685bc02cf2..e9d1bf8574 100644
--- a/kyra/kyra.cpp
+++ b/kyra/kyra.cpp
@@ -31,11 +31,11 @@
#include "common/config-manager.h"
#include "sound/mididrv.h"
-#include "kyra.h"
-#include "resource.h"
-#include "script.h"
-#include "wsamovie.h"
-#include "sound.h"
+#include "kyra/kyra.h"
+#include "kyra/resource.h"
+#include "kyra/script.h"
+#include "kyra/wsamovie.h"
+#include "kyra/sound.h"
struct KyraGameSettings {
const char *name;
diff --git a/kyra/palette.cpp b/kyra/palette.cpp
index 4e1c4b7d72..9136666634 100644
--- a/kyra/palette.cpp
+++ b/kyra/palette.cpp
@@ -20,10 +20,10 @@
*/
#include "common/stdafx.h"
-#include "resource.h"
+#include "kyra/resource.h"
#include "common/stream.h"
-#include "codecs.h"
+#include "kyra/codecs.h"
namespace Kyra {
diff --git a/kyra/resource.cpp b/kyra/resource.cpp
index 1717114498..1f37d3ec49 100644
--- a/kyra/resource.cpp
+++ b/kyra/resource.cpp
@@ -20,11 +20,11 @@
*/
#include "common/stdafx.h"
-#include "resource.h"
-#include "wsamovie.h"
+#include "kyra/resource.h"
+#include "kyra/wsamovie.h"
#include "common/file.h"
-#include "script.h"
+#include "kyra/script.h"
namespace Kyra {
Resourcemanager::Resourcemanager(KyraEngine* engine) {
diff --git a/kyra/resource.h b/kyra/resource.h
index 67275e1dbc..6db1d6bc42 100644
--- a/kyra/resource.h
+++ b/kyra/resource.h
@@ -28,7 +28,7 @@
#include "common/list.h"
#include "common/map.h"
-#include "kyra.h"
+#include "kyra/kyra.h"
namespace Kyra {
diff --git a/kyra/script.cpp b/kyra/script.cpp
index 41436ec978..810a805c9c 100644
--- a/kyra/script.cpp
+++ b/kyra/script.cpp
@@ -20,9 +20,9 @@
*/
#include "common/stdafx.h"
-#include "kyra.h"
-#include "script.h"
-#include "resource.h"
+#include "kyra/kyra.h"
+#include "kyra/script.h"
+#include "kyra/resource.h"
#include "common/stream.h"
#include "common/util.h"
diff --git a/kyra/script_v1.cpp b/kyra/script_v1.cpp
index 801463c60b..5d6124e65f 100644
--- a/kyra/script_v1.cpp
+++ b/kyra/script_v1.cpp
@@ -21,8 +21,8 @@
#include "common/stdafx.h"
-#include "kyra.h"
-#include "script.h"
+#include "kyra/kyra.h"
+#include "kyra/script.h"
namespace Kyra {
// Command procs
diff --git a/kyra/sound.cpp b/kyra/sound.cpp
index f6beeb24c5..f4454c0297 100644
--- a/kyra/sound.cpp
+++ b/kyra/sound.cpp
@@ -19,8 +19,8 @@
*
*/
-#include "sound.h"
-#include "resource.h"
+#include "kyra/sound.h"
+#include "kyra/resource.h"
namespace Kyra {
MusicPlayer::MusicPlayer(MidiDriver* driver, KyraEngine* engine) {
diff --git a/kyra/sound.h b/kyra/sound.h
index c0db6eed70..edb1aaf68a 100644
--- a/kyra/sound.h
+++ b/kyra/sound.h
@@ -26,7 +26,7 @@
#include "common/scummsys.h"
#include "sound/mididrv.h"
#include "sound/midiparser.h"
-#include "kyra.h"
+#include "kyra/kyra.h"
namespace Kyra {
class MusicPlayer : public MidiDriver {
diff --git a/kyra/wsamovie.cpp b/kyra/wsamovie.cpp
index ce70ea994c..b605513a92 100644
--- a/kyra/wsamovie.cpp
+++ b/kyra/wsamovie.cpp
@@ -20,8 +20,8 @@
*/
#include "common/stdafx.h"
-#include "wsamovie.h"
-#include "codecs.h"
+#include "kyra/wsamovie.h"
+#include "kyra/codecs.h"
#include "common/stream.h"
diff --git a/kyra/wsamovie.h b/kyra/wsamovie.h
index b728dcb51f..34737773a7 100644
--- a/kyra/wsamovie.h
+++ b/kyra/wsamovie.h
@@ -22,7 +22,7 @@
#ifndef WSAMOVIES_H
#define WSAMOVIES_H
-#include "resource.h"
+#include "kyra/resource.h"
namespace Kyra {