Moved all he-specific source files to engines/scumm/he/ subdirectory

svn-id: r20696

33 files changed, 64 insertions, 64 deletions

diff --git a/engines/scumm/actor.cpp b/engines/scumm/actor.cpp
index 686df5e42e..5bfd1d82e2 100644
--- a/engines/scumm/actor.cpp
+++ b/engines/scumm/actor.cpp
@@ -29,12 +29,12 @@
 #include "scumm/charset.h"
 #include "scumm/costume.h"
 #include "scumm/intern.h"
-#include "scumm/intern_he.h"
+#include "scumm/he/intern_he.h"
 #include "scumm/object.h"
 #include "scumm/resource.h"
 #include "scumm/saveload.h"
 #include "scumm/sound.h"
-#include "scumm/sprite_he.h"
+#include "scumm/he/sprite_he.h"
 #include "scumm/usage_bits.h"
 #include "scumm/util.h"
 
diff --git a/engines/scumm/akos.cpp b/engines/scumm/akos.cpp
index d8f484f1d3..858e722579 100644
--- a/engines/scumm/akos.cpp
+++ b/engines/scumm/akos.cpp
@@ -29,10 +29,10 @@
 #include "scumm/imuse.h"
 #include "scumm/imuse_digi/dimuse.h"
 #include "scumm/intern.h"
-#include "scumm/intern_he.h"
+#include "scumm/he/intern_he.h"
 #include "scumm/sound.h"
 #include "scumm/util.h"
-#include "scumm/wiz_he.h"
+#include "scumm/he/wiz_he.h"
 
 namespace Scumm {
 
diff --git a/engines/scumm/charset.cpp b/engines/scumm/charset.cpp
index e8086ed30a..3eca87d110 100644
--- a/engines/scumm/charset.cpp
+++ b/engines/scumm/charset.cpp
@@ -24,7 +24,7 @@
 #include "scumm/scumm.h"
 #include "scumm/nut_renderer.h"
 #include "scumm/util.h"
-#include "scumm/wiz_he.h"
+#include "scumm/he/wiz_he.h"
 
 namespace Scumm {
 
diff --git a/engines/scumm/cursor.cpp b/engines/scumm/cursor.cpp
index 6fee33e79b..0be6a48c53 100644
--- a/engines/scumm/cursor.cpp
+++ b/engines/scumm/cursor.cpp
@@ -26,9 +26,9 @@
 #include "scumm/bomp.h"
 #include "scumm/charset.h"
 #include "scumm/intern.h"
-#include "scumm/intern_he.h"
+#include "scumm/he/intern_he.h"
 #include "scumm/object.h"
-#include "scumm/resource_v7he.h"
+#include "scumm/he/resource_v7he.h"
 #include "scumm/saveload.h"
 #include "scumm/scumm.h"
 
diff --git a/engines/scumm/gfx.cpp b/engines/scumm/gfx.cpp
index 6746c7088e..8831491c14 100644
--- a/engines/scumm/gfx.cpp
+++ b/engines/scumm/gfx.cpp
@@ -27,11 +27,11 @@
 #include "scumm/charset.h"
 #include "scumm/intern.h"
 #ifndef DISABLE_HE
-#include "scumm/intern_he.h"
+#include "scumm/he/intern_he.h"
 #endif
 #include "scumm/resource.h"
 #include "scumm/usage_bits.h"
-#include "scumm/wiz_he.h"
+#include "scumm/he/wiz_he.h"
 
 namespace Scumm {
 
diff --git a/engines/scumm/floodfill_he.cpp b/engines/scumm/he/floodfill_he.cpp
index c7df765606..3736cb4d36 100644
--- a/engines/scumm/floodfill_he.cpp
+++ b/engines/scumm/he/floodfill_he.cpp
@@ -23,8 +23,8 @@
 
 #include "common/stdafx.h"
 
-#include "scumm/floodfill_he.h"
-#include "scumm/intern_he.h"
+#include "scumm/he/floodfill_he.h"
+#include "scumm/he/intern_he.h"
 #include "scumm/resource.h"
 #include "scumm/scumm.h"
 
diff --git a/engines/scumm/floodfill_he.h b/engines/scumm/he/floodfill_he.h
index 7d0fa7073f..7d0fa7073f 100644
--- a/engines/scumm/floodfill_he.h
+++ b/engines/scumm/he/floodfill_he.h
diff --git a/engines/scumm/intern_he.h b/engines/scumm/he/intern_he.h
index 7a4917b8c9..da14983e21 100644
--- a/engines/scumm/intern_he.h
+++ b/engines/scumm/he/intern_he.h
@@ -26,8 +26,8 @@
 
 #include "scumm/intern.h"
 #ifndef DISABLE_HE
-#include "scumm/floodfill_he.h"
-#include "scumm/wiz_he.h"
+#include "scumm/he/floodfill_he.h"
+#include "scumm/he/wiz_he.h"
 #endif
 
 namespace Scumm {
diff --git a/engines/scumm/logic_he.cpp b/engines/scumm/he/logic_he.cpp
index 401a41def5..eb9e4edf07 100644
--- a/engines/scumm/logic_he.cpp
+++ b/engines/scumm/he/logic_he.cpp
@@ -22,8 +22,8 @@
 
 #include "common/stdafx.h"
 
-#include "scumm/intern_he.h"
-#include "scumm/logic_he.h"
+#include "scumm/he/intern_he.h"
+#include "scumm/he/logic_he.h"
 
 namespace Scumm {
 
diff --git a/engines/scumm/logic_he.h b/engines/scumm/he/logic_he.h
index 59476f2e3b..59476f2e3b 100644
--- a/engines/scumm/logic_he.h
+++ b/engines/scumm/he/logic_he.h
diff --git a/engines/scumm/palette_he.cpp b/engines/scumm/he/palette_he.cpp
index 2d6a471d79..85df92cdb7 100644
--- a/engines/scumm/palette_he.cpp
+++ b/engines/scumm/he/palette_he.cpp
@@ -23,7 +23,7 @@
 #include "common/stdafx.h"
 #include "common/system.h"
 #include "scumm/scumm.h"
-#include "scumm/intern_he.h"
+#include "scumm/he/intern_he.h"
 #include "scumm/resource.h"
 #include "scumm/util.h"
 
diff --git a/engines/scumm/resource_v7he.cpp b/engines/scumm/he/resource_v7he.cpp
index 6ce8446a9a..95c3c23f2b 100644
--- a/engines/scumm/resource_v7he.cpp
+++ b/engines/scumm/he/resource_v7he.cpp
@@ -26,9 +26,9 @@
 
 #include "common/stdafx.h"
 #include "scumm/scumm.h"
-#include "scumm/intern_he.h"
+#include "scumm/he/intern_he.h"
 #include "scumm/resource.h"
-#include "scumm/resource_v7he.h"
+#include "scumm/he/resource_v7he.h"
 #include "scumm/sound.h"
 #include "scumm/util.h"
 #include "sound/wave.h"
diff --git a/engines/scumm/resource_v7he.h b/engines/scumm/he/resource_v7he.h
index 1496aa3d7f..1496aa3d7f 100644
--- a/engines/scumm/resource_v7he.h
+++ b/engines/scumm/he/resource_v7he.h
diff --git a/engines/scumm/script_v100he.cpp b/engines/scumm/he/script_v100he.cpp
index 6be750b03e..c9bfeade67 100644
--- a/engines/scumm/script_v100he.cpp
+++ b/engines/scumm/he/script_v100he.cpp
@@ -27,13 +27,13 @@
 
 #include "scumm/actor.h"
 #include "scumm/charset.h"
-#include "scumm/intern_he.h"
+#include "scumm/he/intern_he.h"
 #include "scumm/object.h"
 #include "scumm/resource.h"
-#include "scumm/resource_v7he.h"
+#include "scumm/he/resource_v7he.h"
 #include "scumm/scumm.h"
 #include "scumm/sound.h"
-#include "scumm/sprite_he.h"
+#include "scumm/he/sprite_he.h"
 #include "scumm/util.h"
 
 namespace Scumm {
diff --git a/engines/scumm/script_v6he.cpp b/engines/scumm/he/script_v6he.cpp
index 5c08a7e336..9d7de59450 100644
--- a/engines/scumm/script_v6he.cpp
+++ b/engines/scumm/he/script_v6he.cpp
@@ -27,7 +27,7 @@
 #include "scumm/actor.h"
 #include "scumm/charset.h"
 #include "scumm/imuse.h"
-#include "scumm/intern_he.h"
+#include "scumm/he/intern_he.h"
 #include "scumm/object.h"
 #include "scumm/resource.h"
 #include "scumm/scumm.h"
diff --git a/engines/scumm/script_v72he.cpp b/engines/scumm/he/script_v72he.cpp
index 3cd85042a3..b94cc06b40 100644
--- a/engines/scumm/script_v72he.cpp
+++ b/engines/scumm/he/script_v72he.cpp
@@ -29,10 +29,10 @@
 
 #include "scumm/actor.h"
 #include "scumm/charset.h"
-#include "scumm/intern_he.h"
+#include "scumm/he/intern_he.h"
 #include "scumm/object.h"
 #include "scumm/resource.h"
-#include "scumm/resource_v7he.h"
+#include "scumm/he/resource_v7he.h"
 #include "scumm/scumm.h"
 #include "scumm/sound.h"
 #include "scumm/util.h"
diff --git a/engines/scumm/script_v7he.cpp b/engines/scumm/he/script_v7he.cpp
index bae2654dae..400e7c0ad0 100644
--- a/engines/scumm/script_v7he.cpp
+++ b/engines/scumm/he/script_v7he.cpp
@@ -28,10 +28,10 @@
 
 #include "scumm/actor.h"
 #include "scumm/charset.h"
-#include "scumm/intern_he.h"
+#include "scumm/he/intern_he.h"
 #include "scumm/object.h"
 #include "scumm/resource.h"
-#include "scumm/resource_v7he.h"
+#include "scumm/he/resource_v7he.h"
 #include "scumm/scumm.h"
 #include "scumm/sound.h"
 #include "scumm/verbs.h"
diff --git a/engines/scumm/script_v80he.cpp b/engines/scumm/he/script_v80he.cpp
index 02c3f403d9..f82aebe050 100644
--- a/engines/scumm/script_v80he.cpp
+++ b/engines/scumm/he/script_v80he.cpp
@@ -29,10 +29,10 @@
 
 #include "scumm/actor.h"
 #include "scumm/charset.h"
-#include "scumm/intern_he.h"
+#include "scumm/he/intern_he.h"
 #include "scumm/object.h"
 #include "scumm/resource.h"
-#include "scumm/resource_v7he.h"
+#include "scumm/he/resource_v7he.h"
 #include "scumm/scumm.h"
 #include "scumm/sound.h"
 #include "scumm/util.h"
diff --git a/engines/scumm/script_v90he.cpp b/engines/scumm/he/script_v90he.cpp
index 89b3463837..899bce8036 100644
--- a/engines/scumm/script_v90he.cpp
+++ b/engines/scumm/he/script_v90he.cpp
@@ -25,14 +25,14 @@
 
 #include "scumm/actor.h"
 #include "scumm/charset.h"
-#include "scumm/intern_he.h"
-#include "scumm/logic_he.h"
+#include "scumm/he/intern_he.h"
+#include "scumm/he/logic_he.h"
 #include "scumm/object.h"
 #include "scumm/resource.h"
-#include "scumm/resource_v7he.h"
+#include "scumm/he/resource_v7he.h"
 #include "scumm/scumm.h"
 #include "scumm/sound.h"
-#include "scumm/sprite_he.h"
+#include "scumm/he/sprite_he.h"
 #include "scumm/util.h"
 
 namespace Scumm {
diff --git a/engines/scumm/sound_he.cpp b/engines/scumm/he/sound_he.cpp
index 879e34a99e..879e34a99e 100644
--- a/engines/scumm/sound_he.cpp
+++ b/engines/scumm/he/sound_he.cpp
diff --git a/engines/scumm/sprite_he.cpp b/engines/scumm/he/sprite_he.cpp
index a6065eb7be..7de5f0742a 100644
--- a/engines/scumm/sprite_he.cpp
+++ b/engines/scumm/he/sprite_he.cpp
@@ -23,14 +23,14 @@
 
 #include "common/stdafx.h"
 
-#include "scumm/intern_he.h"
+#include "scumm/he/intern_he.h"
 #include "scumm/resource.h"
 #include "scumm/saveload.h"
 #include "scumm/scumm.h"
-#include "scumm/sprite_he.h"
+#include "scumm/he/sprite_he.h"
 #include "scumm/usage_bits.h"
 #include "scumm/util.h"
-#include "scumm/wiz_he.h"
+#include "scumm/he/wiz_he.h"
 
 namespace Scumm {
 
diff --git a/engines/scumm/sprite_he.h b/engines/scumm/he/sprite_he.h
index 5396c1fed4..5396c1fed4 100644
--- a/engines/scumm/sprite_he.h
+++ b/engines/scumm/he/sprite_he.h
diff --git a/engines/scumm/wiz_he.cpp b/engines/scumm/he/wiz_he.cpp
index 9b0f9c3f15..1d3baa74d2 100644
--- a/engines/scumm/wiz_he.cpp
+++ b/engines/scumm/he/wiz_he.cpp
@@ -23,10 +23,10 @@
 
 #include "common/stdafx.h"
 
-#include "scumm/intern_he.h"
+#include "scumm/he/intern_he.h"
 #include "scumm/resource.h"
 #include "scumm/scumm.h"
-#include "scumm/wiz_he.h"
+#include "scumm/he/wiz_he.h"
 
 namespace Scumm {
 
diff --git a/engines/scumm/wiz_he.h b/engines/scumm/he/wiz_he.h
index 86d3e97721..86d3e97721 100644
--- a/engines/scumm/wiz_he.h
+++ b/engines/scumm/he/wiz_he.h
diff --git a/engines/scumm/input.cpp b/engines/scumm/input.cpp
index ad890604c4..7073bd596f 100644
--- a/engines/scumm/input.cpp
+++ b/engines/scumm/input.cpp
@@ -34,9 +34,9 @@
 #include "scumm/insane/insane.h"
 #include "scumm/imuse.h"
 #ifndef DISABLE_HE
-#include "scumm/intern_he.h"
+#include "scumm/he/intern_he.h"
+#include "scumm/he/logic_he.h"
 #endif
-#include "scumm/logic_he.h"
 #include "scumm/scumm.h"
 #include "scumm/sound.h"
 
diff --git a/engines/scumm/module.mk b/engines/scumm/module.mk
index fa56739dde..0e90736329 100644
--- a/engines/scumm/module.mk
+++ b/engines/scumm/module.mk
@@ -39,10 +39,10 @@ MODULE_OBJS := \
 	script_v2.o \
 	script_v5.o \
 	script_v6.o \
-	script_v6he.o \
+	he/script_v6he.o \
 	scumm.o \
 	sound.o \
-	sound_he.o \
+	he/sound_he.o \
 	string.o \
 	usage_bits.o \
 	util.o \
@@ -80,17 +80,17 @@ endif
 
 ifndef DISABLE_HE
 MODULE_OBJS += \
-	floodfill_he.o \
-	logic_he.o \
-	palette_he.o \
-	resource_v7he.o \
-	script_v7he.o \
-	script_v72he.o \
-	script_v80he.o \
-	script_v90he.o \
-	script_v100he.o \
-	sprite_he.o \
-	wiz_he.o
+	he/floodfill_he.o \
+	he/logic_he.o \
+	he/palette_he.o \
+	he/resource_v7he.o \
+	he/script_v7he.o \
+	he/script_v72he.o \
+	he/script_v80he.o \
+	he/script_v90he.o \
+	he/script_v100he.o \
+	he/sprite_he.o \
+	he/wiz_he.o
 endif
 
 MODULE_DIRS += \
diff --git a/engines/scumm/object.cpp b/engines/scumm/object.cpp
index 0472edcc15..7f09a69b72 100644
--- a/engines/scumm/object.cpp
+++ b/engines/scumm/object.cpp
@@ -27,7 +27,7 @@
 #include "scumm/bomp.h"
 #include "scumm/intern.h"
 #ifndef DISABLE_HE
-#include "scumm/intern_he.h"
+#include "scumm/he/intern_he.h"
 #endif
 #include "scumm/object.h"
 #include "scumm/resource.h"
diff --git a/engines/scumm/resource.cpp b/engines/scumm/resource.cpp
index e1601ca991..c916183b9e 100644
--- a/engines/scumm/resource.cpp
+++ b/engines/scumm/resource.cpp
@@ -30,7 +30,7 @@
 #include "scumm/imuse_digi/dimuse.h"
 #include "scumm/intern.h"
 #ifndef DISABLE_HE
-#include "scumm/intern_he.h"
+#include "scumm/he/intern_he.h"
 #endif
 #include "scumm/object.h"
 #include "scumm/resource.h"
diff --git a/engines/scumm/room.cpp b/engines/scumm/room.cpp
index e53b13c663..d5734e6334 100644
--- a/engines/scumm/room.cpp
+++ b/engines/scumm/room.cpp
@@ -27,7 +27,7 @@
 #include "scumm/boxes.h"
 #include "scumm/intern.h"
 #ifndef DISABLE_HE
-#include "scumm/intern_he.h"
+#include "scumm/he/intern_he.h"
 #endif
 #include "scumm/object.h"
 #include "scumm/resource.h"
diff --git a/engines/scumm/saveload.cpp b/engines/scumm/saveload.cpp
index 9dca7abd40..57acfac3aa 100644
--- a/engines/scumm/saveload.cpp
+++ b/engines/scumm/saveload.cpp
@@ -32,13 +32,13 @@
 #include "scumm/imuse_digi/dimuse.h"
 #include "scumm/imuse.h"
 #include "scumm/intern.h"
-#include "scumm/intern_he.h"
+#include "scumm/he/intern_he.h"
 #include "scumm/object.h"
 #include "scumm/resource.h"
 #include "scumm/saveload.h"
 #include "scumm/scumm.h"
 #include "scumm/sound.h"
-#include "scumm/sprite_he.h"
+#include "scumm/he/sprite_he.h"
 #include "scumm/verbs.h"
 
 #include "sound/audiocd.h"
diff --git a/engines/scumm/scumm.cpp b/engines/scumm/scumm.cpp
index 11bfc096c4..3f9d1ea877 100644
--- a/engines/scumm/scumm.cpp
+++ b/engines/scumm/scumm.cpp
@@ -44,17 +44,17 @@
 #include "scumm/imuse_digi/dimuse.h"
 #include "scumm/insane/insane.h"
 #include "scumm/intern.h"
-#include "scumm/intern_he.h"
-#include "scumm/logic_he.h"
+#include "scumm/he/intern_he.h"
+#include "scumm/he/logic_he.h"
 #include "scumm/player_nes.h"
 #include "scumm/player_v1.h"
 #include "scumm/player_v2.h"
 #include "scumm/player_v2a.h"
 #include "scumm/player_v3a.h"
-#include "scumm/resource_v7he.h"
+#include "scumm/he/resource_v7he.h"
 #include "scumm/scumm.h"
 #include "scumm/sound.h"
-#include "scumm/sprite_he.h"
+#include "scumm/he/sprite_he.h"
 #include "scumm/util.h"
 
 #ifdef PALMOS_68K
diff --git a/engines/scumm/string.cpp b/engines/scumm/string.cpp
index c32413542d..be530f8c81 100644
--- a/engines/scumm/string.cpp
+++ b/engines/scumm/string.cpp
@@ -32,7 +32,7 @@
 #include "scumm/imuse_digi/dimuse.h"
 #include "scumm/intern.h"
 #ifndef DISABLE_HE
-#include "scumm/intern_he.h"
+#include "scumm/he/intern_he.h"
 #endif
 #include "scumm/verbs.h"
 #include "scumm/sound.h"
diff --git a/engines/scumm/vars.cpp b/engines/scumm/vars.cpp
index 1cdc446637..d1622072ca 100644
--- a/engines/scumm/vars.cpp
+++ b/engines/scumm/vars.cpp
@@ -26,9 +26,9 @@
 #include "scumm/scumm.h"
 #include "scumm/intern.h"
 #ifndef DISABLE_HE
-#include "scumm/intern_he.h"
+#include "scumm/he/intern_he.h"
 #endif
-#include "scumm/logic_he.h"
+#include "scumm/he/logic_he.h"
 #include "sound/mididrv.h"
 
 namespace Scumm {