mangos-mirror/server
0
0
Fork 0
mirror of https://github.com/mangosfour/server.git synced 2025-12-14 16:37:01 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'master' into 303

Browse source 
Conflicts:
	src/game/CharacterHandler.cpp
	src/game/Pet.cpp
	src/game/Player.cpp
This commit is contained in:
tomrus88 2008-11-15 15:35:52 +03:00
commit 768fa2d2de
22 changed files with 451 additions and 355 deletions
Download patch file Download diff file Expand all files Collapse all files

3
src/game/Level3.cpp
View file

@ -6326,7 +6326,8 @@ bool ChatHandler::HandleSendMoneyCommand(const char* args)
if (!msgText)
return false;
int32 money = atoi(strtok(NULL, ""));
char* money_str = strtok(NULL, "");
int32 money = money_str ? atoi(money_str) : 0;
if (money <= 0)
return false;