From cc2f83db2ec3c18b6c03cedca7fa58cfbbbbd85b Mon Sep 17 00:00:00 2001 From: McBen Date: Sun, 18 Jan 2009 04:31:33 +0300 Subject: [PATCH] [7102] Fixed .showarea/,hodearea commands. Signed-off-by: VladimirMangos --- src/game/Level3.cpp | 10 ++++------ src/game/Player.cpp | 2 +- src/shared/revision_nr.h | 2 +- 3 files changed, 6 insertions(+), 8 deletions(-) diff --git a/src/game/Level3.cpp b/src/game/Level3.cpp index 44f62621073..0323b09af3b 100644 --- a/src/game/Level3.cpp +++ b/src/game/Level3.cpp @@ -3836,8 +3836,6 @@ bool ChatHandler::HandleShowAreaCommand(const char* args) if (!*args) return false; - int area = atoi((char*)args); - Player *chr = getSelectedPlayer(); if (chr == NULL) { @@ -3846,10 +3844,11 @@ bool ChatHandler::HandleShowAreaCommand(const char* args) return false; } + int area = GetAreaFlagByAreaID(atoi((char*)args)); int offset = area / 32; uint32 val = (uint32)(1 << (area % 32)); - if(offset >= 128) + if(area<0 || offset >= 128) { SendSysMessage(LANG_BAD_VALUE); SetSentErrorMessage(true); @@ -3868,8 +3867,6 @@ bool ChatHandler::HandleHideAreaCommand(const char* args) if (!*args) return false; - int area = atoi((char*)args); - Player *chr = getSelectedPlayer(); if (chr == NULL) { @@ -3878,10 +3875,11 @@ bool ChatHandler::HandleHideAreaCommand(const char* args) return false; } + int area = GetAreaFlagByAreaID(atoi((char*)args)); int offset = area / 32; uint32 val = (uint32)(1 << (area % 32)); - if(offset >= 128) + if(area<0 || offset >= 128) { SendSysMessage(LANG_BAD_VALUE); SetSentErrorMessage(true); diff --git a/src/game/Player.cpp b/src/game/Player.cpp index a2b99047ca2..f9ce04983e2 100644 --- a/src/game/Player.cpp +++ b/src/game/Player.cpp @@ -5322,7 +5322,7 @@ void Player::CheckExploreSystem() if(offset >= 128) { - sLog.outError("ERROR: Wrong area flag %u in map data for (X: %f Y: %f) point to field PLAYER_EXPLORED_ZONES_1 + %u ( %u must be < 64 ).",areaFlag,GetPositionX(),GetPositionY(),offset,offset); + sLog.outError("ERROR: Wrong area flag %u in map data for (X: %f Y: %f) point to field PLAYER_EXPLORED_ZONES_1 + %u ( %u must be < 128 ).",areaFlag,GetPositionX(),GetPositionY(),offset,offset); return; } diff --git a/src/shared/revision_nr.h b/src/shared/revision_nr.h index 9df72dc017f..4ada821d66c 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 "7101" + #define REVISION_NR "7102" #endif // __REVISION_NR_H__