Visual Studio 2013 compilation support for Ryzom Server
--HG-- branch : develop
This commit is contained in:
parent
4cb42c6de0
commit
389bde2e11
4 changed files with 15 additions and 13 deletions
|
@ -1651,7 +1651,7 @@ public:
|
|||
first.flags = (topNode.isInWater() ? 1 : 0) + (topNode.isInNogo() ? 2 : 0);
|
||||
|
||||
// push first position
|
||||
stacks[first.flags].insert(make_pair<sint, CWorldPosition>(first.flags, stwp));
|
||||
stacks[first.flags].insert(std::pair<sint, CWorldPosition>(first.flags, stwp));
|
||||
|
||||
while (true)
|
||||
{
|
||||
|
@ -1750,11 +1750,11 @@ public:
|
|||
}
|
||||
if (tmp.getTopologyNode().Id == topNode.Id)
|
||||
{
|
||||
stacks[0].insert(make_pair<sint, CWorldPosition>(ndist, tmp));
|
||||
stacks[0].insert(std::pair<sint, CWorldPosition>(ndist, tmp));
|
||||
}
|
||||
else
|
||||
{
|
||||
stacks[tmpflags+1].insert(make_pair<sint, CWorldPosition>(ndist, tmp));
|
||||
stacks[tmpflags + 1].insert(std::pair<sint, CWorldPosition>(ndist, tmp));
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
@ -17,6 +17,8 @@
|
|||
#ifndef RYAI_EVENT_MANAGER_H
|
||||
#define RYAI_EVENT_MANAGER_H
|
||||
|
||||
#include <functional>
|
||||
|
||||
#include "event_reaction.h"
|
||||
#include "states.h"
|
||||
|
||||
|
|
|
@ -718,7 +718,7 @@ void CBackupService::init()
|
|||
BSIsSlave = true;
|
||||
FileManager.forbidStall();
|
||||
// I'm a slave, try to contact master
|
||||
string host = MasterBSHost;
|
||||
string host = MasterBSHost.get();
|
||||
if (host.find (":") == string::npos)
|
||||
host += ":49990";
|
||||
|
||||
|
|
|
@ -209,10 +209,10 @@ void cbGetSaveList(CMemStream &msgin, TSockId host)
|
|||
|
||||
explode(str, string("%%"), params, true);
|
||||
|
||||
string incrementalDir = IncrementalBackupDirectory;
|
||||
string saveShardRoot = SaveShardRoot;
|
||||
string templatePath = SaveTemplatePath;
|
||||
string extList = SaveExtList;
|
||||
string incrementalDir = IncrementalBackupDirectory.get();
|
||||
string saveShardRoot = SaveShardRoot.get();
|
||||
string templatePath = SaveTemplatePath.get();
|
||||
string extList = SaveExtList.get();
|
||||
|
||||
string shard;
|
||||
string userid;
|
||||
|
@ -293,8 +293,8 @@ void cbRestoreSave(CMemStream &msgin, TSockId host)
|
|||
|
||||
explode(str, string("%%"), params, true);
|
||||
|
||||
string saveShardRoot = SaveShardRoot;
|
||||
string templatePath = SaveTemplatePath;
|
||||
string saveShardRoot = SaveShardRoot.get();
|
||||
string templatePath = SaveTemplatePath.get();
|
||||
|
||||
string shard;
|
||||
string userid;
|
||||
|
@ -368,9 +368,9 @@ void cbCopyOverSave(CMemStream &msgin, TSockId host)
|
|||
|
||||
explode(str, string("%%"), params, true);
|
||||
|
||||
string saveShardRoot = SaveShardRoot;
|
||||
string templatePath = SaveTemplatePath;
|
||||
string extList = SaveExtList;
|
||||
string saveShardRoot = SaveShardRoot.get();
|
||||
string templatePath = SaveTemplatePath.get();
|
||||
string extList = SaveExtList.get();
|
||||
|
||||
string shard;
|
||||
string userid;
|
||||
|
|
Loading…
Reference in a new issue