summaryrefslogtreecommitdiff
path: root/src/map/instance.c
diff options
context:
space:
mode:
authorDastgir <dastgirpojee@rocketmail.com>2015-10-26 09:57:24 +0530
committerDastgir <dastgirpojee@rocketmail.com>2015-10-26 09:57:24 +0530
commite54cab202300a8fc5bc7f7e326f09906cfe8d800 (patch)
tree0771de446fd144cad89a250b7dc67519eaa2ba5b /src/map/instance.c
parent444ff2fa558cff839b1aaf8b369a5bf395dfa0b7 (diff)
parentc956a618cb92b53407a0dc0c999f4cd68e63d536 (diff)
downloadhercules-e54cab202300a8fc5bc7f7e326f09906cfe8d800.tar.gz
hercules-e54cab202300a8fc5bc7f7e326f09906cfe8d800.tar.bz2
hercules-e54cab202300a8fc5bc7f7e326f09906cfe8d800.tar.xz
hercules-e54cab202300a8fc5bc7f7e326f09906cfe8d800.zip
Merge branch 'master' of https://github.com/HerculesWS/Hercules
Diffstat (limited to 'src/map/instance.c')
-rw-r--r--src/map/instance.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/map/instance.c b/src/map/instance.c
index 545ffe1e7..45e407dfc 100644
--- a/src/map/instance.c
+++ b/src/map/instance.c
@@ -94,9 +94,9 @@ int instance_create(int owner_id, const char *name, enum instance_owner_type typ
}
if( type != IOT_NONE && *icptr ) {
- ARR_FIND(0, *icptr, i, strcmp(instance->list[iptr[i]].name,name) == 0 );
+ ARR_FIND(0, *icptr, i, iptr[i] != -1 && strcmp(instance->list[iptr[i]].name, name) == 0 );
if( i != *icptr )
- return -4;/* already got this instance */
+ return -4; /* already got this instance */
}
ARR_FIND(0, instance->instances, i, instance->list[i].state == INSTANCE_FREE);