From 7f00005f04323202a5b3e5340e986cb1b871c4b3 Mon Sep 17 00:00:00 2001 From: David Cernat Date: Thu, 10 May 2018 07:16:33 +0300 Subject: [PATCH] [Client] Fix GCC build Based on 71040659ac39dc1236af654b5c3177d015e749e5 --- apps/openmw/mwbase/world.hpp | 2 +- apps/openmw/mwmp/LocalPlayer.cpp | 2 +- apps/openmw/mwworld/worldimp.hpp | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/apps/openmw/mwbase/world.hpp b/apps/openmw/mwbase/world.hpp index b37d2ce2e..1ad1b37e7 100644 --- a/apps/openmw/mwbase/world.hpp +++ b/apps/openmw/mwbase/world.hpp @@ -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 */ diff --git a/apps/openmw/mwmp/LocalPlayer.cpp b/apps/openmw/mwmp/LocalPlayer.cpp index bee4ea01b..cfafe2e7e 100644 --- a/apps/openmw/mwmp/LocalPlayer.cpp +++ b/apps/openmw/mwmp/LocalPlayer.cpp @@ -1114,7 +1114,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); } } diff --git a/apps/openmw/mwworld/worldimp.hpp b/apps/openmw/mwworld/worldimp.hpp index 6b7c373bc..a8deea784 100644 --- a/apps/openmw/mwworld/worldimp.hpp +++ b/apps/openmw/mwworld/worldimp.hpp @@ -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 */