From 6f2e0ee48a24dff1ac7acf441b1559e9d7c26657 Mon Sep 17 00:00:00 2001 From: w12x Date: Sun, 26 Oct 2008 11:50:07 -0500 Subject: [svn] * Fixed xp calculation for low level characters when grouped with a higher level player. Patch provided by Reiner030. * Fixed positive spells being not resistable when cast on hostile units. Patch provided by QAston. * Fixed compile warnings in gcc. Patch provided by WarHead. --HG-- branch : trunk --- src/game/World.cpp | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'src/game/World.cpp') diff --git a/src/game/World.cpp b/src/game/World.cpp index 508573603e8..8bdea8996ec 100644 --- a/src/game/World.cpp +++ b/src/game/World.cpp @@ -766,7 +766,7 @@ void World::LoadConfigSettings(bool reload) m_configs[CONFIG_THREAT_RADIUS] = sConfig.GetIntDefault("ThreatRadius", 100); - // always use declined names in the russian client + // always use declined names in the Russian client m_configs[CONFIG_DECLINED_NAMES_USED] = (m_configs[CONFIG_REALM_ZONE] == REALM_ZONE_RUSSIAN) ? true : sConfig.GetBoolDefault("DeclinedNames", false); @@ -774,9 +774,7 @@ void World::LoadConfigSettings(bool reload) m_configs[CONFIG_LISTEN_RANGE_TEXTEMOTE] = sConfig.GetIntDefault("ListenRange.TextEmote", 25); m_configs[CONFIG_LISTEN_RANGE_YELL] = sConfig.GetIntDefault("ListenRange.Yell", 300); - m_configs[CONFIG_PLAYER_START_GOLD] = sConfig.GetFloatDefault("PlayerStart.Gold", 0); - if(m_configs[CONFIG_PLAYER_START_GOLD] < 0) - m_configs[CONFIG_PLAYER_START_GOLD] = 0; + m_configs[CONFIG_PLAYER_START_GOLD] = (uint32)(sConfig.GetFloatDefault("PlayerStart.Gold", 0.0f) * 10000.0f); if(m_configs[CONFIG_PLAYER_START_GOLD] > MAX_MONEY_AMOUNT) m_configs[CONFIG_PLAYER_START_GOLD] = MAX_MONEY_AMOUNT; -- cgit v1.2.3