diff options
| author | runningnak3d <none@none> | 2008-10-14 16:17:28 -0500 |
|---|---|---|
| committer | runningnak3d <none@none> | 2008-10-14 16:17:28 -0500 |
| commit | 62409ac2a44b4af071aad765fd60e8281593aad7 (patch) | |
| tree | ba5d8e22748b3bb30de7147e7a110ad50788f3ac /src | |
| parent | fc6a5eae08da0c2d7a819bdc1192e3b723e0aab6 (diff) | |
[svn] * First public release of Trinity
* Based on MaNGOS rev 6743 and SD2-685
* All new netcode based on the ACE framework (thanks Derex)
* Arenas working (thanks w12x)
* Outdoor PvP working (thanks w12x)
* World Game Events support added (thanks w12x)
* All new build system (thanks Derex and Neo2003)
* Lots of new conf options based on the ImpConfig patch (thanks Dythzer / w12x / Seline)
* Small fix to WSG
* Lots of other small additions and fixes
--HG--
branch : trunk
Diffstat (limited to 'src')
| -rw-r--r-- | src/game/BattleGroundWS.cpp | 8 | ||||
| -rw-r--r-- | src/game/World.cpp | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/src/game/BattleGroundWS.cpp b/src/game/BattleGroundWS.cpp index a07c78d0281..12b778a5e47 100644 --- a/src/game/BattleGroundWS.cpp +++ b/src/game/BattleGroundWS.cpp @@ -703,13 +703,13 @@ void BattleGroundWS::FillInitialWorldStates(WorldPacket& data) data << uint32(BG_WS_FLAG_CAPTURES_MAX) << uint32(BG_WS_MAX_TEAM_SCORE); if (m_FlagState[BG_TEAM_HORDE] == BG_WS_FLAG_STATE_ON_PLAYER) - data << uint32(BG_WS_FLAG_STATE_HORDE) << uint32(2); + data << uint32(BG_WS_FLAG_STATE_ALLIANCE) << uint32(2); else - data << uint32(BG_WS_FLAG_STATE_HORDE) << uint32(1); + data << uint32(BG_WS_FLAG_STATE_ALLIANCE) << uint32(1); if (m_FlagState[BG_TEAM_ALLIANCE] == BG_WS_FLAG_STATE_ON_PLAYER) - data << uint32(BG_WS_FLAG_STATE_ALLIANCE) << uint32(2); + data << uint32(BG_WS_FLAG_STATE_HORDE) << uint32(2); else - data << uint32(BG_WS_FLAG_STATE_ALLIANCE) << uint32(1); + data << uint32(BG_WS_FLAG_STATE_HORDE) << uint32(1); } diff --git a/src/game/World.cpp b/src/game/World.cpp index d912e807e87..bba7d1e1e85 100644 --- a/src/game/World.cpp +++ b/src/game/World.cpp @@ -789,7 +789,7 @@ void World::LoadConfigSettings(bool reload) if(m_configs[CONFIG_PLAYER_START_ARENAPTS] < 0) m_configs[CONFIG_PLAYER_START_ARENAPTS] = 0; - m_configs[CONFIG_GM_START_LEVEL] = sConfig.GetIntDefault("GamemasterStartLevel", 70); + m_configs[CONFIG_GM_START_LEVEL] = sConfig.GetIntDefault("GamemasterStartLevel", 1); if(m_configs[CONFIG_GM_START_LEVEL] < 1) m_configs[CONFIG_GM_START_LEVEL] = 1; |