diff options
| author | flaviojs <flaviojs@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2011-07-06 19:36:18 +0000 |
|---|---|---|
| committer | flaviojs <flaviojs@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2011-07-06 19:36:18 +0000 |
| commit | 37377cfe2c7a46d23e44d0f67606c360008167b2 (patch) | |
| tree | bd8ca3767ed8393f54f0a4e4999a080b3ccf608b /src/map | |
| parent | 39bece2eb2c650540bec4c23801338f4fd7c7291 (diff) | |
| download | hercules-37377cfe2c7a46d23e44d0f67606c360008167b2.tar.gz hercules-37377cfe2c7a46d23e44d0f67606c360008167b2.tar.bz2 hercules-37377cfe2c7a46d23e44d0f67606c360008167b2.tar.xz hercules-37377cfe2c7a46d23e44d0f67606c360008167b2.zip | |
* Merged decode_zip/encode_zip from eapp's grfio to replace our direct use of zlib's uncompress/compress.
* Fixed strict-aliasing warning in mapcache's GetFloat.
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@14888 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/map')
| -rw-r--r-- | src/map/map.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/map/map.c b/src/map/map.c index b8edabfe6..bc9465781 100644 --- a/src/map/map.c +++ b/src/map/map.c @@ -2727,7 +2727,7 @@ int map_readfromcache(struct map_data *m, char *buffer, char *decode_buffer) } // TO-DO: Maybe handle the scenario, if the decoded buffer isn't the same size as expected? [Shinryo] - uncompress(decode_buffer, &size, p+sizeof(struct map_cache_map_info), info->len); + decode_zip(decode_buffer, &size, p+sizeof(struct map_cache_map_info), info->len); CREATE(m->cell, struct mapcell, size); |