mirror/openmw-tes3mp
1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-07-22 02:44:08 +00:00
Code Issues Releases Wiki Activity

Fix gcc build

Browse source
This commit is contained in:
Kyle Cooley 2018-05-09 20:16:03 -04:00
parent 02c24e26ea
commit 71040659ac
4 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
apps/openmw-mp/CMakeLists.txt
View file

@ -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

4
apps/openmw/mwbase/world.hpp
View file

@ -253,7 +253,7 @@ namespace MWBase
Start of tes3mp addition
This has been declared here so it can be accessed from places
other than MWWorld::World
other than MWWorld::World
*/
virtual void PCDropped(const MWWorld::Ptr& item) = 0;
/*
@ -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
*/

12
apps/openmw/mwmp/LocalPlayer.cpp
View file

@ -58,7 +58,7 @@ LocalPlayer::LocalPlayer()
ignorePosPacket = false;
ignoreJailTeleportation = false;
ignoreJailSkillIncreases = false;
attack.shouldSend = false;
deathReason = "suicide";
@ -220,7 +220,7 @@ void LocalPlayer::updateStatsDynamic(bool forceUpdate)
if (needUpdate(oldMagicka, magicka, 4))
statsDynamicIndexChanges.push_back(1);
if (needUpdate(oldFatigue, fatigue, 4))
statsDynamicIndexChanges.push_back(2);
@ -614,7 +614,7 @@ void LocalPlayer::updateAnimFlags(bool forceUpdate)
bool isSneaking = ptrNpcStats.getMovementFlag(CreatureStats::Flag_Sneak);
bool isForceJumping = ptrNpcStats.getMovementFlag(CreatureStats::Flag_ForceJump);
bool isForceMoveJumping = ptrNpcStats.getMovementFlag(CreatureStats::Flag_ForceMoveJump);
isFlying = world->isFlying(ptrPlayer);
bool isJumping = !world->isOnGround(ptrPlayer) && !isFlying;
@ -637,7 +637,7 @@ void LocalPlayer::updateAnimFlags(bool forceUpdate)
wasForceJumping = isForceJumping;
wasForceMoveJumping = isForceMoveJumping;
lastDrawState = currentDrawState;
wasFlying = isFlying;
wasJumping = isJumping;
@ -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);
}
}
@ -1333,7 +1333,7 @@ void LocalPlayer::setSelectedSpell()
if (!spells.hasSpell(selectedSpellId))
return;
MWBase::Environment::get().getWindowManager()->setSelectedSpell(selectedSpellId,
int(MWMechanics::getSpellSuccessChance(selectedSpellId, ptrPlayer)));
}

2
apps/openmw/mwworld/worldimp.hpp
View file

@ -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
*/