summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHaru <haru@dotalux.com>2014-01-15 04:18:31 +0100
committerHaru <haru@dotalux.com>2014-01-15 23:48:56 +0100
commitd4d37e6a8675a805c574b2bfbff46b2114141f47 (patch)
tree73d81c73450d936528d4daa74cf6529785f6497f
parentdafba12dd41721e03ef7d1dc4ec4fa9c518838be (diff)
downloadhercules-d4d37e6a8675a805c574b2bfbff46b2114141f47.tar.gz
hercules-d4d37e6a8675a805c574b2bfbff46b2114141f47.tar.bz2
hercules-d4d37e6a8675a805c574b2bfbff46b2114141f47.tar.xz
hercules-d4d37e6a8675a805c574b2bfbff46b2114141f47.zip
Fixed mapserver error when display_status_timers is disabled
- Fixes message "status_type2relevant_bl_types: Unsupported type -1" displayed when the display_status_timers battle flag is disabled. - Corrects return value for status_type2relevant_bl_types in case of unsupported type. - Special thanks to Ind Signed-off-by: Haru <haru@dotalux.com>
-rw-r--r--src/map/clif.c4
-rw-r--r--src/map/status.c2
2 files changed, 3 insertions, 3 deletions
diff --git a/src/map/clif.c b/src/map/clif.c
index b51651b90..d13cea145 100644
--- a/src/map/clif.c
+++ b/src/map/clif.c
@@ -5492,10 +5492,10 @@ void clif_status_change_notick(struct block_list *bl,int type,int flag,int tick,
nullpo_retv(bl);
- if (!(status->type2relevant_bl_types(type)&bl->type)) // only send status changes that actually matter to the client
+ if (type == SI_BLANK) //It shows nothing on the client...
return;
- if (type == SI_BLANK) //It shows nothing on the client...
+ if (!(status->type2relevant_bl_types(type)&bl->type)) // only send status changes that actually matter to the client
return;
sd = BL_CAST(BL_PC, bl);
diff --git a/src/map/status.c b/src/map/status.c
index 1f7d81ccf..782f31780 100644
--- a/src/map/status.c
+++ b/src/map/status.c
@@ -96,7 +96,7 @@ int status_type2relevant_bl_types(int type)
{
if( type < 0 || type >= SI_MAX ) {
ShowError("status_type2relevant_bl_types: Unsupported type %d\n", type);
- return SI_BLANK;
+ return BL_NUL;
}
return status->RelevantBLTypes[type];