diff options
| author | Andrei Karas <akaras@inbox.ru> | 2015-10-11 16:11:43 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2015-10-11 16:11:43 +0300 |
| commit | 6c0f05b05e9bf09f40df3e3fe7f768f7435abcec (patch) | |
| tree | 6973517e1821f128b36955fc258419131b98f7fc /src/map/instance.c | |
| parent | d70d9d4d19f0deae2a2aceb047872611d5047ae0 (diff) | |
| parent | 845139091f0305d264800491ce25152856c20374 (diff) | |
| download | hercules-6c0f05b05e9bf09f40df3e3fe7f768f7435abcec.tar.gz hercules-6c0f05b05e9bf09f40df3e3fe7f768f7435abcec.tar.bz2 hercules-6c0f05b05e9bf09f40df3e3fe7f768f7435abcec.tar.xz hercules-6c0f05b05e9bf09f40df3e3fe7f768f7435abcec.zip | |
Merge pull request #760 from HerculesWS/738-vectors
Change several variable-size array to VECTOR (common, char)
Diffstat (limited to 'src/map/instance.c')
| -rw-r--r-- | src/map/instance.c | 14 |
1 files changed, 1 insertions, 13 deletions
diff --git a/src/map/instance.c b/src/map/instance.c index 300247fe7..0936a5ace 100644 --- a/src/map/instance.c +++ b/src/map/instance.c @@ -588,19 +588,7 @@ void instance_destroy(int instance_id) { instance->list[instance_id].state = INSTANCE_FREE; instance->list[instance_id].num_map = 0; - if (instance->list[instance_id].hdata) - { - for( j = 0; j < instance->list[instance_id].hdatac; j++ ) { - if( instance->list[instance_id].hdata[j]->flag.free ) { - aFree(instance->list[instance_id].hdata[j]->data); - } - aFree(instance->list[instance_id].hdata[j]); - } - aFree(instance->list[instance_id].hdata); - } - - instance->list[instance_id].hdata = NULL; - instance->list[instance_id].hdatac = 0; + HPM->data_store_destroy(&instance->list[instance_id].hdata); } /*-------------------------------------- |