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

Changed: Synchronization with SVN

Browse Source
hg/feature/gsoc2013-dfighter
kervala 12 years ago
parent eea1360021
commit f3828a0b92
2 changed files with 161 additions and 157 deletions
Show Stats Download Patch File Download Diff File

21
code/ryzom/server/data_shard/client_commands_privileges.txt
Unescape Escape View File

@ -23,11 +23,11 @@ clearFriendsList :DEV:SGM:GM: // Clear the friend list of a player
clearGuildMessage // Clear the guild message of the day clearGuildMessage // Clear the guild message of the day
clearIgnoreList :DEV:SGM:GM: // Clear the ignore list of a player clearIgnoreList :DEV:SGM:GM: // Clear the ignore list of a player
clearIsFriendOfList :DEV:SGM:GM: // Clear the "is friend of" list of a player clearIsFriendOfList :DEV:SGM:GM: // Clear the "is friend of" list of a player
createItemInBag :DEV:SGM:GM:EM: // Create an item and put it in the player bag: <sheetId>|<sheetName> <quantity> <quality> createItemInBag :DEV:SGM:GM:EM: audit // Create an item and put it in the player bag: <sheetId>|<sheetName> <quantity> <quality>
createItemInInv :DEV: // Create an item and put it in the given player inventory: <invId> <sheetId>|<sheetName> <quantity> <quality> createItemInInv :DEV: // Create an item and put it in the given player inventory: <invId> <sheetId>|<sheetName> <quantity> <quality>
createItemInTmpInv :DEV:SGM:GM:EM: // Create an item and put it in the player temp inventory: <sheetId>|<sheetName> <quantity> <quality> createItemInTmpInv :DEV:SGM:GM:EM: audit // Create an item and put it in the player temp inventory: <sheetId>|<sheetName> <quantity> <quality>
createNamedItemInBag :DEV:SGM: // Create a named item and put it in the player bag: <item name> [<quantity>] createNamedItemInBag :DEV:SGM: audit // Create a named item and put it in the player bag: <item name> [<quantity>]
createFullArmorSet :DEV:SGM:GM:EM: // Create and equip player with chosen full armor set: <race (fyros/matis/zorai/tryker)> <type (light/medium/heavy)> <quality> createFullArmorSet :DEV:SGM:GM:EM: audit // Create and equip player with chosen full armor set: <race (fyros/matis/zorai/tryker)> <type (light/medium/heavy)> <quality>
delPosFlag :DEV:SGM:GM:EM: // Delete a position flag: <flag name> delPosFlag :DEV:SGM:GM:EM: // Delete a position flag: <flag name>
dismiss :DEV:SGM:GM:VG:SG:EM:EG: // Teleport a player back to its former position (before last call to summonPlayer): <player name> dismiss :DEV:SGM:GM:VG:SG:EM:EG: // Teleport a player back to its former position (before last call to summonPlayer): <player name>
displayForageRM :DEV:SGM:GM:EM: // Display forageable raw materials near by or at the exact position of a player: <exactPos=1> <extendedInfo=0> displayForageRM :DEV:SGM:GM:EM: // Display forageable raw materials near by or at the exact position of a player: <exactPos=1> <extendedInfo=0>
@ -119,7 +119,7 @@ addFactionAttackableToTarget :DEV: // add attackable possibility for player o
forceMissionProgress :DEV: // force mission step progression (for debug purpose only) forceMissionProgress :DEV: // force mission step progression (for debug purpose only)
savePlayerActiveChar :DEV:SGM: // save immediatly a player active char, a specific filename can enter for backup a character in specific situation/context savePlayerActiveChar :DEV:SGM: // save immediatly a player active char, a specific filename can enter for backup a character in specific situation/context
reloadPlayer :DEV:SGM: // set next filename used for loading a character (must be offline and log later) or relaod an online character to previous backup or with a specified filename. reloadPlayer :DEV:SGM: // set next filename used for loading a character (must be offline and log later) or relaod an online character to previous backup or with a specified filename.
farTPPush :DEV:SGM:GM:VG:SG:EM: // used to tp on a specific session farTPPush :DEV:SGM:GM:VG:SG:EM: audit // used to tp on a specific session
farTPReturn :DEV:SGM:GM:VG:SG:EM: // used to tp back to your previous session farTPReturn :DEV:SGM:GM:VG:SG:EM: // used to tp back to your previous session
characterMissionDump :DEV:SGM:GM: // Dump mission list for a character characterMissionDump :DEV:SGM:GM: // Dump mission list for a character
removeMission :DEV:SGM:GM: // Remove a mission of a character removeMission :DEV:SGM:GM: // Remove a mission of a character
@ -135,12 +135,12 @@ setSimplePhrase :DEV:SGM:GM:EM: // Set an IOS phrase: <id> <phrase> [<langua
// Variables // Variables
// //
Aggro :DEV:SGM:GM:VG:SG:EM:EG: // Mobs can aggro a player? Aggro :DEV:SGM:GM:VG:SG:EM:EG: audit // Mobs can aggro a player?
CreateCharacterStartSkillsValue :DEV:SGM:GM:EM: // Create character start skills, skill point and money CreateCharacterStartSkillsValue :DEV:SGM:GM:EM: // Create character start skills, skill point and money
FBT :DEV:SGM:GM:VG:EM: // Is a Focus Beta Tester? FBT :DEV:SGM:GM:VG:EM: // Is a Focus Beta Tester?
God :DEV:SGM:GM:EM: // God mode, invulnerability God :DEV:SGM:GM:EM: audit // God mode, invulnerability
Invulnerable :DEV:SGM:GM:EM: // Invulnerable mode, invulnerability to all Invulnerable :DEV:SGM:GM:EM: audit // Invulnerable mode, invulnerability to all
ShowFactionChannels :DEV:SGM:GM:VG:SG:G: // Show faction channel for moderation ShowFactionChannels :DEV:SGM:GM:EM:VG:SG:G: // Show faction channel for moderation
HP :DEV:SGM:GM:EM: // Hit points of a player HP :DEV:SGM:GM:EM: // Hit points of a player
MaxHP :DEV:SGM:GM:EM: // Max hit points of a bot MaxHP :DEV:SGM:GM:EM: // Max hit points of a bot
Invisible :DEV:SGM:GM:VG:SG:EM:EG: // Invisibility of a player Invisible :DEV:SGM:GM:VG:SG:EM:EG: // Invisibility of a player
@ -149,7 +149,7 @@ Name :DEV:SGM:GM:EM: // Name of a player
Position :DEV:SGM:GM:VG:PR:OBSERVER:EM:EG: // Position of a player (in meters) <posx>,<posy>[,<posz>]] | <bot name> | <player name> | home Position :DEV:SGM:GM:VG:PR:OBSERVER:EM:EG: // Position of a player (in meters) <posx>,<posy>[,<posz>]] | <bot name> | <player name> | home
Priv :DEV: // User privilege Priv :DEV: // User privilege
PriviledgePVP :DEV:SGM:GM:EM:EG: // Turns PVP on/off on character (blame coder for typo) PriviledgePVP :DEV:SGM:GM:EM:EG: // Turns PVP on/off on character (blame coder for typo)
FullPVP :DEV:SGM:GM:EM:EG: // Turns Full PVP on/off on character (blame coder for typo) FullPVP :DEV:SGM:GM:EM:EG: // Turns Full PVP on/off on character
RyzomDate :DEV:SGM:GM:EM: // Current ryzom date RyzomDate :DEV:SGM:GM:EM: // Current ryzom date
RyzomTime :DEV:SGM:GM:EM: // Current ryzom time RyzomTime :DEV:SGM:GM:EM: // Current ryzom time
@ -177,3 +177,4 @@ eventSetBotFacing :DEV:SGM:GM:EM: // Set the direction in which a bot faces
eventGiveControl :DEV:SGM:GM:EM: // Give control of entity A to entity B : <master eid> <slave eid> eventGiveControl :DEV:SGM:GM:EM: // Give control of entity A to entity B : <master eid> <slave eid>
eventLeaveControl :DEV:SGM:GM:EM: // Leave control of entity : <master eid> eventLeaveControl :DEV:SGM:GM:EM: // Leave control of entity : <master eid>
resetName // Reset player's name; undo a temporary rename resetName // Reset player's name; undo a temporary rename
showOnline // Set friend visibility: <user id> <mode=0,1,2>

7
code/ryzom/server/src/server_share/mysql_wrapper.cpp
Unescape Escape View File

@ -195,9 +195,12 @@ namespace MSW
int result = mysql_real_query(_MysqlContext, queryString.c_str(), (unsigned long)queryString.size()); int result = mysql_real_query(_MysqlContext, queryString.c_str(), (unsigned long)queryString.size());
if (result != 0) if (result != 0)
{ {
if (result == CR_SERVER_GONE_ERROR) // in all case, we try to reconnect
int merrno = mysql_errno(_MysqlContext);
//if (result == CR_SERVER_GONE_ERROR)
{ {
// reconnect and retry the request // reconnect and retry the request
nlinfo("%p Mysql error errno:%d result:%d : %s, try to reconnect...", _MysqlContext, merrno, result, mysql_error(_MysqlContext));
if (_connect()) if (_connect())
result = mysql_real_query(_MysqlContext, queryString.c_str(), (unsigned long)queryString.size()); result = mysql_real_query(_MysqlContext, queryString.c_str(), (unsigned long)queryString.size());
else else
@ -215,7 +218,7 @@ namespace MSW
if (result != 0) if (result != 0)
{ {
nlwarning("Mysql error : %s", mysql_error(_MysqlContext)); nlwarning("Mysql error errno:%d result:%d : %s", merrno, result, mysql_error(_MysqlContext));
nlwarning(" in query '%s':", queryString.c_str()); nlwarning(" in query '%s':", queryString.c_str());
if (MSWStrictMode) if (MSWStrictMode)
{ {

Write Preview
Loading…
Cancel
Save