diff --git a/Scripting/Scripting.vcxproj b/Scripting/Scripting.vcxproj index b415e7e42..8b197a3ea 100644 --- a/Scripting/Scripting.vcxproj +++ b/Scripting/Scripting.vcxproj @@ -83,12 +83,12 @@ - + @@ -123,6 +123,7 @@ + @@ -133,7 +134,6 @@ - diff --git a/Scripting/Scripting.vcxproj.filters b/Scripting/Scripting.vcxproj.filters index 93fcf0b87..ebe0effa2 100644 --- a/Scripting/Scripting.vcxproj.filters +++ b/Scripting/Scripting.vcxproj.filters @@ -177,9 +177,6 @@ Header Files - - Header Files - Header Files @@ -279,14 +276,14 @@ Header Files + + Header Files + Source Files - - Source Files - Source Files @@ -359,6 +356,9 @@ Source Files + + Source Files + diff --git a/Scripting/src/Logic/LogicHandler.cpp b/Scripting/src/Logic/LogicHandler.cpp index d0870279b..98d05fc3d 100644 --- a/Scripting/src/Logic/LogicHandler.cpp +++ b/Scripting/src/Logic/LogicHandler.cpp @@ -13,7 +13,6 @@ #include "Game/effects/effects.h" #include "Game/pickup/pickup.h" #include "Game/gui.h" -#include "GameScriptFreeFunctions.h" #include "ReservedScriptNames.h" #include "Game/camera.h" #include diff --git a/Scripting/src/Misc/Misc.cpp b/Scripting/src/Misc/Misc.cpp index 76562644e..ccbae3d16 100644 --- a/Scripting/src/Misc/Misc.cpp +++ b/Scripting/src/Misc/Misc.cpp @@ -17,7 +17,7 @@ Scripts that will be run on game startup. using namespace TEN::Effects::Lightning; -namespace GameScriptFreeFunctions { +namespace Misc { static int FindRoomNumber(Position pos) { return 0; diff --git a/Scripting/src/Misc/Misc.h b/Scripting/src/Misc/Misc.h index d2c30c9e7..e3dea513f 100644 --- a/Scripting/src/Misc/Misc.h +++ b/Scripting/src/Misc/Misc.h @@ -3,6 +3,6 @@ namespace sol { class state; }; -namespace GameScriptFreeFunctions { +namespace Misc { void Register(sol::state* lua, sol::table &); }; diff --git a/Scripting/src/ScriptInterfaceState.cpp b/Scripting/src/ScriptInterfaceState.cpp index 1be9f635b..4d0bb9602 100644 --- a/Scripting/src/ScriptInterfaceState.cpp +++ b/Scripting/src/ScriptInterfaceState.cpp @@ -6,7 +6,7 @@ #include "Strings/StringsHandler.h" #include "Inventory/InventoryHandler.h" #include "ReservedScriptNames.h" -#include "GameScriptFreeFunctions.h" +#include "Misc/Misc.h" static sol::state s_solState; static sol::table s_rootTable; @@ -46,6 +46,6 @@ void ScriptInterfaceState::Init() // Misc handlers not assigned above InventoryHandler::Register(&s_solState, s_rootTable); - GameScriptFreeFunctions::Register(&s_solState, s_rootTable); + Misc::Register(&s_solState, s_rootTable); }