ENGINES: Create initial base engine for KotOR games

xoreos · Feb 12, 2019 · b1fe3a6 · b1fe3a6
1 parent c9c6e96
commit b1fe3a6
Show file tree

Hide file tree

Showing 77 changed files with 523 additions and 1,060 deletions.
diff --git a/src/engines/kotor/action.h b/src/engines/kotor/action.h
@@ -25,7 +25,7 @@
 #ifndef ENGINES_KOTOR_ACTION_H
 #define ENGINES_KOTOR_ACTION_H
 
-#include "src/engines/kotor/types.h"
+#include "src/engines/kotorbase/types.h"
 
 namespace Engines {
 

diff --git a/src/engines/kotor/area.cpp b/src/engines/kotor/area.cpp
@@ -43,8 +43,9 @@
 #include "src/engines/aurora/util.h"
 #include "src/engines/aurora/localpathfinding.h"
 
+#include "src/engines/kotorbase/room.h"
+
 #include "src/engines/kotor/area.h"
-#include "src/engines/kotor/room.h"
 #include "src/engines/kotor/module.h"
 #include "src/engines/kotor/waypoint.h"
 #include "src/engines/kotor/placeable.h"

diff --git a/src/engines/kotor/area.h b/src/engines/kotor/area.h
@@ -42,7 +42,8 @@
 #include "src/events/types.h"
 #include "src/events/notifyable.h"
 
-#include "src/engines/kotor/object.h"
+#include "src/engines/kotorbase/object.h"
+
 #include "src/engines/kotor/trigger.h"
 
 namespace Engines {

diff --git a/src/engines/kotor/console.cpp b/src/engines/kotor/console.cpp
@@ -37,11 +37,12 @@
 
 #include "src/graphics/aurora/types.h"
 
+#include "src/engines/kotorbase/room.h"
+
 #include "src/engines/kotor/console.h"
 #include "src/engines/kotor/kotor.h"
 #include "src/engines/kotor/game.h"
 #include "src/engines/kotor/module.h"
-#include "src/engines/kotor/room.h"
 #include "src/engines/kotor/area.h"
 
 namespace Engines {

diff --git a/src/engines/kotor/creature.h b/src/engines/kotor/creature.h
@@ -34,7 +34,8 @@
 
 #include "src/graphics/aurora/types.h"
 
-#include "src/engines/kotor/object.h"
+#include "src/engines/kotorbase/object.h"
+
 #include "src/engines/kotor/inventory.h"
 #include "src/engines/kotor/action.h"
 

diff --git a/src/engines/kotor/gui/chargen/chargeninfo.h b/src/engines/kotor/gui/chargen/chargeninfo.h
@@ -30,7 +30,8 @@
 
 #include "src/graphics/aurora/model.h"
 
-#include "src/engines/kotor/types.h"
+#include "src/engines/kotorbase/types.h"
+
 #include "src/engines/kotor/creature.h"
 
 namespace Engines {

diff --git a/src/engines/kotor/item.h b/src/engines/kotor/item.h
@@ -25,7 +25,7 @@
 #ifndef ENGINES_KOTOR_ITEM_H
 #define ENGINES_KOTOR_ITEM_H
 
-#include "src/engines/kotor/object.h"
+#include "src/engines/kotorbase/object.h"
 
 namespace Engines {
 

diff --git a/src/engines/kotor/module.h b/src/engines/kotor/module.h
@@ -41,8 +41,9 @@
 
 #include "src/events/types.h"
 
+#include "src/engines/kotorbase/object.h"
+
 #include "src/engines/kotor/objectcontainer.h"
-#include "src/engines/kotor/object.h"
 #include "src/engines/kotor/savedgame.h"
 
 namespace Engines {

diff --git a/src/engines/kotor/objectcontainer.cpp b/src/engines/kotor/objectcontainer.cpp
@@ -25,8 +25,9 @@
 #include "src/common/types.h"
 #include "src/common/util.h"
 
+#include "src/engines/kotorbase/object.h"
+
 #include "src/engines/kotor/objectcontainer.h"
-#include "src/engines/kotor/object.h"
 #include "src/engines/kotor/module.h"
 #include "src/engines/kotor/area.h"
 #include "src/engines/kotor/waypoint.h"

diff --git a/src/engines/kotor/objectcontainer.h b/src/engines/kotor/objectcontainer.h
@@ -32,7 +32,7 @@
 
 #include "src/aurora/nwscript/objectcontainer.h"
 
-#include "src/engines/kotor/types.h"
+#include "src/engines/kotorbase/types.h"
 
 namespace Engines {
 

diff --git a/src/engines/kotor/pathfinding.cpp b/src/engines/kotor/pathfinding.cpp
@@ -27,8 +27,9 @@
 
 #include "src/engines/aurora/astar.h"
 
+#include "src/engines/kotorbase/room.h"
+
 #include "src/engines/kotor/walkmeshloader.h"
-#include "src/engines/kotor/room.h"
 #include "src/engines/kotor/pathfinding.h"
 
 namespace Engines {

diff --git a/src/engines/kotor/rules.mk b/src/engines/kotor/rules.mk
@@ -25,20 +25,17 @@ src_engines_kotor_libkotor_la_SOURCES =
 src_engines_kotor_libkotor_la_SOURCES += \
     src/engines/kotor/kotor.h \
     src/engines/kotor/probes.h \
-    src/engines/kotor/types.h \
     src/engines/kotor/console.h \
     src/engines/kotor/modelloader.h \
     src/engines/kotor/version.h \
     src/engines/kotor/game.h \
-    src/engines/kotor/object.h \
     src/engines/kotor/situated.h \
     src/engines/kotor/waypoint.h \
     src/engines/kotor/placeable.h \
     src/engines/kotor/door.h \
     src/engines/kotor/creature.h \
     src/engines/kotor/sound.h \
     src/engines/kotor/area.h \
-    src/engines/kotor/room.h \
     src/engines/kotor/objectcontainer.h \
     src/engines/kotor/module.h \
     src/engines/kotor/item.h \
@@ -61,15 +58,13 @@ src_engines_kotor_libkotor_la_SOURCES += \
     src/engines/kotor/modelloader.cpp \
     src/engines/kotor/version.cpp \
     src/engines/kotor/game.cpp \
-    src/engines/kotor/object.cpp \
     src/engines/kotor/waypoint.cpp \
     src/engines/kotor/situated.cpp \
     src/engines/kotor/placeable.cpp \
     src/engines/kotor/door.cpp \
     src/engines/kotor/creature.cpp \
     src/engines/kotor/sound.cpp \
     src/engines/kotor/area.cpp \
-    src/engines/kotor/room.cpp \
     src/engines/kotor/objectcontainer.cpp \
     src/engines/kotor/module.cpp \
     src/engines/kotor/item.cpp \

diff --git a/src/engines/kotor/script/function_tables.h b/src/engines/kotor/script/function_tables.h
@@ -50,8 +50,8 @@
 #ifndef ENGINES_KOTOR_SCRIPT_FUNCTION_TABLES_H
 #define ENGINES_KOTOR_SCRIPT_FUNCTION_TABLES_H
 
-#include "src/engines/kotor/types.h"
-#include "src/engines/kotor/object.h"
+#include "src/engines/kotorbase/types.h"
+#include "src/engines/kotorbase/object.h"
 
 namespace Engines {
 

diff --git a/src/engines/kotor/script/functions.cpp b/src/engines/kotor/script/functions.cpp
@@ -32,12 +32,13 @@
 #include "src/aurora/nwscript/functionman.h"
 #include "src/aurora/nwscript/util.h"
 
-#include "src/engines/kotor/types.h"
+#include "src/engines/kotorbase/types.h"
+#include "src/engines/kotorbase/object.h"
+
 #include "src/engines/kotor/game.h"
 #include "src/engines/kotor/module.h"
 #include "src/engines/kotor/area.h"
 #include "src/engines/kotor/objectcontainer.h"
-#include "src/engines/kotor/object.h"
 
 #include "src/engines/kotor/script/functions.h"
 

diff --git a/src/engines/kotor/script/functions_action.cpp b/src/engines/kotor/script/functions_action.cpp
@@ -28,7 +28,8 @@
 
 #include "src/aurora/nwscript/functioncontext.h"
 
-#include "src/engines/kotor/types.h"
+#include "src/engines/kotorbase/types.h"
+
 #include "src/engines/kotor/game.h"
 #include "src/engines/kotor/module.h"
 #include "src/engines/kotor/objectcontainer.h"

diff --git a/src/engines/kotor/script/functions_creatures.cpp b/src/engines/kotor/script/functions_creatures.cpp
@@ -26,7 +26,8 @@
 
 #include "src/aurora/nwscript/functioncontext.h"
 
-#include "src/engines/kotor/types.h"
+#include "src/engines/kotorbase/types.h"
+
 #include "src/engines/kotor/creature.h"
 #include "src/engines/kotor/objectcontainer.h"
 

diff --git a/src/engines/kotor/script/functions_object.cpp b/src/engines/kotor/script/functions_object.cpp
@@ -29,11 +29,12 @@
 
 #include "src/aurora/nwscript/functioncontext.h"
 
-#include "src/engines/kotor/types.h"
+#include "src/engines/kotorbase/types.h"
+#include "src/engines/kotorbase/object.h"
+
 #include "src/engines/kotor/game.h"
 #include "src/engines/kotor/module.h"
 #include "src/engines/kotor/objectcontainer.h"
-#include "src/engines/kotor/object.h"
 #include "src/engines/kotor/placeable.h"
 #include "src/engines/kotor/area.h"
 

diff --git a/src/engines/kotor/script/functions_party.cpp b/src/engines/kotor/script/functions_party.cpp
@@ -27,11 +27,12 @@
 
 #include "src/aurora/nwscript/functioncontext.h"
 
-#include "src/engines/kotor/types.h"
+#include "src/engines/kotorbase/types.h"
+#include "src/engines/kotorbase/object.h"
+
 #include "src/engines/kotor/game.h"
 #include "src/engines/kotor/module.h"
 #include "src/engines/kotor/objectcontainer.h"
-#include "src/engines/kotor/object.h"
 
 #include "src/engines/kotor/script/functions.h"
 

diff --git a/src/engines/kotor/script/functions_situated.cpp b/src/engines/kotor/script/functions_situated.cpp
@@ -24,8 +24,9 @@
 
 #include "src/aurora/nwscript/functioncontext.h"
 
+#include "src/engines/kotorbase/object.h"
+
 #include "src/engines/kotor/objectcontainer.h"
-#include "src/engines/kotor/object.h"
 #include "src/engines/kotor/situated.h"
 
 #include "src/engines/kotor/script/functions.h"

diff --git a/src/engines/kotor/script/functions_sound.cpp b/src/engines/kotor/script/functions_sound.cpp
@@ -24,8 +24,9 @@
 
 #include "src/aurora/nwscript/functioncontext.h"
 
+#include "src/engines/kotorbase/object.h"
+
 #include "src/engines/kotor/objectcontainer.h"
-#include "src/engines/kotor/object.h"
 #include "src/engines/kotor/area.h"
 #include "src/engines/kotor/sound.h"
 

diff --git a/src/engines/kotor/script/functions_string.cpp b/src/engines/kotor/script/functions_string.cpp
@@ -39,8 +39,9 @@
 
 #include "src/engines/aurora/tokenman.h"
 
+#include "src/engines/kotorbase/object.h"
+
 #include "src/engines/kotor/objectcontainer.h"
-#include "src/engines/kotor/object.h"
 #include "src/engines/kotor/creature.h"
 
 #include "src/engines/kotor/script/functions.h"

diff --git a/src/engines/kotor/script/rules.mk b/src/engines/kotor/script/rules.mk
@@ -20,14 +20,12 @@
 # Scripting system in Star Wars: Knights of the Old Republic.
 
 src_engines_kotor_libkotor_la_SOURCES += \
-    src/engines/kotor/script/container.h \
     src/engines/kotor/script/functions.h \
     src/engines/kotor/script/function_tables.h \
     src/engines/kotor/script/event.h \
     $(EMPTY)
 
 src_engines_kotor_libkotor_la_SOURCES += \
-    src/engines/kotor/script/container.cpp \
     src/engines/kotor/script/functions.cpp \
     src/engines/kotor/script/functions_math.cpp \
     src/engines/kotor/script/functions_string.cpp \

diff --git a/src/engines/kotor/situated.h b/src/engines/kotor/situated.h
@@ -33,7 +33,7 @@
 
 #include "src/graphics/aurora/types.h"
 
-#include "src/engines/kotor/object.h"
+#include "src/engines/kotorbase/object.h"
 
 namespace Engines {
 

diff --git a/src/engines/kotor/sound.h b/src/engines/kotor/sound.h
@@ -27,7 +27,7 @@
 
 #include "src/events/timerman.h"
 
-#include "src/engines/kotor/object.h"
+#include "src/engines/kotorbase/object.h"
 
 namespace Engines {
 

diff --git a/src/engines/kotor/trigger.h b/src/engines/kotor/trigger.h
@@ -27,7 +27,7 @@
 
 #include "src/engines/aurora/trigger.h"
 
-#include "src/engines/kotor/object.h"
+#include "src/engines/kotorbase/object.h"
 
 namespace Engines {
 

diff --git a/src/engines/kotor/waypoint.h b/src/engines/kotor/waypoint.h
@@ -30,8 +30,8 @@
 
 #include "src/aurora/types.h"
 
-#include "src/engines/kotor/types.h"
-#include "src/engines/kotor/object.h"
+#include "src/engines/kotorbase/types.h"
+#include "src/engines/kotorbase/object.h"
 
 namespace Engines {