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

svn-id: r20696

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"
 

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 {
 

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 {
 

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"
 

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 {
 

engines/scumm/he/floodfill_he.cpp

@@ -23,8 +23,8 @@
 
 #include "common/stdafx.h"
 
-#include "scumm/floodfill_he.h"
+#include "scumm/he/floodfill_he.h"
-#include "scumm/intern_he.h"
+#include "scumm/he/intern_he.h"
 #include "scumm/resource.h"
 #include "scumm/scumm.h"
 

engines/scumm/he/intern_he.h

@@ -26,8 +26,8 @@
 
 #include "scumm/intern.h"
 #ifndef DISABLE_HE
-#include "scumm/floodfill_he.h"
+#include "scumm/he/floodfill_he.h"
-#include "scumm/wiz_he.h"
+#include "scumm/he/wiz_he.h"
 #endif
 
 namespace Scumm {

engines/scumm/he/logic_he.cpp

@@ -22,8 +22,8 @@
 
 #include "common/stdafx.h"
 
-#include "scumm/intern_he.h"
+#include "scumm/he/intern_he.h"
-#include "scumm/logic_he.h"
+#include "scumm/he/logic_he.h"
 
 namespace Scumm {
 

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"
 

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"

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 {

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"

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"

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"

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"

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/he/intern_he.h"
-#include "scumm/logic_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 {

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 {
 

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 {
 

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"
 

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 \
+	he/floodfill_he.o \
-	logic_he.o \
+	he/logic_he.o \
-	palette_he.o \
+	he/palette_he.o \
-	resource_v7he.o \
+	he/resource_v7he.o \
-	script_v7he.o \
+	he/script_v7he.o \
-	script_v72he.o \
+	he/script_v72he.o \
-	script_v80he.o \
+	he/script_v80he.o \
-	script_v90he.o \
+	he/script_v90he.o \
-	script_v100he.o \
+	he/script_v100he.o \
-	sprite_he.o \
+	he/sprite_he.o \
-	wiz_he.o
+	he/wiz_he.o
 endif
 
 MODULE_DIRS += \

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"

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"

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"

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"

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/he/intern_he.h"
-#include "scumm/logic_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

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"

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 {