Fix gcc build

pull/417/head
Kyle Cooley 7 years ago
parent 02c24e26ea
commit 71040659ac

@ -135,7 +135,7 @@ target_compile_definitions(tes3mp-server PRIVATE $<$<CONFIG:Debug>:SERVER_DEBUG>
set_property(TARGET tes3mp-server PROPERTY CXX_STANDARD 14)
if (CMAKE_CXX_COMPILER_ID STREQUAL "GNU" OR CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
target_compile_options(tes3mp-server PRIVATE -Wno-ignored-qualifiers -ftemplate-depth=2048)
target_compile_options(tes3mp-server PRIVATE -Wno-ignored-qualifiers -ftemplate-depth=4096)
endif()
target_link_libraries(tes3mp-server

@ -323,7 +323,7 @@ namespace MWBase
Make it possible to set the physics framerate from elsewhere
*/
virtual void World::setPhysicsFramerate(float physFramerate) = 0;
virtual void setPhysicsFramerate(float physFramerate) = 0;
/*
End of tes3mp addition
*/

@ -1119,7 +1119,7 @@ void LocalPlayer::setEquipment()
else
{
// Don't try to equip an item that is already equipped
if (!ptrInventory.getSlot(slot).isEqual(it))
if (ptrInventory.getSlot(slot) != it)
ptrInventory.equip(slot, it, ptrPlayer);
}
}

@ -422,7 +422,7 @@ namespace MWWorld
Make it possible to set the physics framerate from elsewhere
*/
void World::setPhysicsFramerate(float physFramerate);
void setPhysicsFramerate(float physFramerate);
/*
End of tes3mp addition
*/

Loading…
Cancel
Save