diff options
author | megamage <none@none> | 2009-02-04 10:33:18 -0600 |
---|---|---|
committer | megamage <none@none> | 2009-02-04 10:33:18 -0600 |
commit | 4d008f2043084b72fb9d4a9929ff2793c7bbd8ee (patch) | |
tree | 13e4adc5b3dae7f3c1805c95e940d785535375af /src/game/ObjectMgr.cpp | |
parent | edbfb386ce87f918da8e11e843d7b5a227e5328d (diff) |
Replace tabs with spaces, and fix crlf issues
--HG--
branch : trunk
Diffstat (limited to 'src/game/ObjectMgr.cpp')
-rw-r--r-- | src/game/ObjectMgr.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/game/ObjectMgr.cpp b/src/game/ObjectMgr.cpp index 6ceb9a08334..e62e7af0617 100644 --- a/src/game/ObjectMgr.cpp +++ b/src/game/ObjectMgr.cpp @@ -222,7 +222,7 @@ void ObjectMgr::LoadPlayerInfoInCache() pPPlayerInfo->unArenaInfoSlot0 = Player::GetUInt32ValueFromArray(tdata,PLAYER_FIELD_ARENA_TEAM_INFO_1_1 + 0 * 6 + 5); pPPlayerInfo->unArenaInfoSlot1 = Player::GetUInt32ValueFromArray(tdata,PLAYER_FIELD_ARENA_TEAM_INFO_1_1 + 1 * 6 + 5); pPPlayerInfo->unArenaInfoSlot2 = Player::GetUInt32ValueFromArray(tdata,PLAYER_FIELD_ARENA_TEAM_INFO_1_1 + 2 * 6 + 5); - + pPPlayerInfo->unClass = (uint32)fields[3].GetUInt32(); m_mPlayerInfoMap[fields[0].GetUInt32()] = pPPlayerInfo; } @@ -1020,7 +1020,7 @@ uint32 ObjectMgr::ChooseDisplayId(uint32 team, const CreatureInfo *cinfo, const if (!data || data->displayid == 0) // use defaults from the template { display_id = cinfo->GetRandomValidModelId(); - } else display_id = data->displayid; // overwritten from creature data + } else display_id = data->displayid; // overwritten from creature data return display_id; } @@ -7555,7 +7555,7 @@ ObjectMgr::ScriptNameMap & GetScriptNames() void ObjectMgr::LoadTransportEvents() { - + QueryResult *result = WorldDatabase.Query("SELECT entry, waypoint_id, event_id FROM transport_events"); if( !result ) @@ -7571,19 +7571,19 @@ void ObjectMgr::LoadTransportEvents() do { bar1.step(); - + Field *fields = result->Fetch(); - + //Load event values uint32 entry = fields[0].GetUInt32(); uint32 waypoint_id = fields[1].GetUInt32(); uint32 event_id = fields[2].GetUInt32(); - + uint32 event_count = (entry*100)+waypoint_id; TransportEventMap[event_count] = event_id; } while(result->NextRow()); - + sLog.outString( "\n>> Loaded %u transport events \n", result->GetRowCount() ); delete result; |