Ryzom
/
ryzom-core
1
1
Fork 0
Code Issues 38 Pull Requests Projects 1 Releases 1 Activity

Merge

Browse Source
hg/feature/sound
kervala 15 years ago
parent e41e144d99 6bc0e6d202
commit b25c2fa105
41 changed files with 267 additions and 78 deletions
Show Stats Download Patch File Download Diff File

9
.hgignore
Unescape Escape View File

@ -39,6 +39,7 @@ default_c
*.Po
*.Plo
*.o
*.so
*.so.*
*_debug
@ -93,6 +94,12 @@ ipch
*.idb
*.sdf
# Ryzom server garbage
aes_nagios_report.txt
aes_state.txt
*.launch_ctrl
*.state
# Vim and kwrite cache
*~
@ -112,7 +119,9 @@ moc_*.cpp
*.orig
*.cachefile
*.cache
*.patch
*.7z
external
# Linux nel compile
code/nel/build/nel-config

4
code/nel/include/nel/misc/mutex.h
Unescape Escape View File

@ -611,13 +611,13 @@ public:
CAccessor(CUnfairSynchronized<T> *cs)
{
Synchronized = cs;
const_cast<CMutex&>(Synchronized->_Mutex).enter();
const_cast<CUnfairMutex&>(Synchronized->_Mutex).enter();
}
/// release the mutex
~CAccessor()
{
const_cast<CMutex&>(Synchronized->_Mutex).leave();
const_cast<CUnfairMutex&>(Synchronized->_Mutex).leave();
}
/// access to the Value

2
code/nel/include/nel/misc/task_manager.h
Unescape Escape View File

@ -140,7 +140,7 @@ protected:
/// queue of tasks, using list container instead of queue for DeleteTask methode
CSynchronized<std::string> _RunningTask;
CSynchronized<std::list<CWaitingTask> > _TaskQueue;
CUnfairSynchronized<std::list<CWaitingTask> > _TaskQueue;
CSynchronized<std::deque<std::string> > _DoneTaskQueue;
/// thread pointer

8
code/nel/src/misc/async_file_manager.cpp
Unescape Escape View File

@ -67,7 +67,7 @@ void CAsyncFileManager::addLoadTask(IRunnable *ploadTask)
bool CAsyncFileManager::cancelLoadTask(const CAsyncFileManager::ICancelCallback &callback)
{
CSynchronized<list<CWaitingTask> >::CAccessor acces(&_TaskQueue);
CUnfairSynchronized<list<CWaitingTask> >::CAccessor acces(&_TaskQueue);
list<CWaitingTask> &rTaskQueue = acces.value ();
list<CWaitingTask>::iterator it = rTaskQueue.begin();
@ -87,7 +87,7 @@ bool CAsyncFileManager::cancelLoadTask(const CAsyncFileManager::ICancelCallback
}
// If not found, the current running task may be the one we want to cancel. Must wait it.
// Beware that this code works because of the CSynchronized access we made above (ensure that the
// Beware that this code works because of the CUnfairSynchronized access we made above (ensure that the
// taskmanager will end just the current task async (if any) and won't start an other one.
waitCurrentTaskToComplete ();
@ -105,7 +105,7 @@ void CAsyncFileManager::loadMesh(const std::string& meshName, IShape **ppShp, ID
/*
bool CAsyncFileManager::cancelLoadMesh(const std::string& sMeshName)
{
CSynchronized<list<IRunnable *> >::CAccessor acces(&_TaskQueue);
CUnfairSynchronized<list<IRunnable *> >::CAccessor acces(&_TaskQueue);
list<IRunnable*> &rTaskQueue = acces.value ();
list<IRunnable*>::iterator it = rTaskQueue.begin();
@ -167,7 +167,7 @@ void CAsyncFileManager::signal (bool *pSgn)
void CAsyncFileManager::cancelSignal (bool *pSgn)
{
CSynchronized<list<CWaitingTask> >::CAccessor acces(&_TaskQueue);
CUnfairSynchronized<list<CWaitingTask> >::CAccessor acces(&_TaskQueue);
list<CWaitingTask> &rTaskQueue = acces.value ();
list<CWaitingTask>::iterator it = rTaskQueue.begin();

2
code/nel/src/misc/i_xml.cpp
Unescape Escape View File

@ -101,7 +101,7 @@ void CIXml::release ()
// Free it
xmlClearParserCtxt (_Parser);
xmlFreeParserCtxt (_Parser);
xmlCleanupParser ();
// commented due to the bug #857 xmlCleanupParser ();
_Parser = NULL;
}

16
code/nel/src/misc/task_manager.cpp
Unescape Escape View File

@ -49,7 +49,7 @@ CTaskManager::~CTaskManager()
nlSleep(10);
// There should be no remaining Tasks
CSynchronized<std::list<CWaitingTask> >::CAccessor acces(&_TaskQueue);
CUnfairSynchronized<std::list<CWaitingTask> >::CAccessor acces(&_TaskQueue);
nlassert(acces.value().empty());
_Thread->wait();
delete _Thread;
@ -65,7 +65,7 @@ void CTaskManager::run(void)
while(_ThreadRunning)
{
{
CSynchronized<list<CWaitingTask> >::CAccessor acces(&_TaskQueue);
CUnfairSynchronized<list<CWaitingTask> >::CAccessor acces(&_TaskQueue);
if(acces.value().empty())
{
runnableTask = NULL;
@ -126,14 +126,14 @@ void CTaskManager::run(void)
// Add a task to TaskManager
void CTaskManager::addTask(IRunnable *r, float priority)
{
CSynchronized<std::list<CWaitingTask> >::CAccessor acces(&_TaskQueue);
CUnfairSynchronized<std::list<CWaitingTask> >::CAccessor acces(&_TaskQueue);
acces.value().push_back(CWaitingTask(r, priority));
}
/// Delete a task, only if task is not running, return true if found and deleted
bool CTaskManager::deleteTask(IRunnable *r)
{
CSynchronized<list<CWaitingTask> >::CAccessor acces(&_TaskQueue);
CUnfairSynchronized<list<CWaitingTask> >::CAccessor acces(&_TaskQueue);
for(list<CWaitingTask>::iterator it = acces.value().begin(); it != acces.value().end(); it++)
{
if(it->Task == r)
@ -148,7 +148,7 @@ bool CTaskManager::deleteTask(IRunnable *r)
/// Task list size
uint CTaskManager::taskListSize(void)
{
CSynchronized<list<CWaitingTask> >::CAccessor acces(&_TaskQueue);
CUnfairSynchronized<list<CWaitingTask> >::CAccessor acces(&_TaskQueue);
return acces.value().size();
}
@ -164,7 +164,7 @@ void CTaskManager::waitCurrentTaskToComplete ()
void CTaskManager::dump (std::vector<std::string> &result)
{
CSynchronized<string>::CAccessor accesCurrent(&_RunningTask);
CSynchronized<list<CWaitingTask> >::CAccessor acces(&_TaskQueue);
CUnfairSynchronized<list<CWaitingTask> >::CAccessor acces(&_TaskQueue);
CSynchronized<deque<string> >::CAccessor accesDone(&_DoneTaskQueue);
const list<CWaitingTask> &taskList = acces.value();
@ -215,7 +215,7 @@ void CTaskManager::clearDump()
uint CTaskManager::getNumWaitingTasks()
{
CSynchronized<list<CWaitingTask> >::CAccessor acces(&_TaskQueue);
CUnfairSynchronized<list<CWaitingTask> >::CAccessor acces(&_TaskQueue);
return acces.value().size();
}
@ -225,7 +225,7 @@ void CTaskManager::changeTaskPriority ()
{
if (_ChangePriorityCallback)
{
CSynchronized<list<CWaitingTask> >::CAccessor acces(&_TaskQueue);
CUnfairSynchronized<list<CWaitingTask> >::CAccessor acces(&_TaskQueue);
list<CWaitingTask> &taskList = acces.value();
list<CWaitingTask>::iterator ite = taskList.begin();

2
code/nelns/admin_service/admin_service.vcproj
Unescape Escape View File

@ -64,7 +64,7 @@
/>
<Tool
Name="VCLinkerTool"
AdditionalDependencies="winmm.lib odbc32.lib odbccp32.lib ws2_32.lib libxml2.lib zlib.lib freetype.lib mysqlclientd.lib"
AdditionalDependencies="winmm.lib odbc32.lib odbccp32.lib ws2_32.lib libxml2.lib zlib.lib freetype.lib mysqlclient.lib"
OutputFile="$(RootNamespace)_d.exe"
SuppressStartupBanner="true"
IgnoreDefaultLibraryNames="libc;libcmt;libcmtd;msvcrt"

15
code/ryzom/client/client_default.cfg
Unescape Escape View File

@ -39,15 +39,16 @@ Gamma_max = 1.0;
// NETWORK //
/////////////
Application = { "ryzom_live", "./client_ryzom_r.exe", "./" };
Application = { "ryzom_open", "./client_ryzom_r.exe", "./" };
BackgroundDownloader = 0;
PatchServer = "http://dl.ryzom.com/patch_live";
SignUpURL = "http://www.ryzom.com/subscribe";
StartupHost = "su1.ryzom.com:40916";
PatchServer = "";
PatchWanted = 0;
SignUpURL = "";
StartupHost = "open.ryzom.com:40916";
StartupPage = "/login/r2_login.php";
InstallStatsUrl = "http://su1.ryzom.com:50000/stats/stats.php";
CreateAccountURL = "https://secure.ryzom.com/signup/from_client.php";
InstallWebPage = "http://dl.ryzom.com/installer/";
InstallStatsUrl = "http://open.ryzom.com:50000/stats/stats.php";
CreateAccountURL = "";
InstallWebPage = "";
////////////////

5
code/ryzom/client/src/client_cfg.cpp
Unescape Escape View File

@ -294,7 +294,12 @@ CClientConfig::CClientConfig()
ForceDeltaTime = 0; // Default ForceDeltaTime, disabled by default
#ifdef NL_OS_WINDOWS
DisableDirectInput = false; // Default DisableDirectInput
#else
DisableDirectInput = true; // no direct input on linux
#endif
DisableDirectInputKeyboard = true; // Default DisableDirectInput fort he keyboard only
HardwareCursor = true; // Default HardwareCursor
HardwareCursorScale = 0.85f;

2
code/ryzom/client/src/client_sheets/animation_set_list_sheet.cpp
Unescape Escape View File

@ -493,7 +493,7 @@ void CAnimationStateSheet::serial(class NLMISC::IStream &f) throw(NLMISC::EStrea
// update statics maps
if (f.isReading())
{
_StringToAnimStateId.insert(pair<string, TAnimStateSheetId>::pair(sStateName, (TAnimStateSheetId)State));
_StringToAnimStateId.insert(pair<string, TAnimStateSheetId>(sStateName, (TAnimStateSheetId)State));
if (_AnimStateIdToString.size() <= State)
_AnimStateIdToString.resize(State+1);
_AnimStateIdToString[State] = sStateName;

14
code/ryzom/client/src/connection.cpp
Unescape Escape View File

@ -2118,9 +2118,9 @@ public:
{
vector< pair < string, string > > params;
params.clear();
params.push_back(pair<string,string>::pair("id", toString(Mainlands[i].Id)));
params.push_back(pair<string,string>("id", toString(Mainlands[i].Id)));
if (i>0)
params.push_back(pair<string,string>::pair("posref", "BL TL"));
params.push_back(pair<string,string>("posref", "BL TL"));
CInterfaceGroup *pNewLine =pIM->createGroupInstance("t_mainland", GROUP_LIST_MAINLAND, params);
if (pNewLine != NULL)
@ -2240,10 +2240,10 @@ public:
{
vector< pair < string, string > > params;
params.clear();
params.push_back(pair<string,string>::pair("id", id));
params.push_back(pair<string,string>("id", id));
if (!First)
{
params.push_back(pair<string,string>::pair("posref", "BL TL"));
params.push_back(pair<string,string>("posref", "BL TL"));
}
First = false;
CInterfaceManager *pIM = CInterfaceManager::getInstance();
@ -2712,9 +2712,9 @@ class CAHScenarioControl : public IActionHandler
{
vector< pair < string, string > > params;
params.clear();
params.push_back(pair<string,string>::pair("id", toString(Mainlands[i].Id)));
params.push_back(pair<string,string>::pair("w", "1024"));
params.push_back(pair<string,string>::pair("tooltip", "uiRingFilterShard"));
params.push_back(pair<string,string>("id", toString(Mainlands[i].Id)));
params.push_back(pair<string,string>("w", "1024"));
params.push_back(pair<string,string>("tooltip", "uiRingFilterShard"));
CInterfaceGroup *toggleGr =pIM->createGroupInstance("label_toggle_button", shardList->getId(), params);
shardList->addChild(toggleGr);
// set unicode name

2
code/ryzom/client/src/entity_animation_manager.cpp
Unescape Escape View File

@ -207,7 +207,7 @@ void CEntityAnimationManager::load(NLMISC::IProgressCallback &/* progress */, bo
string sTmp = strlwr(pASLS->AnimSetList[i].Name);
sTmp = sTmp.substr(0,sTmp.rfind('.'));
pair<map<string,CAnimationSet>::iterator, bool> it;
it = _AnimSet.insert(pair<string,CAnimationSet>::pair(sTmp,as));
it = _AnimSet.insert(pair<string,CAnimationSet>(sTmp,as));
it.first->second.init (&pASLS->AnimSetList[i], _AnimationSet);
}

2
code/ryzom/client/src/http_client.cpp
Unescape Escape View File

@ -193,7 +193,7 @@ void CHttpClient::disconnect()
// ***************************************************************************
bool CStartupHttpClient::connectToLogin()
{
return connect("open.ryzom.com:40916");
return connect(ClientCfg.ConfigFile.getVar("StartupHost").asString(0));
}
CStartupHttpClient HttpClient;

2
code/ryzom/client/src/interface_v3/interface_ddx.cpp
Unescape Escape View File

@ -961,7 +961,7 @@ void CDDXManager::release()
// ***************************************************************************
void CDDXManager::add(CInterfaceDDX *pDDX)
{
_DDXes.insert(pair<string,CInterfaceDDX*>::pair(pDDX->getId(),pDDX));
_DDXes.insert(pair<string,CInterfaceDDX*>(pDDX->getId(),pDDX));
}
// ***************************************************************************

2
code/ryzom/client/src/interface_v3/interface_parser.cpp
Unescape Escape View File

@ -248,7 +248,7 @@ public:
{
string sTmp = child->getId();
sTmp = sTmp.substr(_Id.size()+1,sTmp.size());
_Accel.insert(pair<string,CInterfaceGroup*>::pair(sTmp, child));
_Accel.insert(pair<string,CInterfaceGroup*>(sTmp, child));
CInterfaceGroup::addGroup(child,eltOrder);
}

10
code/ryzom/client/src/interface_v3/inventory_manager.cpp
Unescape Escape View File

@ -2795,17 +2795,17 @@ class CHandlerInvTempAll : public IActionHandler
// Try to put all items in the DB order in all the bags of the player : (bag, pa0-3, steed)
vector <pair <double, double> > BagsBulk;
BagsBulk.push_back(pair <double, double>::pair(pInv->getBagBulk(0), pInv->getMaxBagBulk(0)));
BagsBulk.push_back(pair <double, double>(pInv->getBagBulk(0), pInv->getMaxBagBulk(0)));
nlctassert(MAX_INVENTORY_ANIMAL==4);
if (pInv->isInventoryAvailable(INVENTORIES::pet_animal1))
BagsBulk.push_back(pair <double, double>::pair(pInv->getBagBulk(2), pInv->getMaxBagBulk(2)));
BagsBulk.push_back(pair <double, double>(pInv->getBagBulk(2), pInv->getMaxBagBulk(2)));
if (pInv->isInventoryAvailable(INVENTORIES::pet_animal2))
BagsBulk.push_back(pair <double, double>::pair(pInv->getBagBulk(3), pInv->getMaxBagBulk(3)));
BagsBulk.push_back(pair <double, double>(pInv->getBagBulk(3), pInv->getMaxBagBulk(3)));
if (pInv->isInventoryAvailable(INVENTORIES::pet_animal3))
BagsBulk.push_back(pair <double, double>::pair(pInv->getBagBulk(4), pInv->getMaxBagBulk(4)));
BagsBulk.push_back(pair <double, double>(pInv->getBagBulk(4), pInv->getMaxBagBulk(4)));
if (pInv->isInventoryAvailable(INVENTORIES::pet_animal4))
BagsBulk.push_back(pair <double, double>::pair(pInv->getBagBulk(4), pInv->getMaxBagBulk(4)));
BagsBulk.push_back(pair <double, double>(pInv->getBagBulk(4), pInv->getMaxBagBulk(4)));
bool bPlaceFound = true;

14
code/ryzom/client/src/interface_v3/macrocmd_key.cpp
Unescape Escape View File

@ -417,13 +417,13 @@ void CModalContainerEditCmd::create(const std::string &name, bool bDefKey, bool
pIM->getDbProp(DbComboDisp2P);
vector< pair<string,string> > vArgs;
vArgs.push_back(pair<string,string>::pair("id",name));
vArgs.push_back(pair<string,string>::pair("db_sel_cat",DbComboSelCat));
vArgs.push_back(pair<string,string>::pair("db_sel_act",DbComboSelAct));
vArgs.push_back(pair<string,string>::pair("db_sel_1p",DbComboSel1P));
vArgs.push_back(pair<string,string>::pair("db_sel_2p",DbComboSel2P));
vArgs.push_back(pair<string,string>::pair("db_disp_1p",DbComboDisp1P));
vArgs.push_back(pair<string,string>::pair("db_disp_2p",DbComboDisp2P));
vArgs.push_back(pair<string,string>("id",name));
vArgs.push_back(pair<string,string>("db_sel_cat",DbComboSelCat));
vArgs.push_back(pair<string,string>("db_sel_act",DbComboSelAct));
vArgs.push_back(pair<string,string>("db_sel_1p",DbComboSel1P));
vArgs.push_back(pair<string,string>("db_sel_2p",DbComboSel2P));
vArgs.push_back(pair<string,string>("db_disp_1p",DbComboDisp1P));
vArgs.push_back(pair<string,string>("db_disp_2p",DbComboDisp2P));
Win = dynamic_cast<CGroupContainer*>(pIM->createGroupInstance(TEMPLATE_EDITCMD, "ui:interface", vArgs));
if (Win == NULL)

8
code/ryzom/client/src/interface_v3/people_list.cpp
Unescape Escape View File

@ -73,13 +73,13 @@ bool CPeopleList::create(const CPeopleListDesc &desc, const CChatWindowDesc *cha
// create the base container
vector< pair<string, string> > baseContainerParams;
baseContainerParams.push_back(pair<string, string>::pair("id", desc.Id));
baseContainerParams.push_back(pair<string, string>("id", desc.Id));
std::string baseId;
if (fatherContainer == NULL)
{
baseContainerParams.push_back(pair<string, string>::pair("movable","true"));
baseContainerParams.push_back(pair<string, string>::pair("active","false"));
baseContainerParams.push_back(pair<string, string>::pair("opened","true"));
baseContainerParams.push_back(pair<string, string>("movable","true"));
baseContainerParams.push_back(pair<string, string>("active","false"));
baseContainerParams.push_back(pair<string, string>("opened","true"));
baseId = "ui:interface";
}
else

46
code/ryzom/client/src/login.cpp
Unescape Escape View File

@ -177,9 +177,9 @@ void createOptionalCatUI()
{
vector< pair < string, string > > params;
params.clear();
params.push_back(pair<string,string>::pair("id", "c"+toString(i)));
params.push_back(pair<string,string>("id", "c"+toString(i)));
if (i>0)
params.push_back(pair<string,string>::pair("posref", "BL TL"));
params.push_back(pair<string,string>("posref", "BL TL"));
CInterfaceGroup *pNewLine = pIM->createGroupInstance("t_cat", GROUP_LIST_CAT, params);
if (pNewLine != NULL)
@ -1103,9 +1103,9 @@ void initShardDisplay()
{
vector< pair < string, string > > params;
params.clear();
params.push_back(pair<string,string>::pair("id", "s"+toString(i)));
params.push_back(pair<string,string>("id", "s"+toString(i)));
if (i>0)
params.push_back(pair<string,string>::pair("posref", "BL TL"));
params.push_back(pair<string,string>("posref", "BL TL"));
CInterfaceGroup *pNewLine =pIM->createGroupInstance("t_shard", GROUP_LIST_SHARD, params);
if (pNewLine != NULL)
@ -1229,9 +1229,9 @@ void onlogin(bool vanishScreen = true)
// {
// vector< pair < string, string > > params;
// params.clear();
// params.push_back(pair<string,string>::pair("id", "s"+toString(i)));
// params.push_back(pair<string,string>("id", "s"+toString(i)));
// if (i>0)
// params.push_back(pair<string,string>::pair("posref", "BL TL"));
// params.push_back(pair<string,string>("posref", "BL TL"));
//
// CInterfaceGroup *pNewLine =pIM->createGroupInstance("t_shard", GROUP_LIST_SHARD, params);
// if (pNewLine != NULL)
@ -2033,23 +2033,23 @@ class CAHInitResLod : public IActionHandler
// first indicates the preset-able cfg-variable
// second indicates if its a double variable (else it's an int)
CfgPresetList.clear();
CfgPresetList.push_back(pair<string,bool>::pair("LandscapeTileNear", true));
CfgPresetList.push_back(pair<string,bool>::pair("LandscapeThreshold", true));
CfgPresetList.push_back(pair<string,bool>::pair("Vision", true));
CfgPresetList.push_back(pair<string,bool>::pair("MicroVeget", false));
CfgPresetList.push_back(pair<string,bool>::pair("MicroVegetDensity", true));
CfgPresetList.push_back(pair<string,bool>::pair("FxNbMaxPoly", false));
CfgPresetList.push_back(pair<string,bool>::pair("Cloud", false));
CfgPresetList.push_back(pair<string,bool>::pair("CloudQuality", true));
CfgPresetList.push_back(pair<string,bool>::pair("CloudUpdate", false));
CfgPresetList.push_back(pair<string,bool>::pair("Shadows", false));
CfgPresetList.push_back(pair<string,bool>::pair("SkinNbMaxPoly", false));
CfgPresetList.push_back(pair<string,bool>::pair("NbMaxSkeletonNotCLod", false));
CfgPresetList.push_back(pair<string,bool>::pair("CharacterFarClip", true));
CfgPresetList.push_back(pair<string,bool>::pair("Bloom", false));
CfgPresetList.push_back(pair<string,bool>::pair("SquareBloom", false));
CfgPresetList.push_back(pair<string,bool>::pair("DensityBloom", true));
CfgPresetList.push_back(pair<string,bool>("LandscapeTileNear", true));
CfgPresetList.push_back(pair<string,bool>("LandscapeThreshold", true));
CfgPresetList.push_back(pair<string,bool>("Vision", true));
CfgPresetList.push_back(pair<string,bool>("MicroVeget", false));
CfgPresetList.push_back(pair<string,bool>("MicroVegetDensity", true));
CfgPresetList.push_back(pair<string,bool>("FxNbMaxPoly", false));
CfgPresetList.push_back(pair<string,bool>("Cloud", false));
CfgPresetList.push_back(pair<string,bool>("CloudQuality", true));
CfgPresetList.push_back(pair<string,bool>("CloudUpdate", false));
CfgPresetList.push_back(pair<string,bool>("Shadows", false));
CfgPresetList.push_back(pair<string,bool>("SkinNbMaxPoly", false));
CfgPresetList.push_back(pair<string,bool>("NbMaxSkeletonNotCLod", false));
CfgPresetList.push_back(pair<string,bool>("CharacterFarClip", true));
CfgPresetList.push_back(pair<string,bool>("Bloom", false));
CfgPresetList.push_back(pair<string,bool>("SquareBloom", false));
CfgPresetList.push_back(pair<string,bool>("DensityBloom", true));
// Check if all the preset-able cfg-variable are in a preset mode
sint nPreset = -1;

4
code/ryzom/common/src/game_share/crypt.cpp
Unescape Escape View File

@ -116,7 +116,7 @@ static char rz_sccsid[] = "@(#)crypt.c 8.1 (Berkeley) 6/4/93";
* define "LONG_IS_32_BITS" only if sizeof(long)==4.
* This avoids use of bit fields (your compiler may be sloppy with them).
*/
#if !defined(cray)
#if !defined(cray) && !defined(__LP64__) && !defined(_LP64)
#define LONG_IS_32_BITS
#endif
@ -124,7 +124,7 @@ static char rz_sccsid[] = "@(#)crypt.c 8.1 (Berkeley) 6/4/93";
* define "B64" to be the declaration for a 64 bit integer.
* XXX this feature is currently unused, see "endian" comment below.
*/
#if defined(cray)
#if defined(cray) || defined(__LP64__) || defined(_LP64)
#define B64 long
#endif
#if defined(convex)

2
code/ryzom/server/admin_executor_service.cfg
Unescape Escape View File

@ -1,3 +1,5 @@
#include "admin_executor_service_default.cfg"
// I'm the AES, I'll not connect to myself!
DontUseAES = 1;
// I don't need a connection to a naming service

1
code/ryzom/server/admin_executor_service_default.cfg
Unescape Escape View File

@ -0,0 +1 @@
#include "common.cfg"

2
code/ryzom/server/admin_service_default.cfg
Unescape Escape View File

@ -1,3 +1,5 @@
#include "common.cfg"
DontUseNS = 1;
RRDToolPath = "rrdtool";

1
code/ryzom/server/ai_service_default.cfg
Unescape Escape View File

@ -1,3 +1,4 @@
#include "common.cfg"
// a list of system command that run at server startup.
SystemCmd = {};

1
code/ryzom/server/backup_service_default.cfg
Unescape Escape View File

@ -1,3 +1,4 @@
#include "common.cfg"
DontUseNS = BSDontUseNS;
NSHost = BSNSHost;

2
code/ryzom/server/common.cfg
Unescape Escape View File

@ -0,0 +1,2 @@
WindowStyle = "WIN";

1
code/ryzom/server/entities_game_service_default.cfg
Unescape Escape View File

@ -1,3 +1,4 @@
#include "common.cfg"
#ifndef DONT_USE_LGS_SLAVE

2
code/ryzom/server/frontend_service_default.cfg
Unescape Escape View File

@ -1,3 +1,5 @@
#include "common.cfg"
// Configure module gateway for front end operation
StartCommands +=
{

1
code/ryzom/server/gpm_service_default.cfg
Unescape Escape View File

@ -1,3 +1,4 @@
#include "common.cfg"
CheckPlayerSpeed = 0;
SecuritySpeedFactor = 1.5;

1
code/ryzom/server/input_output_service_default.cfg
Unescape Escape View File

@ -1,3 +1,4 @@
#include "common.cfg"
#ifndef DONT_USE_LGS_SLAVE

2
code/ryzom/server/logger_service.cfg
Unescape Escape View File

@ -1,4 +1,6 @@
// Use with commandline: logger_service -C. -L. --nobreak --writepid
#include "logger_service_default.cfg"
AESAliasName= "lgs";
ASWebPort="46700";

1
code/ryzom/server/logger_service_default.cfg
Unescape Escape View File

@ -0,0 +1 @@
#include "common.cfg"

1
code/ryzom/server/mail_forum_service_default.cfg
Unescape Escape View File

@ -1,3 +1,4 @@
#include "common.cfg"
WebRootDirectory = "save_shard/www";
DontUseNS = 1;

1
code/ryzom/server/mirror_service_default.cfg
Unescape Escape View File

@ -1,3 +1,4 @@
#include "common.cfg"
// Linux only
DestroyGhostSegments = 1;

1
code/ryzom/server/naming_service_default.cfg
Unescape Escape View File

@ -1,3 +1,4 @@
#include "common.cfg"
SId = 1;
DontUseNS = 1;

99
code/ryzom/server/shard_start.bat
Unescape Escape View File

@ -0,0 +1,99 @@
@echo off
REM This script will start all the services with good parameters
REM set MODE=Debug
set MODE=Release
rem AS
start %MODE%\ryzom_admin_service.exe --fulladminname=admin_executor_service --shortadminname=AES
rem wait 2s (yes, i didn't find a better way to wait N seconds)
ping -n 2 127.0.0.1 > NUL 2>&1
rem bms_master
start %MODE%\backup_service --writepid -P49990
rem wait 2s (yes, i didn't find a better way to wait N seconds)
ping -n 2 127.0.0.1 > NUL 2>&1
rem egs
start %MODE%\entities_game_service --writepid
rem wait 2s (yes, i didn't find a better way to wait N seconds)
ping -n 2 127.0.0.1 > NUL 2>&1
rem gpms
start %MODE%\gpm_service --writepid
rem wait 2s (yes, i didn't find a better way to wait N seconds)
ping -n 2 127.0.0.1 > NUL 2>&1
rem ios
start %MODE%\input_output_service --writepid
rem wait 2s (yes, i didn't find a better way to wait N seconds)
ping -n 2 127.0.0.1 > NUL 2>&1
rem rns
start %MODE%\ryzom_naming_service --writepid
rem wait 2s (yes, i didn't find a better way to wait N seconds)
ping -n 2 127.0.0.1 > NUL 2>&1
rem rws
start %MODE%\ryzom_welcome_service --writepid
rem wait 2s (yes, i didn't find a better way to wait N seconds)
ping -n 2 127.0.0.1 > NUL 2>&1
rem ts
start %MODE%\tick_service --writepid
rem wait 2s (yes, i didn't find a better way to wait N seconds)
ping -n 2 127.0.0.1 > NUL 2>&1
rem ms
start %MODE%\mirror_service --writepid
rem wait 2s (yes, i didn't find a better way to wait N seconds)
ping -n 2 127.0.0.1 > NUL 2>&1
rem ais_newbyland
start %MODE%\ai_service --writepid -mCommon:Newbieland:Post
rem wait 2s (yes, i didn't find a better way to wait N seconds)
ping -n 2 127.0.0.1 > NUL 2>&1
rem mfs
start %MODE%\mail_forum_service --writepid
rem wait 2s (yes, i didn't find a better way to wait N seconds)
ping -n 2 127.0.0.1 > NUL 2>&1
rem su
start %MODE%\shard_unifier_service --writepid
rem wait 2s (yes, i didn't find a better way to wait N seconds)
ping -n 2 127.0.0.1 > NUL 2>&1
rem fes
start %MODE%\frontend_service --writepid
rem wait 2s (yes, i didn't find a better way to wait N seconds)
ping -n 2 127.0.0.1 > NUL 2>&1
rem sbs
start %MODE%\session_browser_server --writepid
rem wait 2s (yes, i didn't find a better way to wait N seconds)
ping -n 2 127.0.0.1 > NUL 2>&1
rem lgs
start %MODE%\logger_service --writepid
rem wait 2s (yes, i didn't find a better way to wait N seconds)
ping -n 2 127.0.0.1 > NUL 2>&1
rem ras
start %MODE%\ryzom_admin_service --fulladminname=admin_service --shortadminname=AS --writepid

51
code/ryzom/server/shard_stop.bat
Unescape Escape View File

@ -0,0 +1,51 @@
@echo off
REM This script will kill all the services launched by shard_start.bat
rem AS
taskkill /IM ryzom_admin_service.exe
rem bms_master
taskkill /IM backup_service.exe
rem egs
taskkill /IM entities_game_service.exe
rem gpms
taskkill /IM gpm_service.exe
rem ios
taskkill /IM input_output_service.exe
rem rns
taskkill /IM ryzom_naming_service.exe
rem rws
taskkill /IM ryzom_welcome_service.exe
rem ts
taskkill /IM tick_service.exe
rem ms
taskkill /IM mirror_service.exe
rem ais_newbyland
taskkill /IM ai_service.exe
rem mfs
taskkill /IM mail_forum_service.exe
rem su
taskkill /IM shard_unifier_service.exe
rem fes
taskkill /IM frontend_service.exe
rem sbs
taskkill /IM session_browser_server.exe
rem lgs
taskkill /IM logger_service.exe
rem ras
taskkill /IM ryzom_admin_service.exe

2
code/ryzom/server/shard_unifier_service_default.cfg
Unescape Escape View File

@ -1,3 +1,5 @@
#include "common.cfg"
NSHost = SUNSHost;
DontUseNS = SUDontUseNS;

2
code/ryzom/server/src/entities_game_service/pvp_manager/pvp_manager_2.cpp
Unescape Escape View File

@ -1272,7 +1272,7 @@ NLMISC_COMMAND(setFactionWar, "Start/stop current wars between faction", "<Facti
return false;
}
if( faction1 < PVP_CLAN::BeginClans || faction1 > PVP_CLAN::EndClans )
if( faction2 < PVP_CLAN::BeginClans || faction2 > PVP_CLAN::EndClans )
{
log.displayNL("Invalid Faction2 name: '%s'", args[1].c_str());
return false;

1
code/ryzom/server/tick_service_default.cfg
Unescape Escape View File

@ -1,3 +1,4 @@
#include "common.cfg"
/// A list of vars to graph for TS
GraphVars +=

1
code/ryzom/server/welcome_service_default.cfg
Unescape Escape View File

@ -1,3 +1,4 @@
#include "common.cfg"
// short name of the frontend service
FrontendServiceName = "FS";

Write Preview
Loading…
Cancel
Save