Khaganat-NeL/khanat-opennel-code
2
0
Fork 0
Code Issues 21 Pull requests Projects Releases 1 Packages Wiki Activity

Visual Studio 2013 compilation support for Ryzom Server

Browse source
This commit is contained in:
kaetemi 2015-02-23 12:37:51 +01:00
parent 4cd6fad710
commit 05020d3b2a
4 changed files with 15 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
code/ryzom/server/src/ai_data_service/pacs_scan.cpp
View file

@ -1651,7 +1651,7 @@ public:
first.flags = (topNode.isInWater() ? 1 : 0) + (topNode.isInNogo() ? 2 : 0); first.flags = (topNode.isInWater() ? 1 : 0) + (topNode.isInNogo() ? 2 : 0);
// push first position // 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) while (true)
{ {
@ -1750,11 +1750,11 @@ public:
} }
if (tmp.getTopologyNode().Id == topNode.Id) 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 else
{ {
stacks[tmpflags+1].insert(make_pair<sint, CWorldPosition>(ndist, tmp)); stacks[tmpflags + 1].insert(std::pair<sint, CWorldPosition>(ndist, tmp));
} }
} }
} }

2
code/ryzom/server/src/ai_service/event_manager.h
View file

@ -17,6 +17,8 @@
#ifndef RYAI_EVENT_MANAGER_H #ifndef RYAI_EVENT_MANAGER_H
#define RYAI_EVENT_MANAGER_H #define RYAI_EVENT_MANAGER_H
#include <functional>
#include "event_reaction.h" #include "event_reaction.h"
#include "states.h" #include "states.h"

2
code/ryzom/server/src/backup_service/backup_service.cpp
View file

@ -718,7 +718,7 @@ void CBackupService::init()
BSIsSlave = true; BSIsSlave = true;
FileManager.forbidStall(); FileManager.forbidStall();
// I'm a slave, try to contact master // I'm a slave, try to contact master
string host = MasterBSHost; string host = MasterBSHost.get();
if (host.find (":") == string::npos) if (host.find (":") == string::npos)
host += ":49990"; host += ":49990";

18
code/ryzom/server/src/backup_service/web_connection.cpp
View file

@ -209,10 +209,10 @@ void cbGetSaveList(CMemStream &msgin, TSockId host)
explode(str, string("%%"), params, true); explode(str, string("%%"), params, true);
string incrementalDir = IncrementalBackupDirectory; string incrementalDir = IncrementalBackupDirectory.get();
string saveShardRoot = SaveShardRoot; string saveShardRoot = SaveShardRoot.get();
string templatePath = SaveTemplatePath; string templatePath = SaveTemplatePath.get();
string extList = SaveExtList; string extList = SaveExtList.get();
string shard; string shard;
string userid; string userid;
@ -293,8 +293,8 @@ void cbRestoreSave(CMemStream &msgin, TSockId host)
explode(str, string("%%"), params, true); explode(str, string("%%"), params, true);
string saveShardRoot = SaveShardRoot; string saveShardRoot = SaveShardRoot.get();
string templatePath = SaveTemplatePath; string templatePath = SaveTemplatePath.get();
string shard; string shard;
string userid; string userid;
@ -368,9 +368,9 @@ void cbCopyOverSave(CMemStream &msgin, TSockId host)
explode(str, string("%%"), params, true); explode(str, string("%%"), params, true);
string saveShardRoot = SaveShardRoot; string saveShardRoot = SaveShardRoot.get();
string templatePath = SaveTemplatePath; string templatePath = SaveTemplatePath.get();
string extList = SaveExtList; string extList = SaveExtList.get();
string shard; string shard;
string userid; string userid;