Fix some things

This commit is contained in:
Adrian Hedqvist 2017-12-27 22:53:48 +01:00
parent c7fad496c7
commit 71794eb68e
6 changed files with 637 additions and 685 deletions

View File

@ -24,11 +24,9 @@ find_package(SDL2 REQUIRED)
include_directories(
${OPENGL_INCLUDE_DIR}
${SDL2_INCLUDE_DIR}
${GLBINDING_INCLUDE_DIRS}
${LUA_INCLUDE_DIR}
"libs/kaguya-1.3.2/include"
)
message(STATUS ${GLBINDING_LIBRARIES})
link_libraries(
${OPENGL_LIBRARIES}
@ -37,6 +35,6 @@ link_libraries(
)
file(GLOB SOURCES "src/*.cpp" "src/*.c" "src/*.h")
add_executable(dungeon ${SOURCES})
add_executable(${TARGET} ${SOURCES})
target_link_libraries(${TARGET} PUBLIC glbinding::glbinding)

89
CMakeSettings.json Normal file
View File

@ -0,0 +1,89 @@
{
// See https://go.microsoft.com//fwlink//?linkid=834763 for more information about this file.
"configurations": [
{
"name": "x86-Debug",
"generator": "Ninja",
"configurationType": "Debug",
"inheritEnvironments": [ "msvc_x86" ],
"buildRoot": "${env.USERPROFILE}\\CMakeBuilds\\${workspaceHash}\\build\\${name}",
"installRoot": "${env.USERPROFILE}\\CMakeBuilds\\${workspaceHash}\\install\\${name}",
"cmakeCommandArgs": "",
"buildCommandArgs": "-v",
"ctestCommandArgs": "",
"variables": [
{
"name": "CMAKE_TOOLCHAIN_FILE",
"value": "E:\\Programmering\\C++\\vcpkg\\scripts\\buildsystems\\vcpkg.cmake"
},
{
"name": "VCPKG_TARGET_TRIPLET",
"value": "x86-windows-static"
}
]
},
{
"name": "x86-Release",
"generator": "Ninja",
"configurationType": "RelWithDebInfo",
"inheritEnvironments": [ "msvc_x86" ],
"buildRoot": "${env.USERPROFILE}\\CMakeBuilds\\${workspaceHash}\\build\\${name}",
"installRoot": "${env.USERPROFILE}\\CMakeBuilds\\${workspaceHash}\\install\\${name}",
"cmakeCommandArgs": "",
"buildCommandArgs": "-v",
"ctestCommandArgs": "",
"variables": [
{
"name": "CMAKE_TOOLCHAIN_FILE",
"value": "E:\\Programmering\\C++\\vcpkg\\scripts\\buildsystems\\vcpkg.cmake"
},
{
"name": "VCPKG_TARGET_TRIPLET",
"value": "x86-windows-static"
}
]
},
{
"name": "x64-Debug",
"generator": "Ninja",
"configurationType": "Debug",
"inheritEnvironments": [ "msvc_x64_x64" ],
"buildRoot": "${env.USERPROFILE}\\CMakeBuilds\\${workspaceHash}\\build\\${name}",
"installRoot": "${env.USERPROFILE}\\CMakeBuilds\\${workspaceHash}\\install\\${name}",
"cmakeCommandArgs": "",
"buildCommandArgs": "-v",
"ctestCommandArgs": "",
"variables": [
{
"name": "CMAKE_TOOLCHAIN_FILE",
"value": "E:\\Programmering\\C++\\vcpkg\\scripts\\buildsystems\\vcpkg.cmake"
},
{
"name": "VCPKG_TARGET_TRIPLET",
"value": "x64-windows-static"
}
]
},
{
"name": "x64-Release",
"generator": "Ninja",
"configurationType": "RelWithDebInfo",
"inheritEnvironments": [ "msvc_x64_x64" ],
"buildRoot": "${env.USERPROFILE}\\CMakeBuilds\\${workspaceHash}\\build\\${name}",
"installRoot": "${env.USERPROFILE}\\CMakeBuilds\\${workspaceHash}\\install\\${name}",
"cmakeCommandArgs": "",
"buildCommandArgs": "-v",
"ctestCommandArgs": "",
"variables": [
{
"name": "CMAKE_TOOLCHAIN_FILE",
"value": "E:\\Programmering\\C++\\vcpkg\\scripts\\buildsystems\\vcpkg.cmake"
},
{
"name": "VCPKG_TARGET_TRIPLET",
"value": "x64-windows-static"
}
]
}
]
}

View File

@ -3,7 +3,7 @@ Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 15
VisualStudioVersion = 15.0.27130.2010
MinimumVisualStudioVersion = 10.0.40219.1
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "dungeon", "dungeon.vcxproj", "{47B30CB8-11E4-4B86-BB50-E3603FE99F9E}"
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "dungeon", "dungeon.vcxproj", "{E786EE71-011C-4AAC-8D46-C06B0671388B}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
@ -13,19 +13,19 @@ Global
Release|x86 = Release|x86
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{47B30CB8-11E4-4B86-BB50-E3603FE99F9E}.Debug|x64.ActiveCfg = Debug|x64
{47B30CB8-11E4-4B86-BB50-E3603FE99F9E}.Debug|x64.Build.0 = Debug|x64
{47B30CB8-11E4-4B86-BB50-E3603FE99F9E}.Debug|x86.ActiveCfg = Debug|Win32
{47B30CB8-11E4-4B86-BB50-E3603FE99F9E}.Debug|x86.Build.0 = Debug|Win32
{47B30CB8-11E4-4B86-BB50-E3603FE99F9E}.Release|x64.ActiveCfg = Release|x64
{47B30CB8-11E4-4B86-BB50-E3603FE99F9E}.Release|x64.Build.0 = Release|x64
{47B30CB8-11E4-4B86-BB50-E3603FE99F9E}.Release|x86.ActiveCfg = Release|Win32
{47B30CB8-11E4-4B86-BB50-E3603FE99F9E}.Release|x86.Build.0 = Release|Win32
{E786EE71-011C-4AAC-8D46-C06B0671388B}.Debug|x64.ActiveCfg = Debug|x64
{E786EE71-011C-4AAC-8D46-C06B0671388B}.Debug|x64.Build.0 = Debug|x64
{E786EE71-011C-4AAC-8D46-C06B0671388B}.Debug|x86.ActiveCfg = Debug|Win32
{E786EE71-011C-4AAC-8D46-C06B0671388B}.Debug|x86.Build.0 = Debug|Win32
{E786EE71-011C-4AAC-8D46-C06B0671388B}.Release|x64.ActiveCfg = Release|x64
{E786EE71-011C-4AAC-8D46-C06B0671388B}.Release|x64.Build.0 = Release|x64
{E786EE71-011C-4AAC-8D46-C06B0671388B}.Release|x86.ActiveCfg = Release|Win32
{E786EE71-011C-4AAC-8D46-C06B0671388B}.Release|x86.Build.0 = Release|Win32
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {FDC70A19-9B1D-420D-8411-489CEB5FF3DE}
SolutionGuid = {80F16E05-4401-452F-AB34-B33EFAA3E782}
EndGlobalSection
EndGlobal

File diff suppressed because one or more lines are too long

View File

@ -1,282 +1,378 @@
<?xml version="1.0" encoding="UTF-8"?>
<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup>
<ClCompile Include="E:\Programmering\C++\Dungeon\src\Actor.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="E:\Programmering\C++\Dungeon\src\App.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="E:\Programmering\C++\Dungeon\src\AttackEnemyNode.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="E:\Programmering\C++\Dungeon\src\BehaviourTree.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="E:\Programmering\C++\Dungeon\src\BehaviourTreeMemSelector.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="E:\Programmering\C++\Dungeon\src\BehaviourTreeMemSequencer.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="E:\Programmering\C++\Dungeon\src\BehaviourTreeNode.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="E:\Programmering\C++\Dungeon\src\BehaviourTreeSelector.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="E:\Programmering\C++\Dungeon\src\BehaviourTreeSequencer.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="E:\Programmering\C++\Dungeon\src\Config.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="E:\Programmering\C++\Dungeon\src\Entity.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="E:\Programmering\C++\Dungeon\src\ExploreNode.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="E:\Programmering\C++\Dungeon\src\FieldOfView.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="E:\Programmering\C++\Dungeon\src\FleeNode.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="E:\Programmering\C++\Dungeon\src\Gamestate.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="E:\Programmering\C++\Dungeon\src\Goblin.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="E:\Programmering\C++\Dungeon\src\HealFriendNode.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="E:\Programmering\C++\Dungeon\src\Hero.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="E:\Programmering\C++\Dungeon\src\IfHealthBelow.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="E:\Programmering\C++\Dungeon\src\IfNotSeeEnemyNode.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="E:\Programmering\C++\Dungeon\src\IfSeeEnemyNode.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="E:\Programmering\C++\Dungeon\src\IfSeeFriendNode.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="E:\Programmering\C++\Dungeon\src\Input.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="E:\Programmering\C++\Dungeon\src\Main.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="E:\Programmering\C++\Dungeon\src\Mapgen.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="E:\Programmering\C++\Dungeon\src\Pathfinder.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="E:\Programmering\C++\Dungeon\src\PlayState.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="E:\Programmering\C++\Dungeon\src\RangedAttackNode.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="E:\Programmering\C++\Dungeon\src\Renderer.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="E:\Programmering\C++\Dungeon\src\RestNode.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="E:\Programmering\C++\Dungeon\src\Shaman.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="E:\Programmering\C++\Dungeon\src\Tilemap.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="E:\Programmering\C++\Dungeon\src\Tileset.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="E:\Programmering\C++\Dungeon\src\WanderNode.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="E:\Programmering\C++\Dungeon\src\World.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="E:\Programmering\C++\Dungeon\src\imgui.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="E:\Programmering\C++\Dungeon\src\imgui_demo.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="E:\Programmering\C++\Dungeon\src\imgui_draw.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="E:\Programmering\C++\Dungeon\src\imgui_impl_sdl_gl3.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="E:\Programmering\C++\Dungeon\src\imgui_user.cpp">
<Filter>Source Files</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup>
<ClInclude Include="E:\Programmering\C++\Dungeon\src\Actor.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="E:\Programmering\C++\Dungeon\src\App.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="E:\Programmering\C++\Dungeon\src\AttackEnemyNode.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="E:\Programmering\C++\Dungeon\src\BehaviourTree.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="E:\Programmering\C++\Dungeon\src\BehaviourTreeMemSelector.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="E:\Programmering\C++\Dungeon\src\BehaviourTreeMemSequencer.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="E:\Programmering\C++\Dungeon\src\BehaviourTreeNode.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="E:\Programmering\C++\Dungeon\src\BehaviourTreeSelector.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="E:\Programmering\C++\Dungeon\src\BehaviourTreeSequencer.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="E:\Programmering\C++\Dungeon\src\Color.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="E:\Programmering\C++\Dungeon\src\Config.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="E:\Programmering\C++\Dungeon\src\Entity.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="E:\Programmering\C++\Dungeon\src\ExploreNode.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="E:\Programmering\C++\Dungeon\src\FieldOfView.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="E:\Programmering\C++\Dungeon\src\FleeNode.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="E:\Programmering\C++\Dungeon\src\Gamestate.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="E:\Programmering\C++\Dungeon\src\Goblin.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="E:\Programmering\C++\Dungeon\src\HealFriendNode.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="E:\Programmering\C++\Dungeon\src\Hero.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="E:\Programmering\C++\Dungeon\src\IfHealthBelow.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="E:\Programmering\C++\Dungeon\src\IfNotSeeEnemyNode.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="E:\Programmering\C++\Dungeon\src\IfSeeEnemyNode.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="E:\Programmering\C++\Dungeon\src\IfSeeFriendNode.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="E:\Programmering\C++\Dungeon\src\Input.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="E:\Programmering\C++\Dungeon\src\Logger.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="E:\Programmering\C++\Dungeon\src\Mapgen.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="E:\Programmering\C++\Dungeon\src\Pathfinder.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="E:\Programmering\C++\Dungeon\src\PlayState.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="E:\Programmering\C++\Dungeon\src\RangedAttackNode.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="E:\Programmering\C++\Dungeon\src\Renderer.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="E:\Programmering\C++\Dungeon\src\RestNode.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="E:\Programmering\C++\Dungeon\src\Shaman.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="E:\Programmering\C++\Dungeon\src\Stats.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="E:\Programmering\C++\Dungeon\src\Tilemap.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="E:\Programmering\C++\Dungeon\src\Tileset.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="E:\Programmering\C++\Dungeon\src\WanderNode.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="E:\Programmering\C++\Dungeon\src\World.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="E:\Programmering\C++\Dungeon\src\gitparams.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="E:\Programmering\C++\Dungeon\src\imconfig.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="E:\Programmering\C++\Dungeon\src\imgui.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="E:\Programmering\C++\Dungeon\src\imgui_impl_sdl_gl3.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="E:\Programmering\C++\Dungeon\src\imgui_internal.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="E:\Programmering\C++\Dungeon\src\imgui_user.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="E:\Programmering\C++\Dungeon\src\stb_rect_pack.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="E:\Programmering\C++\Dungeon\src\stb_textedit.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="E:\Programmering\C++\Dungeon\src\stb_truetype.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="E:\Programmering\C++\Dungeon\src\vec2i.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="E:\Programmering\C++\Dungeon\src\wglew.h">
<Filter>Header Files</Filter>
</ClInclude>
</ItemGroup>
<ItemGroup>
<CustomBuild Include="E:\Programmering\C++\Dungeon\CMakeLists.txt" />
</ItemGroup>
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup>
<Filter Include="Source Files">
<UniqueIdentifier>{40E65D15-5F8D-3901-96F2-47322AD2F0D7}</UniqueIdentifier>
<UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
<Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
</Filter>
<Filter Include="Header Files">
<UniqueIdentifier>{FE34F69C-6EB7-3A06-A783-3BDA351EEAFE}</UniqueIdentifier>
<UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
<Extensions>h;hh;hpp;hxx;hm;inl;inc;xsd</Extensions>
</Filter>
<Filter Include="Resource Files">
<UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
<Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav</Extensions>
</Filter>
</ItemGroup>
</Project>
<ItemGroup>
<ClCompile Include="src\Actor.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="src\App.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="src\AttackEnemyNode.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="src\BehaviourTree.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="src\BehaviourTreeMemSelector.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="src\BehaviourTreeMemSequencer.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="src\BehaviourTreeNode.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="src\BehaviourTreeSelector.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="src\BehaviourTreeSequencer.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="src\Config.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="src\Entity.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="src\ExploreNode.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="src\FieldOfView.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="src\FleeNode.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="src\Gamestate.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="src\Goblin.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="src\HealFriendNode.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="src\Hero.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="src\IfHealthBelow.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="src\IfNotSeeEnemyNode.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="src\IfSeeEnemyNode.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="src\IfSeeFriendNode.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="src\imgui.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="src\imgui_demo.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="src\imgui_draw.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="src\imgui_impl_sdl_gl3.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="src\imgui_user.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="src\Input.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="src\Main.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="src\Mapgen.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="src\Pathfinder.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="src\PlayState.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="src\RangedAttackNode.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="src\Renderer.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="src\RestNode.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="src\Shaman.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="src\Tilemap.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="src\Tileset.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="src\WanderNode.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="src\World.cpp">
<Filter>Source Files</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup>
<ClInclude Include="libs\kaguya-1.3.2\include\kaguya\another_binding_api.hpp">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="libs\kaguya-1.3.2\include\kaguya\compatibility.hpp">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="libs\kaguya-1.3.2\include\kaguya\config.hpp">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="libs\kaguya-1.3.2\include\kaguya\error_handler.hpp">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="libs\kaguya-1.3.2\include\kaguya\exception.hpp">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="libs\kaguya-1.3.2\include\kaguya\function_tuple_def.hpp">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="libs\kaguya-1.3.2\include\kaguya\kaguya.hpp">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="libs\kaguya-1.3.2\include\kaguya\lua_ref.hpp">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="libs\kaguya-1.3.2\include\kaguya\lua_ref_function.hpp">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="libs\kaguya-1.3.2\include\kaguya\lua_ref_table.hpp">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="libs\kaguya-1.3.2\include\kaguya\metatable.hpp">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="libs\kaguya-1.3.2\include\kaguya\native_function.hpp">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="libs\kaguya-1.3.2\include\kaguya\native_function_cxx03.hpp">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="libs\kaguya-1.3.2\include\kaguya\native_function_cxx11.hpp">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="libs\kaguya-1.3.2\include\kaguya\object.hpp">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="libs\kaguya-1.3.2\include\kaguya\optional.hpp">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="libs\kaguya-1.3.2\include\kaguya\preprocess.hpp">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="libs\kaguya-1.3.2\include\kaguya\preprocess_repeate.hpp">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="libs\kaguya-1.3.2\include\kaguya\push_any.hpp">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="libs\kaguya-1.3.2\include\kaguya\push_tuple.hpp">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="libs\kaguya-1.3.2\include\kaguya\ref_tuple.hpp">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="libs\kaguya-1.3.2\include\kaguya\state.hpp">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="libs\kaguya-1.3.2\include\kaguya\traits.hpp">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="libs\kaguya-1.3.2\include\kaguya\type.hpp">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="libs\kaguya-1.3.2\include\kaguya\utility.hpp">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="libs\kaguya-1.3.2\include\kaguya\utility_cxx03.hpp">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="libs\kaguya-1.3.2\include\kaguya\utility_cxx11.hpp">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="libs\kaguya-1.3.2\include\kaguya\detail\lua_function_def.hpp">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="libs\kaguya-1.3.2\include\kaguya\detail\lua_ref_impl.hpp">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="libs\kaguya-1.3.2\include\kaguya\detail\lua_table_def.hpp">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="libs\kaguya-1.3.2\include\kaguya\detail\lua_variant_def.hpp">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="src\Actor.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="src\App.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="src\AttackEnemyNode.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="src\BehaviourTree.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="src\BehaviourTreeMemSelector.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="src\BehaviourTreeMemSequencer.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="src\BehaviourTreeNode.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="src\BehaviourTreeSelector.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="src\BehaviourTreeSequencer.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="src\Color.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="src\Config.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="src\Entity.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="src\ExploreNode.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="src\FieldOfView.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="src\FleeNode.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="src\Gamestate.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="src\gitparams.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="src\Goblin.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="src\HealFriendNode.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="src\Hero.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="src\IfHealthBelow.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="src\IfNotSeeEnemyNode.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="src\IfSeeEnemyNode.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="src\IfSeeFriendNode.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="src\imconfig.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="src\imgui.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="src\imgui_impl_sdl_gl3.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="src\imgui_internal.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="src\imgui_user.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="src\Input.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="src\Logger.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="src\Mapgen.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="src\Pathfinder.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="src\PlayState.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="src\RangedAttackNode.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="src\Renderer.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="src\RestNode.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="src\Shaman.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="src\Stats.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="src\stb_rect_pack.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="src\stb_textedit.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="src\stb_truetype.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="src\Tilemap.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="src\Tileset.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="src\vec2i.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="src\WanderNode.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="src\wglew.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="src\World.h">
<Filter>Header Files</Filter>
</ClInclude>
</ItemGroup>
</Project>

View File

@ -173,8 +173,8 @@ Gamestate *PlayState::update(double delta) {
vec2i heropos = hero->get_position();
auto acts = tilemap.get_entities(heropos.x + dir.x, heropos.y + dir.y, 0, ENTITY_ACTOR);
if(acts.empty()) {
action = ACTION_NONE;
SDL_LogVerbose(SDL_LOG_CATEGORY_SYSTEM, "Turn aborted: invalid player action.\n");
action = ACTION_NONE;
return nullptr; // unable to move and nothing to attack == abort turn
}
for (auto ent : acts) {