teamnwah/openmw-tes3coop
2
0
Fork 1
forked from mirror/openmw-tes3mp
Code Issues Pull requests 1 Releases Wiki Activity

[Client] Fix build by changing boost::shared_ptr into std::shared_ptr

Browse source
This commit is contained in:
David Cernat 2017-06-18 19:36:06 +03:00
parent fa3baac0f3
commit c6aee3b780
9 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
apps/openmw/mwclass/npc.cpp
View file

@ -978,7 +978,7 @@ namespace MWClass
Don't display a dialogue screen for two players interacting with each other
*/
if (actor == MWMechanics::getPlayer() && mwmp::PlayerList::isDedicatedPlayer(ptr))
return boost::shared_ptr<MWWorld::Action>(new MWWorld::FailedAction("Not implemented."));
return std::shared_ptr<MWWorld::Action>(new MWWorld::FailedAction("Not implemented."));
/*
End of tes3mp addition
*/

2
apps/openmw/mwmp/DedicatedActor.cpp
View file

@ -248,7 +248,7 @@ void DedicatedActor::equipItem(std::string refId, int charge)
{
if (::Misc::StringUtils::ciEqual(it->getCellRef().getRefId(), refId) && it->getCellRef().getCharge() == charge)
{
boost::shared_ptr<MWWorld::Action> action = it->getClass().use(*it);
std::shared_ptr<MWWorld::Action> action = it->getClass().use(*it);
action->execute(ptr);
break;
}

2
apps/openmw/mwmp/DedicatedPlayer.cpp
View file

@ -194,7 +194,7 @@ void DedicatedPlayer::setEquipment()
{
if (::Misc::StringUtils::ciEqual(it2->getCellRef().getRefId(), dedicItem)) // equip item
{
boost::shared_ptr<MWWorld::Action> action = it2->getClass().use(*it2);
std::shared_ptr<MWWorld::Action> action = it2->getClass().use(*it2);
action->execute(ptr);
break;
}

2
apps/openmw/mwmp/processors/ActorProcessor.cpp
View file

@ -54,5 +54,5 @@ void ActorProcessor::AddProcessor(mwmp::ActorProcessor *processor)
throw std::logic_error("processor " + p.second->strPacketID + " already registered. Check " +
processor->className + " and " + p.second->className);
}
processors.insert(processors_t::value_type(processor->GetPacketID(), boost::shared_ptr<ActorProcessor>(processor)));
processors.insert(processors_t::value_type(processor->GetPacketID(), std::shared_ptr<ActorProcessor>(processor)));
}

2
apps/openmw/mwmp/processors/ActorProcessor.hpp
View file

@ -25,7 +25,7 @@ namespace mwmp
static bool Process(RakNet::Packet &packet, ActorList &actorList);
static void AddProcessor(ActorProcessor *processor);
typedef boost::unordered_map<unsigned char, boost::shared_ptr<ActorProcessor> > processors_t;
typedef boost::unordered_map<unsigned char, std::shared_ptr<ActorProcessor> > processors_t;
private:
static processors_t processors;

2
apps/openmw/mwmp/processors/PlayerProcessor.cpp
View file

@ -19,7 +19,7 @@ void PlayerProcessor::AddProcessor(PlayerProcessor *processor)
throw std::logic_error("processor " + p.second->strPacketID + " already registered. Check " +
processor->className + " and " + p.second->className);
}
processors.insert(processors_t::value_type(processor->GetPacketID(), boost::shared_ptr<PlayerProcessor>(processor)));
processors.insert(processors_t::value_type(processor->GetPacketID(), std::shared_ptr<PlayerProcessor>(processor)));
}
bool PlayerProcessor::Process(RakNet::Packet &packet)

2
apps/openmw/mwmp/processors/PlayerProcessor.hpp
View file

@ -26,7 +26,7 @@ namespace mwmp
static bool Process(RakNet::Packet &packet);
static void AddProcessor(PlayerProcessor *processor);
typedef boost::unordered_map<unsigned char, boost::shared_ptr<PlayerProcessor> > processors_t;
typedef boost::unordered_map<unsigned char, std::shared_ptr<PlayerProcessor> > processors_t;
//typedef std::unordered_map<unsigned char, std::unique_ptr<PlayerProcessor> > processors_t;
private:
static processors_t processors;

2
apps/openmw/mwmp/processors/WorldProcessor.cpp
View file

@ -54,5 +54,5 @@ void WorldProcessor::AddProcessor(mwmp::WorldProcessor *processor)
throw std::logic_error("processor " + p.second->strPacketID + " already registered. Check " +
processor->className + " and " + p.second->className);
}
processors.insert(processors_t::value_type(processor->GetPacketID(), boost::shared_ptr<WorldProcessor>(processor)));
processors.insert(processors_t::value_type(processor->GetPacketID(), std::shared_ptr<WorldProcessor>(processor)));
}

2
apps/openmw/mwmp/processors/WorldProcessor.hpp
View file

@ -26,7 +26,7 @@ namespace mwmp
static bool Process(RakNet::Packet &packet, WorldEvent &event);
static void AddProcessor(WorldProcessor *processor);
typedef boost::unordered_map<unsigned char, boost::shared_ptr<WorldProcessor> > processors_t;
typedef boost::unordered_map<unsigned char, std::shared_ptr<WorldProcessor> > processors_t;
private:
static processors_t processors;