WITCHER: Rename 'script' directory to 'nwscript'

xoreos · Sep 10, 2016 · 325f1ee · 325f1ee
1 parent 471490b
commit 325f1ee
Show file tree

Hide file tree

Showing 17 changed files with 37 additions and 38 deletions.
diff --git a/src/engines/witcher/Makefile.am b/src/engines/witcher/Makefile.am
@@ -41,9 +41,9 @@ noinst_HEADERS = \
                  door.h \
                  placeable.h \
                  creature.h \
-                 script/container.h \
-                 script/functions.h \
-                 script/function_tables.h \
+                 nwscript/container.h \
+                 nwscript/functions.h \
+                 nwscript/function_tables.h \
                  lua/bindings.h \
                  $(EMPTY)
 
@@ -64,16 +64,16 @@ libwitcher_la_SOURCES = \
                         door.cpp \
                         placeable.cpp \
                         creature.cpp \
-                        script/container.cpp \
-                        script/functions.cpp \
-                        script/functions_math.cpp \
-                        script/functions_string.cpp \
-                        script/functions_module.cpp \
-                        script/functions_object.cpp \
-                        script/functions_situated.cpp \
-                        script/functions_creature.cpp \
-                        script/functions_action.cpp \
-                        script/functions_conversation.cpp \
-                        script/functions_sound.cpp \
+                        nwscript/container.cpp \
+                        nwscript/functions.cpp \
+                        nwscript/functions_math.cpp \
+                        nwscript/functions_string.cpp \
+                        nwscript/functions_module.cpp \
+                        nwscript/functions_object.cpp \
+                        nwscript/functions_situated.cpp \
+                        nwscript/functions_creature.cpp \
+                        nwscript/functions_action.cpp \
+                        nwscript/functions_conversation.cpp \
+                        nwscript/functions_sound.cpp \
                         lua/bindings.cpp \
                         $(EMPTY)
diff --git a/src/engines/witcher/game.cpp b/src/engines/witcher/game.cpp
@@ -42,7 +42,7 @@
 #include "src/engines/witcher/module.h"
 #include "src/engines/witcher/area.h"
 
-#include "src/engines/witcher/script/functions.h"
+#include "src/engines/witcher/nwscript/functions.h"
 
 #include "src/engines/witcher/lua/bindings.h"
 

diff --git a/src/engines/witcher/script/container.cpp → src/engines/witcher/nwscript/container.cpp b/src/engines/witcher/script/container.cpp → src/engines/witcher/nwscript/container.cpp
@@ -33,7 +33,7 @@
 #include "src/aurora/nwscript/variable.h"
 #include "src/aurora/nwscript/ncsfile.h"
 
-#include "src/engines/witcher/script/container.h"
+#include "src/engines/witcher/nwscript/container.h"
 
 namespace Engines {
 

diff --git a/src/engines/witcher/script/container.h → src/engines/witcher/nwscript/container.h b/src/engines/witcher/script/container.h → src/engines/witcher/nwscript/container.h
@@ -22,8 +22,8 @@
  *  An object containing scripts.
  */
 
-#ifndef ENGINES_WITCHER_SCRIPT_CONTAINER_H
-#define ENGINES_WITCHER_SCRIPT_CONTAINER_H
+#ifndef ENGINES_WITCHER_NWSCRIPT_CONTAINER_H
+#define ENGINES_WITCHER_NWSCRIPT_CONTAINER_H
 
 #include "src/common/types.h"
 #include "src/common/ustring.h"
@@ -76,4 +76,4 @@ class ScriptContainer {
 
 } // End of namespace Engines
 
-#endif // ENGINES_WITCHER_SCRIPT_CONTAINER_H
+#endif // ENGINES_WITCHER_NWSCRIPT_CONTAINER_H
diff --git a/src/engines/witcher/script/function_tables.h → ...ngines/witcher/nwscript/function_tables.h b/src/engines/witcher/script/function_tables.h → ...ngines/witcher/nwscript/function_tables.h
@@ -47,8 +47,8 @@
  * the order of the functions have to be the same in all three tables.
  */
 
-#ifndef ENGINES_WITCHER_SCRIPT_FUNCTION_TABLES_H
-#define ENGINES_WITCHER_SCRIPT_FUNCTION_TABLES_H
+#ifndef ENGINES_WITCHER_NWSCRIPT_FUNCTION_TABLES_H
+#define ENGINES_WITCHER_NWSCRIPT_FUNCTION_TABLES_H
 
 #include "src/engines/witcher/types.h"
 #include "src/engines/witcher/object.h"
@@ -2669,4 +2669,4 @@ const Functions::FunctionDefaults Functions::kFunctionDefaults[] = {
 
 } // End of namespace Engines
 
-#endif // ENGINES_WITCHER_SCRIPT_TABLES_H
+#endif // ENGINES_WITCHER_NWSCRIPT_FUNCTION_TABLES_H
diff --git a/src/engines/witcher/script/functions.cpp → src/engines/witcher/nwscript/functions.cpp b/src/engines/witcher/script/functions.cpp → src/engines/witcher/nwscript/functions.cpp
@@ -44,9 +44,8 @@
 #include "src/engines/witcher/object.h"
 #include "src/engines/witcher/creature.h"
 
-#include "src/engines/witcher/script/functions.h"
-
-#include "src/engines/witcher/script/function_tables.h"
+#include "src/engines/witcher/nwscript/functions.h"
+#include "src/engines/witcher/nwscript/function_tables.h"
 
 namespace Engines {
 

diff --git a/src/engines/witcher/script/functions.h → src/engines/witcher/nwscript/functions.h b/src/engines/witcher/script/functions.h → src/engines/witcher/nwscript/functions.h
@@ -22,8 +22,8 @@
  *  The Witcher engine functions.
  */
 
-#ifndef ENGINES_WITCHER_SCRIPT_FUNCTIONS_H
-#define ENGINES_WITCHER_SCRIPT_FUNCTIONS_H
+#ifndef ENGINES_WITCHER_NWSCRIPT_FUNCTIONS_H
+#define ENGINES_WITCHER_NWSCRIPT_FUNCTIONS_H
 
 #include "src/aurora/nwscript/types.h"
 
@@ -276,4 +276,4 @@ class Functions {
 
 } // End of namespace Engines
 
-#endif // ENGINES_WITCHER_SCRIPT_FUNCTIONS_H
+#endif // ENGINES_WITCHER_NWSCRIPT_FUNCTIONS_H
diff --git a/...gines/witcher/script/functions_action.cpp → ...nes/witcher/nwscript/functions_action.cpp b/...gines/witcher/script/functions_action.cpp → ...nes/witcher/nwscript/functions_action.cpp
@@ -38,7 +38,7 @@
 #include "src/engines/witcher/door.h"
 #include "src/engines/witcher/creature.h"
 
-#include "src/engines/witcher/script/functions.h"
+#include "src/engines/witcher/nwscript/functions.h"
 
 namespace Engines {
 

diff --git a/...witcher/script/functions_conversation.cpp → ...tcher/nwscript/functions_conversation.cpp b/...witcher/script/functions_conversation.cpp → ...tcher/nwscript/functions_conversation.cpp
@@ -33,7 +33,7 @@
 #include "src/engines/witcher/objectcontainer.h"
 #include "src/engines/witcher/object.h"
 
-#include "src/engines/witcher/script/functions.h"
+#include "src/engines/witcher/nwscript/functions.h"
 
 namespace Engines {
 

diff --git a/...nes/witcher/script/functions_creature.cpp → ...s/witcher/nwscript/functions_creature.cpp b/...nes/witcher/script/functions_creature.cpp → ...s/witcher/nwscript/functions_creature.cpp
@@ -31,7 +31,7 @@
 #include "src/engines/witcher/object.h"
 #include "src/engines/witcher/creature.h"
 
-#include "src/engines/witcher/script/functions.h"
+#include "src/engines/witcher/nwscript/functions.h"
 
 namespace Engines {
 

diff --git a/...engines/witcher/script/functions_math.cpp → ...gines/witcher/nwscript/functions_math.cpp b/...engines/witcher/script/functions_math.cpp → ...gines/witcher/nwscript/functions_math.cpp
@@ -27,7 +27,7 @@
 
 #include "src/aurora/nwscript/functioncontext.h"
 
-#include "src/engines/witcher/script/functions.h"
+#include "src/engines/witcher/nwscript/functions.h"
 
 namespace Engines {
 

diff --git a/...gines/witcher/script/functions_module.cpp → ...nes/witcher/nwscript/functions_module.cpp b/...gines/witcher/script/functions_module.cpp → ...nes/witcher/nwscript/functions_module.cpp
@@ -31,7 +31,7 @@
 #include "src/engines/witcher/location.h"
 #include "src/engines/witcher/objectcontainer.h"
 
-#include "src/engines/witcher/script/functions.h"
+#include "src/engines/witcher/nwscript/functions.h"
 
 namespace Engines {
 

diff --git a/...gines/witcher/script/functions_object.cpp → ...nes/witcher/nwscript/functions_object.cpp b/...gines/witcher/script/functions_object.cpp → ...nes/witcher/nwscript/functions_object.cpp
@@ -33,7 +33,7 @@
 #include "src/engines/witcher/object.h"
 #include "src/engines/witcher/creature.h"
 
-#include "src/engines/witcher/script/functions.h"
+#include "src/engines/witcher/nwscript/functions.h"
 
 namespace Engines {
 

diff --git a/...nes/witcher/script/functions_situated.cpp → ...s/witcher/nwscript/functions_situated.cpp b/...nes/witcher/script/functions_situated.cpp → ...s/witcher/nwscript/functions_situated.cpp
@@ -28,7 +28,7 @@
 #include "src/engines/witcher/object.h"
 #include "src/engines/witcher/situated.h"
 
-#include "src/engines/witcher/script/functions.h"
+#include "src/engines/witcher/nwscript/functions.h"
 
 namespace Engines {
 

diff --git a/...ngines/witcher/script/functions_sound.cpp → ...ines/witcher/nwscript/functions_sound.cpp b/...ngines/witcher/script/functions_sound.cpp → ...ines/witcher/nwscript/functions_sound.cpp
@@ -32,7 +32,7 @@
 #include "src/engines/witcher/object.h"
 #include "src/engines/witcher/area.h"
 
-#include "src/engines/witcher/script/functions.h"
+#include "src/engines/witcher/nwscript/functions.h"
 
 namespace Engines {
 

diff --git a/...gines/witcher/script/functions_string.cpp → ...nes/witcher/nwscript/functions_string.cpp b/...gines/witcher/script/functions_string.cpp → ...nes/witcher/nwscript/functions_string.cpp
@@ -41,7 +41,7 @@
 #include "src/engines/witcher/object.h"
 #include "src/engines/witcher/creature.h"
 
-#include "src/engines/witcher/script/functions.h"
+#include "src/engines/witcher/nwscript/functions.h"
 
 namespace Engines {
 

diff --git a/src/engines/witcher/object.h b/src/engines/witcher/object.h
@@ -39,7 +39,7 @@
 #include "src/engines/witcher/types.h"
 #include "src/engines/witcher/location.h"
 
-#include "src/engines/witcher/script/container.h"
+#include "src/engines/witcher/nwscript/container.h"
 
 namespace Engines {