mirror of
https://port.numenaute.org/aleajactaest/khanat-code-old.git
synced 2024-11-06 07:19:05 +00:00
Visual Studio 2013 compilation support for Ryzom Server
This commit is contained in:
parent
fa91a85f55
commit
881bf2354e
7 changed files with 17 additions and 16 deletions
|
@ -16,6 +16,7 @@
|
||||||
|
|
||||||
|
|
||||||
#include "stdpch.h"
|
#include "stdpch.h"
|
||||||
|
#include <functional>
|
||||||
#include "deposit.h"
|
#include "deposit.h"
|
||||||
#include "player_manager/character.h"
|
#include "player_manager/character.h"
|
||||||
#include "player_manager/player_manager.h"
|
#include "player_manager/player_manager.h"
|
||||||
|
|
|
@ -516,7 +516,7 @@ void CFameContainerPD::pds__fetch(RY_PDS::CPData &data)
|
||||||
if (rowIndex == RY_PDS::INVALID_ROW_INDEX || tableIndex == RY_PDS::INVALID_TABLE_INDEX) break;
|
if (rowIndex == RY_PDS::INVALID_ROW_INDEX || tableIndex == RY_PDS::INVALID_TABLE_INDEX) break;
|
||||||
NLMISC::CSheetId __k;
|
NLMISC::CSheetId __k;
|
||||||
data.serial(__k);
|
data.serial(__k);
|
||||||
_Entries.insert(std::make_pair<NLMISC::CSheetId,CFameContainerEntryPD>(__k, CFameContainerEntryPD()));
|
_Entries.insert(std::pair<NLMISC::CSheetId,CFameContainerEntryPD>(__k, CFameContainerEntryPD()));
|
||||||
CFameContainerEntryPD* __o = &(_Entries[__k]);
|
CFameContainerEntryPD* __o = &(_Entries[__k]);
|
||||||
PDSLib.setRowIndex(rowIndex, __o);
|
PDSLib.setRowIndex(rowIndex, __o);
|
||||||
__o->pds__fetch(data);
|
__o->pds__fetch(data);
|
||||||
|
|
|
@ -59,7 +59,7 @@ CGameEventManager::CGameEventManager()
|
||||||
// ----------------------------------------------------------------------------
|
// ----------------------------------------------------------------------------
|
||||||
void CGameEventManager::init()
|
void CGameEventManager::init()
|
||||||
{
|
{
|
||||||
string sFilename = GameEventFile;
|
string sFilename = GameEventFile.get();
|
||||||
sFilename = CPath::standardizePath(IService::getInstance()->WriteFilesDirectory) + sFilename;
|
sFilename = CPath::standardizePath(IService::getInstance()->WriteFilesDirectory) + sFilename;
|
||||||
|
|
||||||
if (CFile::fileExists(sFilename))
|
if (CFile::fileExists(sFilename))
|
||||||
|
@ -302,7 +302,7 @@ void CGameEventManager::saveGameEventFile()
|
||||||
{
|
{
|
||||||
if( _InitOk )
|
if( _InitOk )
|
||||||
{
|
{
|
||||||
string sFilename = GameEventFile;
|
string sFilename = GameEventFile.get();
|
||||||
sFilename = CPath::standardizePath(IService::getInstance()->WriteFilesDirectory) + sFilename;
|
sFilename = CPath::standardizePath(IService::getInstance()->WriteFilesDirectory) + sFilename;
|
||||||
|
|
||||||
static CPersistentDataRecordRyzomStore pdr;
|
static CPersistentDataRecordRyzomStore pdr;
|
||||||
|
|
|
@ -298,7 +298,7 @@ void CGuildContainerPD::pds__fetch(RY_PDS::CPData &data)
|
||||||
TGuildId __k;
|
TGuildId __k;
|
||||||
data.serial(__k);
|
data.serial(__k);
|
||||||
CGuildPD* __o = static_cast<CGuildPD*>(PDSLib.create(tableIndex));
|
CGuildPD* __o = static_cast<CGuildPD*>(PDSLib.create(tableIndex));
|
||||||
_Guilds.insert(std::make_pair<TGuildId,CGuildPD*>(__k, __o));
|
_Guilds.insert(std::pair<TGuildId,CGuildPD*>(__k, __o));
|
||||||
PDSLib.setRowIndex(rowIndex, __o);
|
PDSLib.setRowIndex(rowIndex, __o);
|
||||||
__o->pds__fetch(data);
|
__o->pds__fetch(data);
|
||||||
__o->pds__setParentUnnotified(this);
|
__o->pds__setParentUnnotified(this);
|
||||||
|
|
|
@ -470,7 +470,7 @@ void CGuildPD::pds__fetch(RY_PDS::CPData &data)
|
||||||
TCharacterId __k;
|
TCharacterId __k;
|
||||||
data.serial(__k);
|
data.serial(__k);
|
||||||
CGuildMemberPD* __o = static_cast<CGuildMemberPD*>(PDSLib.create(tableIndex));
|
CGuildMemberPD* __o = static_cast<CGuildMemberPD*>(PDSLib.create(tableIndex));
|
||||||
_Members.insert(std::make_pair<TCharacterId,CGuildMemberPD*>(__k, __o));
|
_Members.insert(std::pair<TCharacterId,CGuildMemberPD*>(__k, __o));
|
||||||
PDSLib.setRowIndex(rowIndex, __o);
|
PDSLib.setRowIndex(rowIndex, __o);
|
||||||
__o->pds__fetch(data);
|
__o->pds__fetch(data);
|
||||||
__o->pds__setParentUnnotified(this);
|
__o->pds__setParentUnnotified(this);
|
||||||
|
|
|
@ -48,7 +48,7 @@ CMissionQueueManager::CMissionQueueManager()
|
||||||
// ----------------------------------------------------------------------------
|
// ----------------------------------------------------------------------------
|
||||||
void CMissionQueueManager::init()
|
void CMissionQueueManager::init()
|
||||||
{
|
{
|
||||||
string sFilename = MissionQueueFile;
|
string sFilename = MissionQueueFile.get();
|
||||||
sFilename = Bsi.getLocalPath() + sFilename;
|
sFilename = Bsi.getLocalPath() + sFilename;
|
||||||
|
|
||||||
if (CFile::fileExists(sFilename))
|
if (CFile::fileExists(sFilename))
|
||||||
|
@ -141,7 +141,7 @@ void CMissionQueueManager::saveToFile()
|
||||||
|
|
||||||
if( _InitOk )
|
if( _InitOk )
|
||||||
{
|
{
|
||||||
string sFilename = MissionQueueFile;
|
string sFilename = MissionQueueFile.get();
|
||||||
|
|
||||||
// save file via Backup Service (BS)
|
// save file via Backup Service (BS)
|
||||||
try
|
try
|
||||||
|
|
|
@ -328,7 +328,7 @@ void CActiveStepPD::pds__fetch(RY_PDS::CPData &data)
|
||||||
if (rowIndex == RY_PDS::INVALID_ROW_INDEX || tableIndex == RY_PDS::INVALID_TABLE_INDEX) break;
|
if (rowIndex == RY_PDS::INVALID_ROW_INDEX || tableIndex == RY_PDS::INVALID_TABLE_INDEX) break;
|
||||||
uint32 __k;
|
uint32 __k;
|
||||||
data.serial(__k);
|
data.serial(__k);
|
||||||
_States.insert(std::make_pair<uint32,CActiveStepStatePD>(__k, CActiveStepStatePD()));
|
_States.insert(std::pair<uint32,CActiveStepStatePD>(__k, CActiveStepStatePD()));
|
||||||
CActiveStepStatePD* __o = &(_States[__k]);
|
CActiveStepStatePD* __o = &(_States[__k]);
|
||||||
PDSLib.setRowIndex(rowIndex, __o);
|
PDSLib.setRowIndex(rowIndex, __o);
|
||||||
__o->pds__fetch(data);
|
__o->pds__fetch(data);
|
||||||
|
@ -2353,7 +2353,7 @@ void CMissionPD::pds__fetch(RY_PDS::CPData &data)
|
||||||
if (rowIndex == RY_PDS::INVALID_ROW_INDEX || tableIndex == RY_PDS::INVALID_TABLE_INDEX) break;
|
if (rowIndex == RY_PDS::INVALID_ROW_INDEX || tableIndex == RY_PDS::INVALID_TABLE_INDEX) break;
|
||||||
uint32 __k;
|
uint32 __k;
|
||||||
data.serial(__k);
|
data.serial(__k);
|
||||||
_Steps.insert(std::make_pair<uint32,CActiveStepPD>(__k, CActiveStepPD()));
|
_Steps.insert(std::pair<uint32,CActiveStepPD>(__k, CActiveStepPD()));
|
||||||
CActiveStepPD* __o = &(_Steps[__k]);
|
CActiveStepPD* __o = &(_Steps[__k]);
|
||||||
PDSLib.setRowIndex(rowIndex, __o);
|
PDSLib.setRowIndex(rowIndex, __o);
|
||||||
__o->pds__fetch(data);
|
__o->pds__fetch(data);
|
||||||
|
@ -2367,7 +2367,7 @@ void CMissionPD::pds__fetch(RY_PDS::CPData &data)
|
||||||
if (rowIndex == RY_PDS::INVALID_ROW_INDEX || tableIndex == RY_PDS::INVALID_TABLE_INDEX) break;
|
if (rowIndex == RY_PDS::INVALID_ROW_INDEX || tableIndex == RY_PDS::INVALID_TABLE_INDEX) break;
|
||||||
uint32 __k;
|
uint32 __k;
|
||||||
data.serial(__k);
|
data.serial(__k);
|
||||||
_Compass.insert(std::make_pair<uint32,CMissionCompassPD>(__k, CMissionCompassPD()));
|
_Compass.insert(std::pair<uint32,CMissionCompassPD>(__k, CMissionCompassPD()));
|
||||||
CMissionCompassPD* __o = &(_Compass[__k]);
|
CMissionCompassPD* __o = &(_Compass[__k]);
|
||||||
PDSLib.setRowIndex(rowIndex, __o);
|
PDSLib.setRowIndex(rowIndex, __o);
|
||||||
__o->pds__fetch(data);
|
__o->pds__fetch(data);
|
||||||
|
@ -2381,7 +2381,7 @@ void CMissionPD::pds__fetch(RY_PDS::CPData &data)
|
||||||
if (rowIndex == RY_PDS::INVALID_ROW_INDEX || tableIndex == RY_PDS::INVALID_TABLE_INDEX) break;
|
if (rowIndex == RY_PDS::INVALID_ROW_INDEX || tableIndex == RY_PDS::INVALID_TABLE_INDEX) break;
|
||||||
uint32 __k;
|
uint32 __k;
|
||||||
data.serial(__k);
|
data.serial(__k);
|
||||||
_StepsDone.insert(std::make_pair<uint32,CDoneStepPD>(__k, CDoneStepPD()));
|
_StepsDone.insert(std::pair<uint32,CDoneStepPD>(__k, CDoneStepPD()));
|
||||||
CDoneStepPD* __o = &(_StepsDone[__k]);
|
CDoneStepPD* __o = &(_StepsDone[__k]);
|
||||||
PDSLib.setRowIndex(rowIndex, __o);
|
PDSLib.setRowIndex(rowIndex, __o);
|
||||||
__o->pds__fetch(data);
|
__o->pds__fetch(data);
|
||||||
|
@ -2395,7 +2395,7 @@ void CMissionPD::pds__fetch(RY_PDS::CPData &data)
|
||||||
if (rowIndex == RY_PDS::INVALID_ROW_INDEX || tableIndex == RY_PDS::INVALID_TABLE_INDEX) break;
|
if (rowIndex == RY_PDS::INVALID_ROW_INDEX || tableIndex == RY_PDS::INVALID_TABLE_INDEX) break;
|
||||||
uint32 __k;
|
uint32 __k;
|
||||||
data.serial(__k);
|
data.serial(__k);
|
||||||
_Teleports.insert(std::make_pair<uint32,CMissionTeleportPD>(__k, CMissionTeleportPD()));
|
_Teleports.insert(std::pair<uint32,CMissionTeleportPD>(__k, CMissionTeleportPD()));
|
||||||
CMissionTeleportPD* __o = &(_Teleports[__k]);
|
CMissionTeleportPD* __o = &(_Teleports[__k]);
|
||||||
PDSLib.setRowIndex(rowIndex, __o);
|
PDSLib.setRowIndex(rowIndex, __o);
|
||||||
__o->pds__fetch(data);
|
__o->pds__fetch(data);
|
||||||
|
@ -2409,7 +2409,7 @@ void CMissionPD::pds__fetch(RY_PDS::CPData &data)
|
||||||
if (rowIndex == RY_PDS::INVALID_ROW_INDEX || tableIndex == RY_PDS::INVALID_TABLE_INDEX) break;
|
if (rowIndex == RY_PDS::INVALID_ROW_INDEX || tableIndex == RY_PDS::INVALID_TABLE_INDEX) break;
|
||||||
uint32 __k;
|
uint32 __k;
|
||||||
data.serial(__k);
|
data.serial(__k);
|
||||||
_InsidePlaces.insert(std::make_pair<uint32,CMissionInsidePlacePD>(__k, CMissionInsidePlacePD()));
|
_InsidePlaces.insert(std::pair<uint32,CMissionInsidePlacePD>(__k, CMissionInsidePlacePD()));
|
||||||
CMissionInsidePlacePD* __o = &(_InsidePlaces[__k]);
|
CMissionInsidePlacePD* __o = &(_InsidePlaces[__k]);
|
||||||
PDSLib.setRowIndex(rowIndex, __o);
|
PDSLib.setRowIndex(rowIndex, __o);
|
||||||
__o->pds__fetch(data);
|
__o->pds__fetch(data);
|
||||||
|
@ -2423,7 +2423,7 @@ void CMissionPD::pds__fetch(RY_PDS::CPData &data)
|
||||||
if (rowIndex == RY_PDS::INVALID_ROW_INDEX || tableIndex == RY_PDS::INVALID_TABLE_INDEX) break;
|
if (rowIndex == RY_PDS::INVALID_ROW_INDEX || tableIndex == RY_PDS::INVALID_TABLE_INDEX) break;
|
||||||
uint32 __k;
|
uint32 __k;
|
||||||
data.serial(__k);
|
data.serial(__k);
|
||||||
_OutsidePlaces.insert(std::make_pair<uint32,CMissionOutsidePlacePD>(__k, CMissionOutsidePlacePD()));
|
_OutsidePlaces.insert(std::pair<uint32,CMissionOutsidePlacePD>(__k, CMissionOutsidePlacePD()));
|
||||||
CMissionOutsidePlacePD* __o = &(_OutsidePlaces[__k]);
|
CMissionOutsidePlacePD* __o = &(_OutsidePlaces[__k]);
|
||||||
PDSLib.setRowIndex(rowIndex, __o);
|
PDSLib.setRowIndex(rowIndex, __o);
|
||||||
__o->pds__fetch(data);
|
__o->pds__fetch(data);
|
||||||
|
@ -2437,7 +2437,7 @@ void CMissionPD::pds__fetch(RY_PDS::CPData &data)
|
||||||
if (rowIndex == RY_PDS::INVALID_ROW_INDEX || tableIndex == RY_PDS::INVALID_TABLE_INDEX) break;
|
if (rowIndex == RY_PDS::INVALID_ROW_INDEX || tableIndex == RY_PDS::INVALID_TABLE_INDEX) break;
|
||||||
uint32 __k;
|
uint32 __k;
|
||||||
data.serial(__k);
|
data.serial(__k);
|
||||||
_HandledAIGroups.insert(std::make_pair<uint32,CHandledAIGroupPD>(__k, CHandledAIGroupPD()));
|
_HandledAIGroups.insert(std::pair<uint32,CHandledAIGroupPD>(__k, CHandledAIGroupPD()));
|
||||||
CHandledAIGroupPD* __o = &(_HandledAIGroups[__k]);
|
CHandledAIGroupPD* __o = &(_HandledAIGroups[__k]);
|
||||||
PDSLib.setRowIndex(rowIndex, __o);
|
PDSLib.setRowIndex(rowIndex, __o);
|
||||||
__o->pds__fetch(data);
|
__o->pds__fetch(data);
|
||||||
|
@ -3276,7 +3276,7 @@ void CMissionContainerPD::pds__fetch(RY_PDS::CPData &data)
|
||||||
uint32 __k;
|
uint32 __k;
|
||||||
data.serial(__k);
|
data.serial(__k);
|
||||||
CMissionPD* __o = static_cast<CMissionPD*>(PDSLib.create(tableIndex));
|
CMissionPD* __o = static_cast<CMissionPD*>(PDSLib.create(tableIndex));
|
||||||
_Missions.insert(std::make_pair<uint32,CMissionPD*>(__k, __o));
|
_Missions.insert(std::pair<uint32,CMissionPD*>(__k, __o));
|
||||||
PDSLib.setRowIndex(rowIndex, __o);
|
PDSLib.setRowIndex(rowIndex, __o);
|
||||||
__o->pds__fetch(data);
|
__o->pds__fetch(data);
|
||||||
__o->pds__setParentUnnotified(this);
|
__o->pds__setParentUnnotified(this);
|
||||||
|
|
Loading…
Reference in a new issue