Nico/Viano-Core
1
0 Fork 0
Code Issues Pull Requests Actions 8 Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4

Browse Source 
Conflicts:
	src/server/game/Entities/Player/Player.cpp
	src/server/game/Entities/Player/Player.h
	src/server/game/Guilds/Guild.cpp
	src/server/game/Handlers/TradeHandler.cpp
	src/server/scripts/Commands/cs_modify.cpp
	src/server/scripts/Kalimdor/zone_durotar.cpp
This commit is contained in:
Vincent-Michael committed 2014-05-18 19:40:30 +02:00
2 parents a3793b1741 7228bd3664
commit ef5bc9c70a
41 files changed
+460 -128
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/server/scripts/Commands/cs_modify.cpp
+2 -2
View File
@@ -1020,8 +1020,8 @@ public:
}
else
{
uint32 moneyToAddMsg = moneyToAdd * -1;
if (newmoney > int64(MAX_MONEY_AMOUNT))
uint64 moneyToAddMsg = moneyToAdd * -1;
if (newmoney > static_cast<int64>(MAX_MONEY_AMOUNT))
newmoney = MAX_MONEY_AMOUNT;
handler->PSendSysMessage(LANG_YOU_TAKE_MONEY, moneyToAddMsg, handler->GetNameLink(target).c_str());