Archive/TombEngine
0
0
Fork 0
mirror of https://github.com/TombEngine/TombEngine.git synced 2025-05-07 19:23:49 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

More misc changes.

Browse source
This commit is contained in:
hispidence 2022-02-07 20:42:40 +00:00
parent 5571f3345c
commit 70f29975a7
6 changed files with 12 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Scripting/Scripting.vcxproj
View file

@ -83,12 +83,12 @@
<ClInclude Include="src\Flow\Level\Level.h" /> <ClInclude Include="src\Flow\Level\Level.h" />
<ClInclude Include="src\Flow\Mirror\Mirror.h" /> <ClInclude Include="src\Flow\Mirror\Mirror.h" />
<ClInclude Include="src\Flow\SkyLayer\SkyLayer.h" /> <ClInclude Include="src\Flow\SkyLayer\SkyLayer.h" />
<ClInclude Include="src\GameScriptFreeFunctions.h" />
<ClInclude Include="src\InventorySlots.h" /> <ClInclude Include="src\InventorySlots.h" />
<ClInclude Include="src\Inventory\InventoryHandler.h" /> <ClInclude Include="src\Inventory\InventoryHandler.h" />
<ClInclude Include="src\ItemEnumPair.h" /> <ClInclude Include="src\ItemEnumPair.h" />
<ClInclude Include="src\Logic\LogicHandler.h" /> <ClInclude Include="src\Logic\LogicHandler.h" />
<ClInclude Include="src\LuaHandler.h" /> <ClInclude Include="src\LuaHandler.h" />
<ClInclude Include="src\Misc\Misc.h" />
<ClInclude Include="src\Objects\AIObject\AIObject.h" /> <ClInclude Include="src\Objects\AIObject\AIObject.h" />
<ClInclude Include="src\Objects\Camera\Camera.h" /> <ClInclude Include="src\Objects\Camera\Camera.h" />
<ClInclude Include="src\Objects\Moveable\Moveable.h" /> <ClInclude Include="src\Objects\Moveable\Moveable.h" />
@ -123,6 +123,7 @@
<ClCompile Include="src\Flow\SkyLayer\SkyLayer.cpp" /> <ClCompile Include="src\Flow\SkyLayer\SkyLayer.cpp" />
<ClCompile Include="src\Inventory\InventoryHandler.cpp" /> <ClCompile Include="src\Inventory\InventoryHandler.cpp" />
<ClCompile Include="src\Logic\LogicHandler.cpp" /> <ClCompile Include="src\Logic\LogicHandler.cpp" />
<ClCompile Include="src\Misc\Misc.cpp" />
<ClCompile Include="src\Objects\AIObject\AIObject.cpp" /> <ClCompile Include="src\Objects\AIObject\AIObject.cpp" />
<ClCompile Include="src\Objects\Camera\Camera.cpp" /> <ClCompile Include="src\Objects\Camera\Camera.cpp" />
<ClCompile Include="src\Objects\Moveable\Moveable.cpp" /> <ClCompile Include="src\Objects\Moveable\Moveable.cpp" />
@ -133,7 +134,6 @@
<ClCompile Include="src\Position\Position.cpp" /> <ClCompile Include="src\Position\Position.cpp" />
<ClCompile Include="src\Rotation\Rotation.cpp" /> <ClCompile Include="src\Rotation\Rotation.cpp" />
<ClCompile Include="src\ScriptInterfaceState.cpp" /> <ClCompile Include="src\ScriptInterfaceState.cpp" />
<ClCompile Include="src\GameScriptFreeFunctions.cpp" />
<ClCompile Include="src\LuaHandler.cpp" /> <ClCompile Include="src\LuaHandler.cpp" />
<ClCompile Include="src\ScriptAssert.cpp" /> <ClCompile Include="src\ScriptAssert.cpp" />
<ClCompile Include="src\Settings\Settings.cpp" /> <ClCompile Include="src\Settings\Settings.cpp" />

12
Scripting/Scripting.vcxproj.filters
View file

@ -177,9 +177,6 @@
<ClInclude Include="src\AudioTracks.h"> <ClInclude Include="src\AudioTracks.h">
<Filter>Header Files</Filter> <Filter>Header Files</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="src\GameScriptFreeFunctions.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="src\InventorySlots.h"> <ClInclude Include="src\InventorySlots.h">
<Filter>Header Files</Filter> <Filter>Header Files</Filter>
</ClInclude> </ClInclude>
@ -279,14 +276,14 @@
<ClInclude Include="src\Position\Position.h"> <ClInclude Include="src\Position\Position.h">
<Filter>Header Files</Filter> <Filter>Header Files</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="src\Misc\Misc.h">
<Filter>Header Files</Filter>
</ClInclude>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ClCompile Include="frameworkandsol.cpp"> <ClCompile Include="frameworkandsol.cpp">
<Filter>Source Files</Filter> <Filter>Source Files</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="src\GameScriptFreeFunctions.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="src\LuaHandler.cpp"> <ClCompile Include="src\LuaHandler.cpp">
<Filter>Source Files</Filter> <Filter>Source Files</Filter>
</ClCompile> </ClCompile>
@ -359,6 +356,9 @@
<ClCompile Include="src\Position\Position.cpp"> <ClCompile Include="src\Position\Position.cpp">
<Filter>Source Files</Filter> <Filter>Source Files</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="src\Misc\Misc.cpp">
<Filter>Source Files</Filter>
</ClCompile>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<None Include="packages.config" /> <None Include="packages.config" />

1
Scripting/src/Logic/LogicHandler.cpp
View file

@ -13,7 +13,6 @@
#include "Game/effects/effects.h" #include "Game/effects/effects.h"
#include "Game/pickup/pickup.h" #include "Game/pickup/pickup.h"
#include "Game/gui.h" #include "Game/gui.h"
#include "GameScriptFreeFunctions.h"
#include "ReservedScriptNames.h" #include "ReservedScriptNames.h"
#include "Game/camera.h" #include "Game/camera.h"
#include <Renderer/Renderer11Enums.h> #include <Renderer/Renderer11Enums.h>

2
Scripting/src/Misc/Misc.cpp
View file

@ -17,7 +17,7 @@ Scripts that will be run on game startup.
using namespace TEN::Effects::Lightning; using namespace TEN::Effects::Lightning;
namespace GameScriptFreeFunctions { namespace Misc {
static int FindRoomNumber(Position pos) static int FindRoomNumber(Position pos)
{ {
return 0; return 0;

2
Scripting/src/Misc/Misc.h
View file

@ -3,6 +3,6 @@ namespace sol {
class state; class state;
}; };
namespace GameScriptFreeFunctions { namespace Misc {
void Register(sol::state* lua, sol::table &); void Register(sol::state* lua, sol::table &);
}; };

4
Scripting/src/ScriptInterfaceState.cpp
View file

@ -6,7 +6,7 @@
#include "Strings/StringsHandler.h" #include "Strings/StringsHandler.h"
#include "Inventory/InventoryHandler.h" #include "Inventory/InventoryHandler.h"
#include "ReservedScriptNames.h" #include "ReservedScriptNames.h"
#include "GameScriptFreeFunctions.h" #include "Misc/Misc.h"
static sol::state s_solState; static sol::state s_solState;
static sol::table s_rootTable; static sol::table s_rootTable;
@ -46,6 +46,6 @@ void ScriptInterfaceState::Init()
// Misc handlers not assigned above // Misc handlers not assigned above
InventoryHandler::Register(&s_solState, s_rootTable); InventoryHandler::Register(&s_solState, s_rootTable);
GameScriptFreeFunctions::Register(&s_solState, s_rootTable); Misc::Register(&s_solState, s_rootTable);
} }