From 4b818d802378606600e301779cf95cd0261618a9 Mon Sep 17 00:00:00 2001 From: vl Date: Mon, 10 May 2010 10:33:46 +0200 Subject: [PATCH 01/15] Fixed: by default on linux DisableDirectInput is set to true --- code/ryzom/client/src/client_cfg.cpp | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/code/ryzom/client/src/client_cfg.cpp b/code/ryzom/client/src/client_cfg.cpp index a91100316..c7364dc69 100644 --- a/code/ryzom/client/src/client_cfg.cpp +++ b/code/ryzom/client/src/client_cfg.cpp @@ -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; From f07e02717d37205fdfe72d43cfd00ad07d6c9b4f Mon Sep 17 00:00:00 2001 From: vl Date: Mon, 10 May 2010 15:58:09 +0200 Subject: [PATCH 02/15] Added: ignore the external directory --- .hgignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.hgignore b/.hgignore index b05525f96..b1f9cbc75 100644 --- a/.hgignore +++ b/.hgignore @@ -9,6 +9,7 @@ ReleaseDebug DebugFast ReleaseDebugStatic DebugFastStatic +external # Test and application directories screenshots From 8933a655d5c0c871811244e6acc18aa01c00c762 Mon Sep 17 00:00:00 2001 From: vl Date: Mon, 10 May 2010 15:58:39 +0200 Subject: [PATCH 03/15] Changed: use the client cfg variable StartupHost to say where the login system is (not harcoded anymore) --- code/ryzom/client/src/http_client.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/ryzom/client/src/http_client.cpp b/code/ryzom/client/src/http_client.cpp index 1bdcd9d62..8bfcfe7a5 100644 --- a/code/ryzom/client/src/http_client.cpp +++ b/code/ryzom/client/src/http_client.cpp @@ -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; From 3ef160a921ef5dcf5694c91ec233f0f45be2fab0 Mon Sep 17 00:00:00 2001 From: vl Date: Mon, 10 May 2010 16:24:47 +0200 Subject: [PATCH 04/15] Added: even more ignore files --- .hgignore | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/.hgignore b/.hgignore index b1f9cbc75..7bde0bdd3 100644 --- a/.hgignore +++ b/.hgignore @@ -9,7 +9,6 @@ ReleaseDebug DebugFast ReleaseDebugStatic DebugFastStatic -external # Test and application directories screenshots @@ -94,6 +93,12 @@ ipch *.idb *.sdf +# Ryzom server garbage +aes_nagios_report.txt +aes_state.txt +*.launch_ctrl +*.state + # Vim and kwrite cache *~ @@ -113,7 +118,9 @@ moc_*.cpp *.orig *.cachefile *.cache +*.patch *.7z +external # Linux nel compile code/nel/build/nel-config From 50d6c2eb5fa0a593588ff4ebee2b85743a2978a5 Mon Sep 17 00:00:00 2001 From: vl Date: Mon, 10 May 2010 16:25:29 +0200 Subject: [PATCH 05/15] Added: default cfg include common.cfg --- code/ryzom/server/admin_executor_service.cfg | 2 ++ code/ryzom/server/admin_executor_service_default.cfg | 1 + code/ryzom/server/admin_service_default.cfg | 2 ++ code/ryzom/server/ai_service_default.cfg | 1 + code/ryzom/server/backup_service_default.cfg | 1 + code/ryzom/server/entities_game_service_default.cfg | 1 + code/ryzom/server/frontend_service_default.cfg | 2 ++ code/ryzom/server/gpm_service_default.cfg | 1 + code/ryzom/server/input_output_service_default.cfg | 1 + code/ryzom/server/logger_service.cfg | 2 ++ code/ryzom/server/logger_service_default.cfg | 1 + code/ryzom/server/mail_forum_service_default.cfg | 1 + code/ryzom/server/mirror_service_default.cfg | 1 + code/ryzom/server/naming_service_default.cfg | 1 + code/ryzom/server/shard_unifier_service_default.cfg | 2 ++ code/ryzom/server/tick_service_default.cfg | 1 + code/ryzom/server/welcome_service_default.cfg | 1 + 17 files changed, 22 insertions(+) create mode 100644 code/ryzom/server/admin_executor_service_default.cfg create mode 100644 code/ryzom/server/logger_service_default.cfg diff --git a/code/ryzom/server/admin_executor_service.cfg b/code/ryzom/server/admin_executor_service.cfg index 3bf9f9273..0c54246a2 100644 --- a/code/ryzom/server/admin_executor_service.cfg +++ b/code/ryzom/server/admin_executor_service.cfg @@ -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 diff --git a/code/ryzom/server/admin_executor_service_default.cfg b/code/ryzom/server/admin_executor_service_default.cfg new file mode 100644 index 000000000..60d639fe1 --- /dev/null +++ b/code/ryzom/server/admin_executor_service_default.cfg @@ -0,0 +1 @@ +#include "common.cfg" diff --git a/code/ryzom/server/admin_service_default.cfg b/code/ryzom/server/admin_service_default.cfg index 75d0e61d6..59a96ad75 100644 --- a/code/ryzom/server/admin_service_default.cfg +++ b/code/ryzom/server/admin_service_default.cfg @@ -1,3 +1,5 @@ +#include "common.cfg" + DontUseNS = 1; RRDToolPath = "rrdtool"; diff --git a/code/ryzom/server/ai_service_default.cfg b/code/ryzom/server/ai_service_default.cfg index 92989c74e..a25d74af0 100644 --- a/code/ryzom/server/ai_service_default.cfg +++ b/code/ryzom/server/ai_service_default.cfg @@ -1,3 +1,4 @@ +#include "common.cfg" // a list of system command that run at server startup. SystemCmd = {}; diff --git a/code/ryzom/server/backup_service_default.cfg b/code/ryzom/server/backup_service_default.cfg index 20904ed4b..a1cf1868c 100644 --- a/code/ryzom/server/backup_service_default.cfg +++ b/code/ryzom/server/backup_service_default.cfg @@ -1,3 +1,4 @@ +#include "common.cfg" DontUseNS = BSDontUseNS; NSHost = BSNSHost; diff --git a/code/ryzom/server/entities_game_service_default.cfg b/code/ryzom/server/entities_game_service_default.cfg index 0f1458439..1d8dc73cc 100644 --- a/code/ryzom/server/entities_game_service_default.cfg +++ b/code/ryzom/server/entities_game_service_default.cfg @@ -1,3 +1,4 @@ +#include "common.cfg" #ifndef DONT_USE_LGS_SLAVE diff --git a/code/ryzom/server/frontend_service_default.cfg b/code/ryzom/server/frontend_service_default.cfg index 510a88749..cca2d9787 100644 --- a/code/ryzom/server/frontend_service_default.cfg +++ b/code/ryzom/server/frontend_service_default.cfg @@ -1,3 +1,5 @@ +#include "common.cfg" + // Configure module gateway for front end operation StartCommands += { diff --git a/code/ryzom/server/gpm_service_default.cfg b/code/ryzom/server/gpm_service_default.cfg index 97edad4ed..a6835c65c 100644 --- a/code/ryzom/server/gpm_service_default.cfg +++ b/code/ryzom/server/gpm_service_default.cfg @@ -1,3 +1,4 @@ +#include "common.cfg" CheckPlayerSpeed = 0; SecuritySpeedFactor = 1.5; diff --git a/code/ryzom/server/input_output_service_default.cfg b/code/ryzom/server/input_output_service_default.cfg index 9409f2f47..5bc2c6537 100644 --- a/code/ryzom/server/input_output_service_default.cfg +++ b/code/ryzom/server/input_output_service_default.cfg @@ -1,3 +1,4 @@ +#include "common.cfg" #ifndef DONT_USE_LGS_SLAVE diff --git a/code/ryzom/server/logger_service.cfg b/code/ryzom/server/logger_service.cfg index 55465c845..f6a80d1f2 100644 --- a/code/ryzom/server/logger_service.cfg +++ b/code/ryzom/server/logger_service.cfg @@ -1,4 +1,6 @@ // Use with commandline: logger_service -C. -L. --nobreak --writepid +#include "logger_service_default.cfg" + AESAliasName= "lgs"; ASWebPort="46700"; diff --git a/code/ryzom/server/logger_service_default.cfg b/code/ryzom/server/logger_service_default.cfg new file mode 100644 index 000000000..60d639fe1 --- /dev/null +++ b/code/ryzom/server/logger_service_default.cfg @@ -0,0 +1 @@ +#include "common.cfg" diff --git a/code/ryzom/server/mail_forum_service_default.cfg b/code/ryzom/server/mail_forum_service_default.cfg index 78dfa2040..84c499af6 100644 --- a/code/ryzom/server/mail_forum_service_default.cfg +++ b/code/ryzom/server/mail_forum_service_default.cfg @@ -1,3 +1,4 @@ +#include "common.cfg" WebRootDirectory = "save_shard/www"; DontUseNS = 1; diff --git a/code/ryzom/server/mirror_service_default.cfg b/code/ryzom/server/mirror_service_default.cfg index 379e75301..e46879247 100644 --- a/code/ryzom/server/mirror_service_default.cfg +++ b/code/ryzom/server/mirror_service_default.cfg @@ -1,3 +1,4 @@ +#include "common.cfg" // Linux only DestroyGhostSegments = 1; diff --git a/code/ryzom/server/naming_service_default.cfg b/code/ryzom/server/naming_service_default.cfg index 28405823d..bb1afcd16 100644 --- a/code/ryzom/server/naming_service_default.cfg +++ b/code/ryzom/server/naming_service_default.cfg @@ -1,3 +1,4 @@ +#include "common.cfg" SId = 1; DontUseNS = 1; diff --git a/code/ryzom/server/shard_unifier_service_default.cfg b/code/ryzom/server/shard_unifier_service_default.cfg index 91cf9ce41..e022cc4fb 100644 --- a/code/ryzom/server/shard_unifier_service_default.cfg +++ b/code/ryzom/server/shard_unifier_service_default.cfg @@ -1,3 +1,5 @@ +#include "common.cfg" + NSHost = SUNSHost; DontUseNS = SUDontUseNS; diff --git a/code/ryzom/server/tick_service_default.cfg b/code/ryzom/server/tick_service_default.cfg index 3830fb6b8..07ed6f2fb 100644 --- a/code/ryzom/server/tick_service_default.cfg +++ b/code/ryzom/server/tick_service_default.cfg @@ -1,3 +1,4 @@ +#include "common.cfg" /// A list of vars to graph for TS GraphVars += diff --git a/code/ryzom/server/welcome_service_default.cfg b/code/ryzom/server/welcome_service_default.cfg index ce7b47fd0..ecce7710c 100644 --- a/code/ryzom/server/welcome_service_default.cfg +++ b/code/ryzom/server/welcome_service_default.cfg @@ -1,3 +1,4 @@ +#include "common.cfg" // short name of the frontend service FrontendServiceName = "FS"; From bc25c7cdf86a11960dd571f0053aa63370e59b22 Mon Sep 17 00:00:00 2001 From: vl Date: Mon, 10 May 2010 16:26:02 +0200 Subject: [PATCH 06/15] Added: common.cfg include variable needed by all services (for example WindowStyle = "WIN"; ) --- code/ryzom/server/common.cfg | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 code/ryzom/server/common.cfg diff --git a/code/ryzom/server/common.cfg b/code/ryzom/server/common.cfg new file mode 100644 index 000000000..d1e291442 --- /dev/null +++ b/code/ryzom/server/common.cfg @@ -0,0 +1,2 @@ + +WindowStyle = "WIN"; From 45c8331db7ebfa696b310e799e91a5cee762b467 Mon Sep 17 00:00:00 2001 From: vl Date: Mon, 10 May 2010 16:26:23 +0200 Subject: [PATCH 07/15] Fixed: bad mysql lib name in debug --- code/nelns/admin_service/admin_service.vcproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/nelns/admin_service/admin_service.vcproj b/code/nelns/admin_service/admin_service.vcproj index bc995f56b..33a4b0c2c 100644 --- a/code/nelns/admin_service/admin_service.vcproj +++ b/code/nelns/admin_service/admin_service.vcproj @@ -64,7 +64,7 @@ /> Date: Mon, 10 May 2010 16:26:39 +0200 Subject: [PATCH 08/15] Added: 2 scripts to start/stop the shard on Windows --- code/ryzom/server/shard_start.bat | 99 +++++++++++++++++++++++++++++++ code/ryzom/server/shard_stop.bat | 51 ++++++++++++++++ 2 files changed, 150 insertions(+) create mode 100644 code/ryzom/server/shard_start.bat create mode 100644 code/ryzom/server/shard_stop.bat diff --git a/code/ryzom/server/shard_start.bat b/code/ryzom/server/shard_start.bat new file mode 100644 index 000000000..196c1c7d3 --- /dev/null +++ b/code/ryzom/server/shard_start.bat @@ -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 diff --git a/code/ryzom/server/shard_stop.bat b/code/ryzom/server/shard_stop.bat new file mode 100644 index 000000000..9429d23fb --- /dev/null +++ b/code/ryzom/server/shard_stop.bat @@ -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 From fb9f11120a167976471083e51dfbdfb6416cc486 Mon Sep 17 00:00:00 2001 From: thorbjorn Date: Sat, 8 May 2010 23:27:35 +0200 Subject: [PATCH 09/15] Fixed: Compile fixes for gcc 4.5.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Example: error: cannot call constructor ‘std::pair, CInterfaceDDX*>::pair’ directly error: for a function-style cast, remove the redundant ‘::pair’ --- .../animation_set_list_sheet.cpp | 2 +- code/ryzom/client/src/connection.cpp | 14 +++--- .../client/src/entity_animation_manager.cpp | 2 +- .../client/src/interface_v3/interface_ddx.cpp | 2 +- .../src/interface_v3/interface_parser.cpp | 2 +- .../src/interface_v3/inventory_manager.cpp | 10 ++--- .../client/src/interface_v3/macrocmd_key.cpp | 14 +++--- .../client/src/interface_v3/people_list.cpp | 8 ++-- code/ryzom/client/src/login.cpp | 44 +++++++++---------- 9 files changed, 49 insertions(+), 49 deletions(-) diff --git a/code/ryzom/client/src/client_sheets/animation_set_list_sheet.cpp b/code/ryzom/client/src/client_sheets/animation_set_list_sheet.cpp index 3e43bab20..9361e03be 100644 --- a/code/ryzom/client/src/client_sheets/animation_set_list_sheet.cpp +++ b/code/ryzom/client/src/client_sheets/animation_set_list_sheet.cpp @@ -493,7 +493,7 @@ void CAnimationStateSheet::serial(class NLMISC::IStream &f) throw(NLMISC::EStrea // update statics maps if (f.isReading()) { - _StringToAnimStateId.insert(pair::pair(sStateName, (TAnimStateSheetId)State)); + _StringToAnimStateId.insert(pair(sStateName, (TAnimStateSheetId)State)); if (_AnimStateIdToString.size() <= State) _AnimStateIdToString.resize(State+1); _AnimStateIdToString[State] = sStateName; diff --git a/code/ryzom/client/src/connection.cpp b/code/ryzom/client/src/connection.cpp index dea96674c..9fb943601 100644 --- a/code/ryzom/client/src/connection.cpp +++ b/code/ryzom/client/src/connection.cpp @@ -2118,9 +2118,9 @@ public: { vector< pair < string, string > > params; params.clear(); - params.push_back(pair::pair("id", toString(Mainlands[i].Id))); + params.push_back(pair("id", toString(Mainlands[i].Id))); if (i>0) - params.push_back(pair::pair("posref", "BL TL")); + params.push_back(pair("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::pair("id", id)); + params.push_back(pair("id", id)); if (!First) { - params.push_back(pair::pair("posref", "BL TL")); + params.push_back(pair("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::pair("id", toString(Mainlands[i].Id))); - params.push_back(pair::pair("w", "1024")); - params.push_back(pair::pair("tooltip", "uiRingFilterShard")); + params.push_back(pair("id", toString(Mainlands[i].Id))); + params.push_back(pair("w", "1024")); + params.push_back(pair("tooltip", "uiRingFilterShard")); CInterfaceGroup *toggleGr =pIM->createGroupInstance("label_toggle_button", shardList->getId(), params); shardList->addChild(toggleGr); // set unicode name diff --git a/code/ryzom/client/src/entity_animation_manager.cpp b/code/ryzom/client/src/entity_animation_manager.cpp index 04148db6f..0e16168ce 100644 --- a/code/ryzom/client/src/entity_animation_manager.cpp +++ b/code/ryzom/client/src/entity_animation_manager.cpp @@ -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::iterator, bool> it; - it = _AnimSet.insert(pair::pair(sTmp,as)); + it = _AnimSet.insert(pair(sTmp,as)); it.first->second.init (&pASLS->AnimSetList[i], _AnimationSet); } diff --git a/code/ryzom/client/src/interface_v3/interface_ddx.cpp b/code/ryzom/client/src/interface_v3/interface_ddx.cpp index a857b471d..b987f9cf9 100644 --- a/code/ryzom/client/src/interface_v3/interface_ddx.cpp +++ b/code/ryzom/client/src/interface_v3/interface_ddx.cpp @@ -961,7 +961,7 @@ void CDDXManager::release() // *************************************************************************** void CDDXManager::add(CInterfaceDDX *pDDX) { - _DDXes.insert(pair::pair(pDDX->getId(),pDDX)); + _DDXes.insert(pair(pDDX->getId(),pDDX)); } // *************************************************************************** diff --git a/code/ryzom/client/src/interface_v3/interface_parser.cpp b/code/ryzom/client/src/interface_v3/interface_parser.cpp index 07d0120bb..16cd02f1a 100644 --- a/code/ryzom/client/src/interface_v3/interface_parser.cpp +++ b/code/ryzom/client/src/interface_v3/interface_parser.cpp @@ -248,7 +248,7 @@ public: { string sTmp = child->getId(); sTmp = sTmp.substr(_Id.size()+1,sTmp.size()); - _Accel.insert(pair::pair(sTmp, child)); + _Accel.insert(pair(sTmp, child)); CInterfaceGroup::addGroup(child,eltOrder); } diff --git a/code/ryzom/client/src/interface_v3/inventory_manager.cpp b/code/ryzom/client/src/interface_v3/inventory_manager.cpp index b8fa5cda5..0755e2247 100644 --- a/code/ryzom/client/src/interface_v3/inventory_manager.cpp +++ b/code/ryzom/client/src/interface_v3/inventory_manager.cpp @@ -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 > BagsBulk; - BagsBulk.push_back(pair ::pair(pInv->getBagBulk(0), pInv->getMaxBagBulk(0))); + BagsBulk.push_back(pair (pInv->getBagBulk(0), pInv->getMaxBagBulk(0))); nlctassert(MAX_INVENTORY_ANIMAL==4); if (pInv->isInventoryAvailable(INVENTORIES::pet_animal1)) - BagsBulk.push_back(pair ::pair(pInv->getBagBulk(2), pInv->getMaxBagBulk(2))); + BagsBulk.push_back(pair (pInv->getBagBulk(2), pInv->getMaxBagBulk(2))); if (pInv->isInventoryAvailable(INVENTORIES::pet_animal2)) - BagsBulk.push_back(pair ::pair(pInv->getBagBulk(3), pInv->getMaxBagBulk(3))); + BagsBulk.push_back(pair (pInv->getBagBulk(3), pInv->getMaxBagBulk(3))); if (pInv->isInventoryAvailable(INVENTORIES::pet_animal3)) - BagsBulk.push_back(pair ::pair(pInv->getBagBulk(4), pInv->getMaxBagBulk(4))); + BagsBulk.push_back(pair (pInv->getBagBulk(4), pInv->getMaxBagBulk(4))); if (pInv->isInventoryAvailable(INVENTORIES::pet_animal4)) - BagsBulk.push_back(pair ::pair(pInv->getBagBulk(4), pInv->getMaxBagBulk(4))); + BagsBulk.push_back(pair (pInv->getBagBulk(4), pInv->getMaxBagBulk(4))); bool bPlaceFound = true; diff --git a/code/ryzom/client/src/interface_v3/macrocmd_key.cpp b/code/ryzom/client/src/interface_v3/macrocmd_key.cpp index a9541847b..613b492ea 100644 --- a/code/ryzom/client/src/interface_v3/macrocmd_key.cpp +++ b/code/ryzom/client/src/interface_v3/macrocmd_key.cpp @@ -417,13 +417,13 @@ void CModalContainerEditCmd::create(const std::string &name, bool bDefKey, bool pIM->getDbProp(DbComboDisp2P); vector< pair > vArgs; - vArgs.push_back(pair::pair("id",name)); - vArgs.push_back(pair::pair("db_sel_cat",DbComboSelCat)); - vArgs.push_back(pair::pair("db_sel_act",DbComboSelAct)); - vArgs.push_back(pair::pair("db_sel_1p",DbComboSel1P)); - vArgs.push_back(pair::pair("db_sel_2p",DbComboSel2P)); - vArgs.push_back(pair::pair("db_disp_1p",DbComboDisp1P)); - vArgs.push_back(pair::pair("db_disp_2p",DbComboDisp2P)); + vArgs.push_back(pair("id",name)); + vArgs.push_back(pair("db_sel_cat",DbComboSelCat)); + vArgs.push_back(pair("db_sel_act",DbComboSelAct)); + vArgs.push_back(pair("db_sel_1p",DbComboSel1P)); + vArgs.push_back(pair("db_sel_2p",DbComboSel2P)); + vArgs.push_back(pair("db_disp_1p",DbComboDisp1P)); + vArgs.push_back(pair("db_disp_2p",DbComboDisp2P)); Win = dynamic_cast(pIM->createGroupInstance(TEMPLATE_EDITCMD, "ui:interface", vArgs)); if (Win == NULL) diff --git a/code/ryzom/client/src/interface_v3/people_list.cpp b/code/ryzom/client/src/interface_v3/people_list.cpp index b525479f8..2255176d6 100644 --- a/code/ryzom/client/src/interface_v3/people_list.cpp +++ b/code/ryzom/client/src/interface_v3/people_list.cpp @@ -73,13 +73,13 @@ bool CPeopleList::create(const CPeopleListDesc &desc, const CChatWindowDesc *cha // create the base container vector< pair > baseContainerParams; - baseContainerParams.push_back(pair::pair("id", desc.Id)); + baseContainerParams.push_back(pair("id", desc.Id)); std::string baseId; if (fatherContainer == NULL) { - baseContainerParams.push_back(pair::pair("movable","true")); - baseContainerParams.push_back(pair::pair("active","false")); - baseContainerParams.push_back(pair::pair("opened","true")); + baseContainerParams.push_back(pair("movable","true")); + baseContainerParams.push_back(pair("active","false")); + baseContainerParams.push_back(pair("opened","true")); baseId = "ui:interface"; } else diff --git a/code/ryzom/client/src/login.cpp b/code/ryzom/client/src/login.cpp index 8d3a0293b..99e1c7443 100644 --- a/code/ryzom/client/src/login.cpp +++ b/code/ryzom/client/src/login.cpp @@ -177,9 +177,9 @@ void createOptionalCatUI() { vector< pair < string, string > > params; params.clear(); - params.push_back(pair::pair("id", "c"+toString(i))); + params.push_back(pair("id", "c"+toString(i))); if (i>0) - params.push_back(pair::pair("posref", "BL TL")); + params.push_back(pair("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::pair("id", "s"+toString(i))); + params.push_back(pair("id", "s"+toString(i))); if (i>0) - params.push_back(pair::pair("posref", "BL TL")); + params.push_back(pair("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::pair("id", "s"+toString(i))); +// params.push_back(pair("id", "s"+toString(i))); // if (i>0) -// params.push_back(pair::pair("posref", "BL TL")); +// params.push_back(pair("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::pair("LandscapeTileNear", true)); - CfgPresetList.push_back(pair::pair("LandscapeThreshold", true)); - CfgPresetList.push_back(pair::pair("Vision", true)); - CfgPresetList.push_back(pair::pair("MicroVeget", false)); - CfgPresetList.push_back(pair::pair("MicroVegetDensity", true)); - CfgPresetList.push_back(pair::pair("FxNbMaxPoly", false)); - CfgPresetList.push_back(pair::pair("Cloud", false)); - CfgPresetList.push_back(pair::pair("CloudQuality", true)); - CfgPresetList.push_back(pair::pair("CloudUpdate", false)); - CfgPresetList.push_back(pair::pair("Shadows", false)); - CfgPresetList.push_back(pair::pair("SkinNbMaxPoly", false)); - CfgPresetList.push_back(pair::pair("NbMaxSkeletonNotCLod", false)); - CfgPresetList.push_back(pair::pair("CharacterFarClip", true)); + CfgPresetList.push_back(pair("LandscapeTileNear", true)); + CfgPresetList.push_back(pair("LandscapeThreshold", true)); + CfgPresetList.push_back(pair("Vision", true)); + CfgPresetList.push_back(pair("MicroVeget", false)); + CfgPresetList.push_back(pair("MicroVegetDensity", true)); + CfgPresetList.push_back(pair("FxNbMaxPoly", false)); + CfgPresetList.push_back(pair("Cloud", false)); + CfgPresetList.push_back(pair("CloudQuality", true)); + CfgPresetList.push_back(pair("CloudUpdate", false)); + CfgPresetList.push_back(pair("Shadows", false)); + CfgPresetList.push_back(pair("SkinNbMaxPoly", false)); + CfgPresetList.push_back(pair("NbMaxSkeletonNotCLod", false)); + CfgPresetList.push_back(pair("CharacterFarClip", true)); - CfgPresetList.push_back(pair::pair("Bloom", false)); - CfgPresetList.push_back(pair::pair("SquareBloom", false)); - CfgPresetList.push_back(pair::pair("DensityBloom", true)); + CfgPresetList.push_back(pair("Bloom", false)); + CfgPresetList.push_back(pair("SquareBloom", false)); + CfgPresetList.push_back(pair("DensityBloom", true)); // Check if all the preset-able cfg-variable are in a preset mode sint nPreset = -1; From 9750980a43a3e5a9b7daf7a2923ad90d8e08a3c6 Mon Sep 17 00:00:00 2001 From: vl Date: Mon, 10 May 2010 16:36:53 +0200 Subject: [PATCH 10/15] Added: *.so --- .hgignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.hgignore b/.hgignore index 7bde0bdd3..337279771 100644 --- a/.hgignore +++ b/.hgignore @@ -39,6 +39,7 @@ default_c *.Po *.Plo *.o +*.so *.so.* *_debug From 3de945609e226ebea7575f4177504ebe3a9c8214 Mon Sep 17 00:00:00 2001 From: vl Date: Mon, 10 May 2010 16:47:50 +0200 Subject: [PATCH 11/15] Fixed: #867 patched by kvogel --- .../src/entities_game_service/pvp_manager/pvp_manager_2.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/ryzom/server/src/entities_game_service/pvp_manager/pvp_manager_2.cpp b/code/ryzom/server/src/entities_game_service/pvp_manager/pvp_manager_2.cpp index f4e44cf5d..618af6370 100644 --- a/code/ryzom/server/src/entities_game_service/pvp_manager/pvp_manager_2.cpp +++ b/code/ryzom/server/src/entities_game_service/pvp_manager/pvp_manager_2.cpp @@ -1272,7 +1272,7 @@ NLMISC_COMMAND(setFactionWar, "Start/stop current wars between faction", " PVP_CLAN::EndClans ) + if( faction2 < PVP_CLAN::BeginClans || faction2 > PVP_CLAN::EndClans ) { log.displayNL("Invalid Faction2 name: '%s'", args[1].c_str()); return false; From bb97e2a7199eea99173130d77edf60b54586541f Mon Sep 17 00:00:00 2001 From: vl Date: Mon, 10 May 2010 17:02:38 +0200 Subject: [PATCH 12/15] Changed: cfg variable to fit open shard --- code/ryzom/client/client_default.cfg | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/code/ryzom/client/client_default.cfg b/code/ryzom/client/client_default.cfg index 41e395b19..6e85438b8 100644 --- a/code/ryzom/client/client_default.cfg +++ b/code/ryzom/client/client_default.cfg @@ -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 = ""; //////////////// From 38585d39995ca0580e6de1d2bb8639ca910f53b1 Mon Sep 17 00:00:00 2001 From: vl Date: Mon, 10 May 2010 17:03:26 +0200 Subject: [PATCH 13/15] Changed: #865 make the mutex working on Linux --- code/nel/include/nel/misc/mutex.h | 4 ++-- code/nel/include/nel/misc/task_manager.h | 2 +- code/nel/src/misc/async_file_manager.cpp | 8 ++++---- code/nel/src/misc/task_manager.cpp | 16 ++++++++-------- 4 files changed, 15 insertions(+), 15 deletions(-) diff --git a/code/nel/include/nel/misc/mutex.h b/code/nel/include/nel/misc/mutex.h index 39432b66c..746f101e3 100644 --- a/code/nel/include/nel/misc/mutex.h +++ b/code/nel/include/nel/misc/mutex.h @@ -611,13 +611,13 @@ public: CAccessor(CUnfairSynchronized *cs) { Synchronized = cs; - const_cast(Synchronized->_Mutex).enter(); + const_cast(Synchronized->_Mutex).enter(); } /// release the mutex ~CAccessor() { - const_cast(Synchronized->_Mutex).leave(); + const_cast(Synchronized->_Mutex).leave(); } /// access to the Value diff --git a/code/nel/include/nel/misc/task_manager.h b/code/nel/include/nel/misc/task_manager.h index c8fbdfbcb..17f20f6c3 100644 --- a/code/nel/include/nel/misc/task_manager.h +++ b/code/nel/include/nel/misc/task_manager.h @@ -140,7 +140,7 @@ protected: /// queue of tasks, using list container instead of queue for DeleteTask methode CSynchronized _RunningTask; - CSynchronized > _TaskQueue; + CUnfairSynchronized > _TaskQueue; CSynchronized > _DoneTaskQueue; /// thread pointer diff --git a/code/nel/src/misc/async_file_manager.cpp b/code/nel/src/misc/async_file_manager.cpp index e7b2bd072..6243e6ea4 100644 --- a/code/nel/src/misc/async_file_manager.cpp +++ b/code/nel/src/misc/async_file_manager.cpp @@ -67,7 +67,7 @@ void CAsyncFileManager::addLoadTask(IRunnable *ploadTask) bool CAsyncFileManager::cancelLoadTask(const CAsyncFileManager::ICancelCallback &callback) { - CSynchronized >::CAccessor acces(&_TaskQueue); + CUnfairSynchronized >::CAccessor acces(&_TaskQueue); list &rTaskQueue = acces.value (); list::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 >::CAccessor acces(&_TaskQueue); + CUnfairSynchronized >::CAccessor acces(&_TaskQueue); list &rTaskQueue = acces.value (); list::iterator it = rTaskQueue.begin(); @@ -167,7 +167,7 @@ void CAsyncFileManager::signal (bool *pSgn) void CAsyncFileManager::cancelSignal (bool *pSgn) { - CSynchronized >::CAccessor acces(&_TaskQueue); + CUnfairSynchronized >::CAccessor acces(&_TaskQueue); list &rTaskQueue = acces.value (); list::iterator it = rTaskQueue.begin(); diff --git a/code/nel/src/misc/task_manager.cpp b/code/nel/src/misc/task_manager.cpp index b20aa14bc..a75c931e9 100644 --- a/code/nel/src/misc/task_manager.cpp +++ b/code/nel/src/misc/task_manager.cpp @@ -49,7 +49,7 @@ CTaskManager::~CTaskManager() nlSleep(10); // There should be no remaining Tasks - CSynchronized >::CAccessor acces(&_TaskQueue); + CUnfairSynchronized >::CAccessor acces(&_TaskQueue); nlassert(acces.value().empty()); _Thread->wait(); delete _Thread; @@ -65,7 +65,7 @@ void CTaskManager::run(void) while(_ThreadRunning) { { - CSynchronized >::CAccessor acces(&_TaskQueue); + CUnfairSynchronized >::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 >::CAccessor acces(&_TaskQueue); + CUnfairSynchronized >::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 >::CAccessor acces(&_TaskQueue); + CUnfairSynchronized >::CAccessor acces(&_TaskQueue); for(list::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 >::CAccessor acces(&_TaskQueue); + CUnfairSynchronized >::CAccessor acces(&_TaskQueue); return acces.value().size(); } @@ -164,7 +164,7 @@ void CTaskManager::waitCurrentTaskToComplete () void CTaskManager::dump (std::vector &result) { CSynchronized::CAccessor accesCurrent(&_RunningTask); - CSynchronized >::CAccessor acces(&_TaskQueue); + CUnfairSynchronized >::CAccessor acces(&_TaskQueue); CSynchronized >::CAccessor accesDone(&_DoneTaskQueue); const list &taskList = acces.value(); @@ -215,7 +215,7 @@ void CTaskManager::clearDump() uint CTaskManager::getNumWaitingTasks() { - CSynchronized >::CAccessor acces(&_TaskQueue); + CUnfairSynchronized >::CAccessor acces(&_TaskQueue); return acces.value().size(); } @@ -225,7 +225,7 @@ void CTaskManager::changeTaskPriority () { if (_ChangePriorityCallback) { - CSynchronized >::CAccessor acces(&_TaskQueue); + CUnfairSynchronized >::CAccessor acces(&_TaskQueue); list &taskList = acces.value(); list::iterator ite = taskList.begin(); From c1ecaac78ca9998097945e8906e9c1fb7b05f78b Mon Sep 17 00:00:00 2001 From: vl Date: Mon, 10 May 2010 17:38:27 +0200 Subject: [PATCH 14/15] Fixed: #857 linux/assertion failure CCoTask::getCurrentTask() == this. patch by ratmice --- code/nel/src/misc/i_xml.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/nel/src/misc/i_xml.cpp b/code/nel/src/misc/i_xml.cpp index 9308697cb..536358f81 100644 --- a/code/nel/src/misc/i_xml.cpp +++ b/code/nel/src/misc/i_xml.cpp @@ -101,7 +101,7 @@ void CIXml::release () // Free it xmlClearParserCtxt (_Parser); xmlFreeParserCtxt (_Parser); - xmlCleanupParser (); + // commented due to the bug #857 xmlCleanupParser (); _Parser = NULL; } From c85e0ca93b9cc21638c9089ca76f96881f5de786 Mon Sep 17 00:00:00 2001 From: vl Date: Mon, 10 May 2010 17:59:13 +0200 Subject: [PATCH 15/15] Fixed: #853 problem with crypt function under 64b system. patch by ratmice --- code/ryzom/common/src/game_share/crypt.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/ryzom/common/src/game_share/crypt.cpp b/code/ryzom/common/src/game_share/crypt.cpp index 186db47c7..42a55e081 100644 --- a/code/ryzom/common/src/game_share/crypt.cpp +++ b/code/ryzom/common/src/game_share/crypt.cpp @@ -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)