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

Merge branch 'fixes'

Browse Source
feature/prepare-cross-merge
Nuno 4 years ago committed by kaetemi
parent e3b030b823
commit d88b549dbc
No known key found for this signature in database
GPG Key ID: 9873C4D40BB479BC
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File

14
ryzom/server/src/shard_unifier_service/ring_session_manager.cpp
Unescape Escape View File

@ -1000,18 +1000,18 @@ restartLoop:
if (authorCharId != 0) if (authorCharId != 0)
{ {
author = CCharacter::load(_RingDb, authorCharId, __FILE__, __LINE__); author = CCharacter::load(_RingDb, authorCharId, __FILE__, __LINE__);
BOMB_IF(author == NULL, "Failed to load the scenario author character "<<authorCharId, return;) BOMB_IF(author == NULL, "Failed to load the scenario author character "<<authorCharId, return);
} }
// load the animator // load the animator
CCharacterPtr animator = CCharacter::load(_RingDb, session->getOwnerId(), __FILE__, __LINE__); CCharacterPtr animator = CCharacter::load(_RingDb, session->getOwnerId(), __FILE__, __LINE__);
BOMB_IF(animator == NULL, "Failed to load the scenario animator character "<<session->getOwnerId(), return;) BOMB_IF(animator == NULL, "Failed to load the scenario animator character "<<session->getOwnerId(), return);
// try to load an existing scenario record // try to load an existing scenario record
CScenarioPtr scenario; CScenarioPtr scenario;
CSString query; CSString query;
query << "SELECT id FROM scenario WHERE md5 = '"<<scenarioInfo.getScenarioKey().toString()<<"'"; query << "SELECT id FROM scenario WHERE md5 = '"<<scenarioInfo.getScenarioKey().toString()<<"'";
BOMB_IF(!_RingDb.query(query), "Failed to request in ring database", return;); BOMB_IF(!_RingDb.query(query), "Failed to request in ring database", return);
CUniquePtr<CStoreResult> result(_RingDb.storeResult()); CUniquePtr<CStoreResult> result(_RingDb.storeResult());
if (result->getNumRows() != 0) if (result->getNumRows() != 0)
{ {
@ -1131,18 +1131,18 @@ restartLoop:
if (authorCharId != 0) if (authorCharId != 0)
{ {
author = CCharacter::load(_RingDb, authorCharId, __FILE__, __LINE__); author = CCharacter::load(_RingDb, authorCharId, __FILE__, __LINE__);
BOMB_IF(author == NULL, "Failed to load the scenario author character "<<authorCharId, return;) BOMB_IF(author == NULL, "Failed to load the scenario author character "<<authorCharId, return);
} }
// load the animator // load the animator
CCharacterPtr animator = CCharacter::load(_RingDb, session->getOwnerId(), __FILE__, __LINE__); CCharacterPtr animator = CCharacter::load(_RingDb, session->getOwnerId(), __FILE__, __LINE__);
BOMB_IF(animator == NULL, "Failed to load the scenario animator character "<<session->getOwnerId(), return;) BOMB_IF(animator == NULL, "Failed to load the scenario animator character "<<session->getOwnerId(), return);
// try to load an existing scenario record // try to load an existing scenario record
CScenarioPtr scenario; CScenarioPtr scenario;
CSString query; CSString query;
query << "SELECT id FROM scenario WHERE md5 = '"<<scenarioInfo.getScenarioKey().toString()<<"'"; query << "SELECT id FROM scenario WHERE md5 = '"<<scenarioInfo.getScenarioKey().toString()<<"'";
BOMB_IF(!_RingDb.query(query), "Failed to request in ring database", return;); BOMB_IF(!_RingDb.query(query), "Failed to request in ring database", return);
CUniquePtr<CStoreResult> result(_RingDb.storeResult()); CUniquePtr<CStoreResult> result(_RingDb.storeResult());
if (result->getNumRows() != 0) if (result->getNumRows() != 0)
{ {
@ -3119,7 +3119,7 @@ endOfWelcomeUserResult:
for (uint i=0; i<session->getSessionParticipants().size(); ++i) for (uint i=0; i<session->getSessionParticipants().size(); ++i)
{ {
const CSessionParticipantPtr &part = session->getSessionParticipantsByIndex(i); const CSessionParticipantPtr &part = session->getSessionParticipantsByIndex(i);
BOMB_IF(part == NULL, "RSM:on_unsubsribeSession : error accessing participants at index "<<i<<", part is NULL", invokeResult(from, charId>>4, 4, "failed to accesss participants record"); return) BOMB_IF(part == NULL, "RSM:on_unsubsribeSession : error accessing participants at index "<<i<<", part is NULL", invokeResult(from, charId>>4, 4, "failed to accesss participants record"); return);
if (part->getCharId() == charId if (part->getCharId() == charId
&& part->getStatus() == TSessionPartStatus::sps_play_subscribed) && part->getStatus() == TSessionPartStatus::sps_play_subscribed)

Write Preview
Loading…
Cancel
Save