aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--engines/supernova/console.cpp2
-rw-r--r--engines/supernova/game-manager.h2
-rw-r--r--engines/supernova/module.mk4
-rw-r--r--engines/supernova/room.cpp2
-rw-r--r--engines/supernova/screen.cpp2
-rw-r--r--engines/supernova/supernova.cpp2
-rw-r--r--engines/supernova/supernova.h2
-rw-r--r--engines/supernova/supernova1/rooms.cpp (renamed from engines/supernova/rooms.cpp)2
-rw-r--r--engines/supernova/supernova1/rooms.h (renamed from engines/supernova/rooms.h)0
-rw-r--r--engines/supernova/supernova1/state.cpp (renamed from engines/supernova/state.cpp)2
-rw-r--r--engines/supernova/supernova1/state.h (renamed from engines/supernova/state.h)2
11 files changed, 11 insertions, 11 deletions
diff --git a/engines/supernova/console.cpp b/engines/supernova/console.cpp
index 9e7c15ca77..39cbf7368f 100644
--- a/engines/supernova/console.cpp
+++ b/engines/supernova/console.cpp
@@ -23,7 +23,7 @@
#include "gui/debugger.h"
#include "supernova/supernova.h"
-#include "supernova/state.h"
+#include "supernova/game-manager.h"
#include "supernova/console.h"
namespace Supernova {
diff --git a/engines/supernova/game-manager.h b/engines/supernova/game-manager.h
index 585d9d2f82..26c7a9eba4 100644
--- a/engines/supernova/game-manager.h
+++ b/engines/supernova/game-manager.h
@@ -27,7 +27,7 @@
#include "common/rect.h"
#include "common/keyboard.h"
#include "common/error.h"
-#include "supernova/rooms.h"
+#include "supernova/room.h"
#include "supernova/sound.h"
namespace Supernova {
diff --git a/engines/supernova/module.mk b/engines/supernova/module.mk
index 3eb2259b38..2665af4848 100644
--- a/engines/supernova/module.mk
+++ b/engines/supernova/module.mk
@@ -6,11 +6,11 @@ MODULE_OBJS := \
graphics.o \
resman.o \
room.o \
- rooms.o \
+ supernova1/rooms.o \
screen.o \
sound.o \
game-manager.o \
- state.o \
+ supernova1/state.o \
supernova.o
MODULE_DIRS += \
diff --git a/engines/supernova/room.cpp b/engines/supernova/room.cpp
index 24e1aa567c..5ac00f1529 100644
--- a/engines/supernova/room.cpp
+++ b/engines/supernova/room.cpp
@@ -26,7 +26,7 @@
#include "supernova/screen.h"
#include "supernova/supernova.h"
-#include "supernova/state.h"
+#include "supernova/game-manager.h"
namespace Supernova {
diff --git a/engines/supernova/screen.cpp b/engines/supernova/screen.cpp
index 0240a7619e..5a89b40882 100644
--- a/engines/supernova/screen.cpp
+++ b/engines/supernova/screen.cpp
@@ -30,7 +30,7 @@
#include "supernova/imageid.h"
#include "supernova/resman.h"
-#include "supernova/state.h"
+#include "supernova/game-manager.h"
#include "supernova/screen.h"
#include "supernova/supernova.h"
diff --git a/engines/supernova/supernova.cpp b/engines/supernova/supernova.cpp
index 79d64cdf5d..9c7cdde545 100644
--- a/engines/supernova/supernova.cpp
+++ b/engines/supernova/supernova.cpp
@@ -45,7 +45,7 @@
#include "supernova/screen.h"
#include "supernova/sound.h"
#include "supernova/supernova.h"
-#include "supernova/state.h"
+#include "supernova/supernova1/state.h"
#include "supernova/game-manager.h"
namespace Supernova {
diff --git a/engines/supernova/supernova.h b/engines/supernova/supernova.h
index 9655d005bf..d50fe6a2e1 100644
--- a/engines/supernova/supernova.h
+++ b/engines/supernova/supernova.h
@@ -33,7 +33,7 @@
#include "supernova/console.h"
#include "supernova/graphics.h"
#include "supernova/msn_def.h"
-#include "supernova/rooms.h"
+#include "supernova/room.h"
#include "supernova/sound.h"
#include "supernova/imageid.h"
#include "supernova/game-manager.h"
diff --git a/engines/supernova/rooms.cpp b/engines/supernova/supernova1/rooms.cpp
index 04d8e8df98..4c5290308d 100644
--- a/engines/supernova/rooms.cpp
+++ b/engines/supernova/supernova1/rooms.cpp
@@ -26,7 +26,7 @@
#include "supernova/screen.h"
#include "supernova/supernova.h"
-#include "supernova/state.h"
+#include "supernova/supernova1/state.h"
namespace Supernova {
diff --git a/engines/supernova/rooms.h b/engines/supernova/supernova1/rooms.h
index c49e8356c9..c49e8356c9 100644
--- a/engines/supernova/rooms.h
+++ b/engines/supernova/supernova1/rooms.h
diff --git a/engines/supernova/state.cpp b/engines/supernova/supernova1/state.cpp
index 3e0ba6132a..fff5ad7993 100644
--- a/engines/supernova/state.cpp
+++ b/engines/supernova/supernova1/state.cpp
@@ -27,7 +27,7 @@
#include "supernova/screen.h"
#include "supernova/supernova.h"
-#include "supernova/state.h"
+#include "supernova/supernova1/state.h"
namespace Supernova {
diff --git a/engines/supernova/state.h b/engines/supernova/supernova1/state.h
index cb38c2ae1d..ba02b012a5 100644
--- a/engines/supernova/state.h
+++ b/engines/supernova/supernova1/state.h
@@ -27,7 +27,7 @@
#include "common/events.h"
#include "common/rect.h"
#include "common/keyboard.h"
-#include "supernova/rooms.h"
+#include "supernova/supernova1/rooms.h"
#include "supernova/room.h"
#include "supernova/sound.h"
#include "supernova/game-manager.h"