ILLUSIONS: Move script opcode files to game specific directories

9 files changed, 14 insertions, 14 deletions

diff --git a/engines/illusions/bbdou/illusions_bbdou.cpp b/engines/illusions/bbdou/illusions_bbdou.cpp
index 21fa5d0564..339b61d3f8 100644
--- a/engines/illusions/bbdou/illusions_bbdou.cpp
+++ b/engines/illusions/bbdou/illusions_bbdou.cpp
@@ -37,7 +37,7 @@
 #include "illusions/screen.h"
 #include "illusions/screentext.h"
 #include "illusions/scriptstack.h"
-#include "illusions/scriptopcodes_bbdou.h"
+#include "illusions/bbdou/scriptopcodes_bbdou.h"
 #include "illusions/sound.h"
 #include "illusions/specialcode.h"
 #include "illusions/bbdou/bbdou_specialcode.h"
diff --git a/engines/illusions/scriptopcodes_bbdou.cpp b/engines/illusions/bbdou/scriptopcodes_bbdou.cpp
index 3e7241bb2c..2f1c705595 100644
--- a/engines/illusions/scriptopcodes_bbdou.cpp
+++ b/engines/illusions/bbdou/scriptopcodes_bbdou.cpp
@@ -21,7 +21,7 @@
  */
 
 #include "illusions/bbdou/illusions_bbdou.h"
-#include "illusions/scriptopcodes_bbdou.h"
+#include "illusions/bbdou/scriptopcodes_bbdou.h"
 #include "illusions/actor.h"
 #include "illusions/camera.h"
 #include "illusions/dictionary.h"
diff --git a/engines/illusions/scriptopcodes_bbdou.h b/engines/illusions/bbdou/scriptopcodes_bbdou.h
index b132011044..89f73dc227 100644
--- a/engines/illusions/scriptopcodes_bbdou.h
+++ b/engines/illusions/bbdou/scriptopcodes_bbdou.h
@@ -20,8 +20,8 @@
  *
  */
 
-#ifndef ILLUSIONS_SCRIPTOPCODES_BBDOU_H
-#define ILLUSIONS_SCRIPTOPCODES_BBDOU_H
+#ifndef ILLUSIONS_BBDOU_SCRIPTOPCODES_BBDOU_H
+#define ILLUSIONS_BBDOU_SCRIPTOPCODES_BBDOU_H
 
 #include "illusions/scriptopcodes.h"
 #include "common/func.h"
@@ -126,4 +126,4 @@ protected:
 
 } // End of namespace Illusions
 
-#endif // ILLUSIONS_SCRIPTOPCODES_BBDOU_H
+#endif // ILLUSIONS_BBDOU_SCRIPTOPCODES_BBDOU_H
diff --git a/engines/illusions/duckman/duckman_dialog.cpp b/engines/illusions/duckman/duckman_dialog.cpp
index b0b74df839..b30a2be7b9 100644
--- a/engines/illusions/duckman/duckman_dialog.cpp
+++ b/engines/illusions/duckman/duckman_dialog.cpp
@@ -22,6 +22,7 @@
 
 #include "illusions/duckman/illusions_duckman.h"
 #include "illusions/duckman/duckman_dialog.h"
+#include "illusions/duckman/scriptopcodes_duckman.h"
 #include "illusions/actor.h"
 #include "illusions/camera.h"
 #include "illusions/cursor.h"
@@ -38,7 +39,6 @@
 #include "illusions/resourcesystem.h"
 #include "illusions/screen.h"
 #include "illusions/screentext.h"
-#include "illusions/scriptopcodes_duckman.h"
 #include "illusions/scriptstack.h"
 #include "illusions/sound.h"
 #include "illusions/specialcode.h"
diff --git a/engines/illusions/duckman/duckman_specialcode.cpp b/engines/illusions/duckman/duckman_specialcode.cpp
index 6553631911..8d33aa77f1 100644
--- a/engines/illusions/duckman/duckman_specialcode.cpp
+++ b/engines/illusions/duckman/duckman_specialcode.cpp
@@ -24,9 +24,9 @@
 #include "illusions/duckman/duckman_specialcode.h"
 #include "illusions/duckman/duckman_inventory.h"
 #include "illusions/duckman/propertytimers.h"
+#include "illusions/duckman/scriptopcodes_duckman.h"
 #include "illusions/actor.h"
 #include "illusions/resources/scriptresource.h"
-#include "illusions/scriptopcodes_duckman.h"
 #include "illusions/specialcode.h"
 
 #include "engines/util.h"
diff --git a/engines/illusions/duckman/illusions_duckman.cpp b/engines/illusions/duckman/illusions_duckman.cpp
index 17c930b3df..52567f2c75 100644
--- a/engines/illusions/duckman/illusions_duckman.cpp
+++ b/engines/illusions/duckman/illusions_duckman.cpp
@@ -23,6 +23,7 @@
 #include "illusions/duckman/illusions_duckman.h"
 #include "illusions/duckman/duckman_dialog.h"
 #include "illusions/duckman/duckman_specialcode.h"
+#include "illusions/duckman/scriptopcodes_duckman.h"
 #include "illusions/actor.h"
 #include "illusions/camera.h"
 #include "illusions/cursor.h"
@@ -39,7 +40,6 @@
 #include "illusions/resourcesystem.h"
 #include "illusions/screen.h"
 #include "illusions/screentext.h"
-#include "illusions/scriptopcodes_duckman.h"
 #include "illusions/scriptstack.h"
 #include "illusions/sound.h"
 #include "illusions/specialcode.h"
diff --git a/engines/illusions/scriptopcodes_duckman.cpp b/engines/illusions/duckman/scriptopcodes_duckman.cpp
index fbc8656d3c..0e79774fd2 100644
--- a/engines/illusions/scriptopcodes_duckman.cpp
+++ b/engines/illusions/duckman/scriptopcodes_duckman.cpp
@@ -21,8 +21,8 @@
  */
 
 #include "illusions/duckman/illusions_duckman.h"
+#include "illusions/duckman/scriptopcodes_duckman.h"
 #include "illusions/duckman/duckman_dialog.h"
-#include "illusions/scriptopcodes_duckman.h"
 #include "illusions/actor.h"
 #include "illusions/camera.h"
 #include "illusions/dictionary.h"
diff --git a/engines/illusions/scriptopcodes_duckman.h b/engines/illusions/duckman/scriptopcodes_duckman.h
index f9f536e16c..abb9982e85 100644
--- a/engines/illusions/scriptopcodes_duckman.h
+++ b/engines/illusions/duckman/scriptopcodes_duckman.h
@@ -20,8 +20,8 @@
  *
  */
 
-#ifndef ILLUSIONS_SCRIPTOPCODES_DUCKMAN_H
-#define ILLUSIONS_SCRIPTOPCODES_DUCKMAN_H
+#ifndef ILLUSIONS_DUCKMAN_SCRIPTOPCODES_DUCKMAN_H
+#define ILLUSIONS_DUCKMAN_SCRIPTOPCODES_DUCKMAN_H
 
 #include "illusions/scriptopcodes.h"
 #include "common/func.h"
@@ -150,4 +150,4 @@ protected:
 
 } // End of namespace Illusions
 
-#endif // ILLUSIONS_SCRIPTOPCODES_DUCKMAN_H
+#endif // ILLUSIONS_DUCKMAN_SCRIPTOPCODES_DUCKMAN_H
diff --git a/engines/illusions/module.mk b/engines/illusions/module.mk
index f8d32785cc..0a01f7f877 100644
--- a/engines/illusions/module.mk
+++ b/engines/illusions/module.mk
@@ -7,6 +7,7 @@ MODULE_OBJS := \
 	bbdou/bbdou_inventory.o \
 	bbdou/bbdou_specialcode.o \
 	bbdou/illusions_bbdou.o \
+	bbdou/scriptopcodes_bbdou.o \
 	camera.o \
 	cursor.o \
 	detection.o \
@@ -16,6 +17,7 @@ MODULE_OBJS := \
 	duckman/duckman_specialcode.o \
 	duckman/illusions_duckman.o \
 	duckman/propertytimers.o \
+	duckman/scriptopcodes_duckman.o \
 	fixedpoint.o \
 	graphics.o \
 	illusions.o \
@@ -33,8 +35,6 @@ MODULE_OBJS := \
 	screentext.o \
 	scriptstack.o \
 	scriptopcodes.o \
-	scriptopcodes_bbdou.o \
-	scriptopcodes_duckman.o \
 	sequenceopcodes.o \
 	sound.o \
 	specialcode.o \