SCUMM: Move all players to a separate "player" directory

There are 34 player .cpp/.h player files, so they have been placed in
their own directory, to logically separate them from the rest of the
engine

engines/scumm/module.mk

@@ -35,23 +35,23 @@ MODULE_OBJS := \
 	midiparser_ro.o \
 	object.o \
 	palette.o \
-	player_ad.o \
-	player_apple2.o \
-	player_mac.o \
-	player_mod.o \
-	player_nes.o \
-	player_pce.o \
-	player_sid.o \
-	player_towns.o \
-	player_v1.o \
-	player_v2.o \
-	player_v2a.o \
-	player_v2base.o \
-	player_v2cms.o \
-	player_v3a.o \
-	player_v3m.o \
-	player_v4a.o \
-	player_v5m.o \
+	player/ad.o \
+	player/apple2.o \
+	player/mac.o \
+	player/mod.o \
+	player/nes.o \
+	player/pce.o \
+	player/sid.o \
+	player/towns.o \
+	player/v1.o \
+	player/v2.o \
+	player/v2a.o \
+	player/v2base.o \
+	player/v2cms.o \
+	player/v3a.o \
+	player/v3m.o \
+	player/v4a.o \
+	player/v5m.o \
 	resource_v2.o \
 	resource_v3.o \
 	resource_v4.o \

engines/scumm/player/ad.cpp

@@ -20,7 +20,7 @@
  *
  */
 
-#include "scumm/player_ad.h"
+#include "scumm/player/ad.h"
 #include "scumm/imuse/imuse.h"
 #include "scumm/scumm.h"
 #include "scumm/resource.h"

engines/scumm/player/apple2.cpp

@@ -21,7 +21,7 @@
  */
 
 #include "engines/engine.h"
-#include "scumm/player_apple2.h"
+#include "scumm/player/apple2.h"
 #include "scumm/scumm.h"
 
 namespace Scumm {

engines/scumm/player/mac.cpp

@@ -24,7 +24,7 @@
 #include "common/translation.h"
 #include "engines/engine.h"
 #include "gui/message.h"
-#include "scumm/player_mac.h"
+#include "scumm/player/mac.h"
 #include "scumm/resource.h"
 #include "scumm/scumm.h"
 #include "scumm/imuse/imuse.h"

engines/scumm/player/mod.cpp

@@ -21,7 +21,7 @@
  */
 
 
-#include "scumm/player_mod.h"
+#include "scumm/player/mod.h"
 #include "audio/mixer.h"
 #include "audio/rate.h"
 #include "audio/decoders/raw.h"

engines/scumm/player/nes.cpp

@@ -23,7 +23,7 @@
 #ifndef DISABLE_NES_APU
 
 #include "engines/engine.h"
-#include "scumm/player_nes.h"
+#include "scumm/player/nes.h"
 #include "scumm/scumm.h"
 #include "audio/mixer.h"
 

engines/scumm/player/pce.cpp

@@ -29,7 +29,7 @@
  */
 
 #include <math.h>
-#include "player_pce.h"
+#include "scumm/player/pce.h"
 #include "common/endian.h"
 
 // PCE sound engine is only used by Loom, which requires 16bit color support

engines/scumm/player/sid.cpp

@@ -23,7 +23,7 @@
 #ifndef DISABLE_SID
 
 #include "engines/engine.h"
-#include "scumm/player_sid.h"
+#include "scumm/player/sid.h"
 #include "scumm/scumm.h"
 #include "audio/mixer.h"
 

engines/scumm/player/towns.cpp

@@ -22,7 +22,7 @@
 
 
 #include "scumm/sound.h"
-#include "scumm/player_towns.h"
+#include "scumm/player/towns.h"
 
 namespace Scumm {
 

engines/scumm/player/v1.cpp

@@ -22,7 +22,7 @@
 
 
 #include "engines/engine.h"
-#include "scumm/player_v1.h"
+#include "scumm/player/v1.h"
 #include "scumm/scumm.h"
 
 namespace Scumm {

engines/scumm/player/v1.h

@@ -23,7 +23,7 @@
 #ifndef SCUMM_PLAYER_V1_H
 #define SCUMM_PLAYER_V1_H
 
-#include "scumm/player_v2.h"
+#include "scumm/player/v2.h"
 
 namespace Scumm {
 

engines/scumm/player/v2.cpp

@@ -20,7 +20,7 @@
  *
  */
 
-#include "scumm/player_v2.h"
+#include "scumm/player/v2.h"
 #include "scumm/scumm.h"
 
 namespace Scumm {

engines/scumm/player/v2.h

@@ -23,7 +23,7 @@
 #ifndef SCUMM_PLAYER_V2_H
 #define SCUMM_PLAYER_V2_H
 
-#include "scumm/player_v2base.h"
+#include "scumm/player/v2base.h"
 
 namespace Scumm {
 

engines/scumm/player/v2a.cpp

@@ -21,7 +21,7 @@
  */
 
 #include "engines/engine.h"
-#include "scumm/player_v2a.h"
+#include "scumm/player/v2a.h"
 #include "scumm/scumm.h"
 
 namespace Scumm {

engines/scumm/player/v2a.h

@@ -25,7 +25,7 @@
 
 #include "common/scummsys.h"
 #include "scumm/music.h"
-#include "scumm/player_mod.h"
+#include "scumm/player/mod.h"
 
 class Mixer;
 

engines/scumm/player/v2base.cpp

@@ -20,7 +20,7 @@
  *
  */
 
-#include "scumm/player_v2base.h"
+#include "scumm/player/v2base.h"
 #include "scumm/scumm.h"
 
 #define FREQ_HZ 236 // Don't change!

engines/scumm/player/v2cms.cpp

@@ -20,7 +20,7 @@
  *
  */
 
-#include "scumm/player_v2cms.h"
+#include "scumm/player/v2cms.h"
 #include "scumm/scumm.h"
 #include "audio/mididrv.h"
 #include "audio/mixer.h"

engines/scumm/player/v2cms.h

@@ -23,7 +23,7 @@
 #ifndef SCUMM_PLAYER_V2CMS_H
 #define SCUMM_PLAYER_V2CMS_H
 
-#include "scumm/player_v2base.h"	// for channel_data
+#include "scumm/player/v2base.h"	// for channel_data
 
 class CMSEmulator;
 

engines/scumm/player/v3a.cpp

@@ -22,7 +22,7 @@
 
 
 #include "engines/engine.h"
-#include "scumm/player_v3a.h"
+#include "scumm/player/v3a.h"
 #include "scumm/scumm.h"
 
 namespace Scumm {

engines/scumm/player/v3a.h

@@ -25,7 +25,7 @@
 
 #include "common/scummsys.h"
 #include "scumm/music.h"
-#include "scumm/player_mod.h"
+#include "scumm/player/mod.h"
 
 class Mixer;
 

engines/scumm/player/v3m.cpp

@@ -91,7 +91,7 @@
 #include "common/translation.h"
 #include "engines/engine.h"
 #include "gui/message.h"
-#include "scumm/player_v3m.h"
+#include "scumm/player/v3m.h"
 #include "scumm/scumm.h"
 
 namespace Scumm {

engines/scumm/player/v3m.h

@@ -27,7 +27,7 @@
 #include "common/util.h"
 #include "common/mutex.h"
 #include "scumm/music.h"
-#include "scumm/player_mac.h"
+#include "scumm/player/mac.h"
 #include "audio/audiostream.h"
 #include "audio/mixer.h"
 

engines/scumm/player/v4a.cpp

@@ -21,7 +21,7 @@
  */
 
 #include "engines/engine.h"
-#include "scumm/player_v4a.h"
+#include "scumm/player/v4a.h"
 #include "scumm/scumm.h"
 
 #include "common/file.h"

engines/scumm/player/v5m.cpp

@@ -76,7 +76,7 @@
 #include "common/translation.h"
 #include "engines/engine.h"
 #include "gui/message.h"
-#include "scumm/player_v5m.h"
+#include "scumm/player/v5m.h"
 #include "scumm/scumm.h"
 
 namespace Scumm {

engines/scumm/player/v5m.h

@@ -27,7 +27,7 @@
 #include "common/util.h"
 #include "common/mutex.h"
 #include "scumm/music.h"
-#include "scumm/player_mac.h"
+#include "scumm/player/mac.h"
 #include "audio/audiostream.h"
 #include "audio/mixer.h"
 

engines/scumm/saveload.cpp

@@ -30,7 +30,7 @@
 #include "scumm/charset.h"
 #include "scumm/imuse_digi/dimuse.h"
 #include "scumm/imuse/imuse.h"
-#include "scumm/player_towns.h"
+#include "scumm/player/towns.h"
 #include "scumm/he/intern_he.h"
 #include "scumm/object.h"
 #include "scumm/resource.h"

engines/scumm/script_v5.cpp

@@ -27,7 +27,7 @@
 #include "scumm/scumm_v3.h"
 #include "scumm/scumm_v5.h"
 #include "scumm/sound.h"
-#include "scumm/player_towns.h"
+#include "scumm/player/towns.h"
 #include "scumm/util.h"
 #include "scumm/verbs.h"
 

engines/scumm/scumm.cpp

@@ -45,26 +45,26 @@
 #include "scumm/imuse_digi/dimuse.h"
 #include "scumm/smush/smush_mixer.h"
 #include "scumm/smush/smush_player.h"
-#include "scumm/player_towns.h"
+#include "scumm/player/towns.h"
 #include "scumm/insane/insane.h"
 #include "scumm/he/animation_he.h"
 #include "scumm/he/intern_he.h"
 #include "scumm/he/logic_he.h"
 #include "scumm/he/sound_he.h"
 #include "scumm/object.h"
-#include "scumm/player_ad.h"
-#include "scumm/player_nes.h"
-#include "scumm/player_sid.h"
-#include "scumm/player_pce.h"
-#include "scumm/player_apple2.h"
-#include "scumm/player_v1.h"
-#include "scumm/player_v2.h"
-#include "scumm/player_v2cms.h"
-#include "scumm/player_v2a.h"
-#include "scumm/player_v3a.h"
-#include "scumm/player_v3m.h"
-#include "scumm/player_v4a.h"
-#include "scumm/player_v5m.h"
+#include "scumm/player/ad.h"
+#include "scumm/player/nes.h"
+#include "scumm/player/sid.h"
+#include "scumm/player/pce.h"
+#include "scumm/player/apple2.h"
+#include "scumm/player/v1.h"
+#include "scumm/player/v2.h"
+#include "scumm/player/v2cms.h"
+#include "scumm/player/v2a.h"
+#include "scumm/player/v3a.h"
+#include "scumm/player/v3m.h"
+#include "scumm/player/v4a.h"
+#include "scumm/player/v5m.h"
 #include "scumm/resource.h"
 #include "scumm/he/resource_he.h"
 #include "scumm/scumm_v0.h"

engines/scumm/sound.cpp

@@ -30,7 +30,7 @@
 #include "scumm/file.h"
 #include "scumm/imuse/imuse.h"
 #include "scumm/imuse_digi/dimuse.h"
-#include "scumm/player_towns.h"
+#include "scumm/player/towns.h"
 #include "scumm/resource.h"
 #include "scumm/scumm.h"
 #include "scumm/sound.h"