aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormegamage <none@none>2009-02-01 16:47:49 -0600
committermegamage <none@none>2009-02-01 16:47:49 -0600
commit5d490a1020537c9a4bd990956f6a10c544f40d3f (patch)
tree0f44a0a01742f56edde8807dcd999243f29ecfc5
parent05c07aa74a38e73006ba7106574290179942692c (diff)
[7215] .gobject setphase now really work. By VladimirMangos.
--HG-- branch : trunk
-rw-r--r--src/game/Level2.cpp6
-rw-r--r--src/shared/revision_nr.h2
2 files changed, 3 insertions, 5 deletions
diff --git a/src/game/Level2.cpp b/src/game/Level2.cpp
index b43c4a971f5..8e891626b1c 100644
--- a/src/game/Level2.cpp
+++ b/src/game/Level2.cpp
@@ -4486,10 +4486,8 @@ bool ChatHandler::HandleGOPhaseCommand(const char* args)
return false;
}
- if (!*args)
- return false;
-
- uint32 phasemask = (uint32) atoi((char*)args);
+ char* phaseStr = strtok (NULL, " ");
+ uint32 phasemask = phaseStr? atoi(phaseStr) : 0;
if ( phasemask == 0 )
{
SendSysMessage(LANG_BAD_VALUE);
diff --git a/src/shared/revision_nr.h b/src/shared/revision_nr.h
index 4b3b3fa5d97..3f93144e634 100644
--- a/src/shared/revision_nr.h
+++ b/src/shared/revision_nr.h
@@ -1,4 +1,4 @@
#ifndef __REVISION_NR_H__
#define __REVISION_NR_H__
- #define REVISION_NR "7214"
+ #define REVISION_NR "7215"
#endif // __REVISION_NR_H__