Changed: #878 Fix typos in comments/code
This commit is contained in:
parent
2089386f65
commit
dea53c49b1
13 changed files with 65 additions and 61 deletions
|
@ -21,7 +21,7 @@
|
|||
#include <CoreFoundation/CoreFoundation.h>
|
||||
#endif
|
||||
|
||||
std::string getAppBundlePath()
|
||||
std::string getAppBundlePath()
|
||||
{
|
||||
static std::string cachedPathToBundle;
|
||||
|
||||
|
|
|
@ -165,7 +165,7 @@ void CSessionBrowser::run()
|
|||
}
|
||||
|
||||
disconnected:
|
||||
// unconnected, waiting for message to send
|
||||
// disconnected, waiting for message to send
|
||||
while (adaptor->_SendQueue.empty())
|
||||
{
|
||||
nlSleep(100);
|
||||
|
|
|
@ -8,7 +8,7 @@
|
|||
|
||||
AESAliasName = "bms_master";
|
||||
|
||||
Paths = {
|
||||
Paths += {
|
||||
".",
|
||||
"../common/data_leveldesign",
|
||||
};
|
||||
|
@ -25,7 +25,7 @@ WriteFilesDirectory = "data_shard";
|
|||
|
||||
WebPort = 49970;
|
||||
|
||||
// ---- service custom variables (used by CVariable class)
|
||||
// ---- service custom variables (used by CVariable class)
|
||||
|
||||
// BS - Root directory where data are backuped to
|
||||
IncrementalBackupDirectory = "../incremental_backup";
|
||||
|
|
|
@ -1,22 +1,23 @@
|
|||
#include "common.cfg"
|
||||
|
||||
// ---- service NeL variables (used by ConfigFile class)
|
||||
|
||||
|
||||
// ---- service NeL variables (used by ConfigFile class)
|
||||
|
||||
DontUseNS = 1;
|
||||
|
||||
// ---- service NeL variables (used by CVariable class)
|
||||
// ---- service NeL variables (used by CVariable class)
|
||||
|
||||
ListeningPort = 49990;
|
||||
|
||||
// ---- service custom variables (used by ConfigFile class)
|
||||
|
||||
|
||||
// ---- service custom variables (used by ConfigFile class)
|
||||
|
||||
// Listening port for the Web server to connect in
|
||||
|
||||
|
||||
WebPort = 49898;
|
||||
|
||||
|
||||
BSReadState = 1;
|
||||
|
||||
// ---- service custom variables (used by CVariable class)
|
||||
|
||||
|
||||
// ---- service custom variables (used by CVariable class)
|
||||
|
||||
// Port for the Layer 3 interface of the backup service
|
||||
L3ListeningPort = 49950;
|
||||
|
@ -25,7 +26,7 @@ L3ListeningPort = 49950;
|
|||
SaveTemplatePath = "$shard/characters/account_$userid_$charid$ext";
|
||||
|
||||
// character saves possible extension list
|
||||
SaveExtList = "_pdr.bin _pdr.xml .bin";
|
||||
SaveExtList = "_pdr.bin _pdr.xml .bin";
|
||||
|
||||
//BSFilePrefix = "R:/code/ryzom/r2_shard/";
|
||||
//BSFileSubst = "r2_shard/";
|
||||
|
|
|
@ -4,7 +4,7 @@
|
|||
ShardId = 302;
|
||||
|
||||
// Used by CVariable in WS
|
||||
PlayerLimit = 5000;
|
||||
PlayerLimit = 5000;
|
||||
|
||||
// Used to connect to AES (this file) and to set up AES service (admin_executor_service.cfg)
|
||||
AESPort="46702";
|
||||
|
@ -96,4 +96,5 @@ WriteFilesDirectory = "data_shard";
|
|||
|
||||
// ---- service custom variables (used by ConfigFile class)
|
||||
|
||||
// ---- service custom variables (used by CVariable class)
|
||||
|
||||
// ---- service custom variables (used by CVariable class)
|
||||
|
|
|
@ -22,22 +22,22 @@ StartCommands +=
|
|||
"lgs_gw.transportAdd L3Client masterL3c",
|
||||
// open the transport
|
||||
"lgs_gw.transportCmd masterL3c(connect addr="+MasterLGSHost+":"+L3MasterLGSPort+")",
|
||||
};
|
||||
|
||||
};
|
||||
|
||||
#ifndef DONT_USE_LGS_SLAVE
|
||||
|
||||
|
||||
StartCommands +=
|
||||
{
|
||||
// add a layer 3 server transport for slave logger service
|
||||
"lgs_gw.transportAdd L3Client slaveL3c",
|
||||
// open the transport
|
||||
"lgs_gw.transportCmd slaveL3c(connect addr="+SlaveLGSHost+":"+L3SlaveLGSPort+")",
|
||||
};
|
||||
|
||||
};
|
||||
|
||||
#endif
|
||||
|
||||
|
||||
StartCommands +=
|
||||
{
|
||||
{
|
||||
// Create a shard unifier client module
|
||||
"moduleManager.createModule ShardUnifierClient suc",
|
||||
// Create a client commands forwader module
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
#include "common.cfg"
|
||||
|
||||
|
||||
CheckPlayerSpeed = 0;
|
||||
SecuritySpeedFactor = 1.5;
|
||||
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
#include "common.cfg"
|
||||
|
||||
// ---- service NeL variables (used by ConfigFile class)
|
||||
|
||||
// ---- service NeL variables (used by ConfigFile class)
|
||||
|
||||
StartCommands +=
|
||||
{
|
||||
|
@ -23,22 +23,22 @@ StartCommands +=
|
|||
"lgs_gw.transportAdd L3Client masterL3c",
|
||||
// open the transport
|
||||
"lgs_gw.transportCmd masterL3c(connect addr="+MasterLGSHost+":"+L3MasterLGSPort+")",
|
||||
};
|
||||
|
||||
};
|
||||
|
||||
#ifndef DONT_USE_LGS_SLAVE
|
||||
|
||||
|
||||
StartCommands +=
|
||||
{
|
||||
{
|
||||
// add a layer 3 server transport for slave logger service
|
||||
"lgs_gw.transportAdd L3Client slaveL3c",
|
||||
// open the transport
|
||||
"lgs_gw.transportCmd slaveL3c(connect addr="+SlaveLGSHost+":"+L3SlaveLGSPort+")",
|
||||
};
|
||||
|
||||
};
|
||||
|
||||
#endif
|
||||
|
||||
|
||||
StartCommands +=
|
||||
{
|
||||
{
|
||||
// Create a chat unifier client
|
||||
"moduleManager.createModule ChatUnifierClient cuc",
|
||||
|
||||
|
@ -52,33 +52,34 @@ StartCommands +=
|
|||
};
|
||||
|
||||
#endif
|
||||
|
||||
// ---- service NeL variables (used by CVariable class)
|
||||
|
||||
// ---- service custom variables (used by ConfigFile class)
|
||||
|
||||
|
||||
// ---- service NeL variables (used by CVariable class)
|
||||
|
||||
// ---- service custom variables (used by ConfigFile class)
|
||||
|
||||
// a list of system command that can be run with "sysCmd" service command.
|
||||
SystemCmd = {};
|
||||
|
||||
|
||||
// IOS don't use work directory by default
|
||||
ReadTranslationWork = 0;
|
||||
TranslationWorkPath = "translation/work";
|
||||
|
||||
|
||||
// Global shard bot name translation file. You sould overide this
|
||||
// in input_output_service.cfg to specialize the file
|
||||
// depending on the shard main language.
|
||||
BotNameTranslationFile = "bot_names.txt";
|
||||
|
||||
|
||||
// Global shard event faction translation file. You sould override this
|
||||
// in input_output_service.cfg to specialize the file
|
||||
// depending on the shard main language.
|
||||
EventFactionTranslationFile = "event_factions.txt";
|
||||
|
||||
// ---- service custom variables (used by CVariable class)
|
||||
|
||||
|
||||
// ---- service custom variables (used by CVariable class)
|
||||
|
||||
// Activate/deactivate debugging of missing paremeter replacement
|
||||
DebugReplacementParameter = 1;
|
||||
|
||||
|
||||
// Default verbose debug flags:
|
||||
//-----------------------------
|
||||
|
||||
|
|
|
@ -1,14 +1,15 @@
|
|||
#include "common.cfg"
|
||||
|
||||
// ---- service NeL variables (used by ConfigFile class)
|
||||
|
||||
|
||||
// ---- service NeL variables (used by ConfigFile class)
|
||||
|
||||
DontUseNS = 1;
|
||||
|
||||
// ---- service NeL variables (used by CVariable class)
|
||||
|
||||
// ---- service custom variables (used by ConfigFile class)
|
||||
|
||||
// ---- service custom variables (used by CVariable class)
|
||||
|
||||
// ---- service NeL variables (used by CVariable class)
|
||||
|
||||
// ---- service custom variables (used by ConfigFile class)
|
||||
|
||||
|
||||
// ---- service custom variables (used by CVariable class)
|
||||
|
||||
WebRootDirectory = "save_shard/www";
|
||||
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
#include "common.cfg"
|
||||
|
||||
// ---- service custom variables (used by ConfigFile class)
|
||||
|
||||
// ---- service custom variables (used by ConfigFile class)
|
||||
|
||||
// Linux only
|
||||
DestroyGhostSegments = 1;
|
||||
|
|
|
@ -46,4 +46,5 @@ HomeMainlandNames =
|
|||
// The max number of ring points (aka ring access) for each ecosystem
|
||||
MaxRingPoints = "A1:D7:F7:J8:L6:R13";
|
||||
|
||||
// ---- service custom variables (used by CVariable class)
|
||||
|
||||
// ---- service custom variables (used by CVariable class)
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
#include "common.cfg"
|
||||
|
||||
DontUseNS = 1;
|
||||
|
||||
|
||||
StartCommands +=
|
||||
{
|
||||
// Create a gateway for global interconnection
|
||||
|
|
|
@ -7501,7 +7501,6 @@ void CCharacter::sendUserChar( uint32 userId, uint8 scenarioSeason, const R2::TU
|
|||
}
|
||||
}
|
||||
|
||||
|
||||
//-----------------------------------------------
|
||||
// Return the home mainland session id for a character
|
||||
TSessionId CCharacter::getHomeMainlandSessionId() const
|
||||
|
|
Loading…
Reference in a new issue