diff options
| author | Haru <haru@dotalux.com> | 2013-08-20 18:55:56 +0200 |
|---|---|---|
| committer | Haru <haru@dotalux.com> | 2013-08-20 18:59:59 +0200 |
| commit | 4a9c55a77daa478b9f994d5a1b06619104b82982 (patch) | |
| tree | 144817a938ca4e3756e0bbdbaf327cc7632a5631 /src/map/map.h | |
| parent | ac131bf1baa9a8f9a87176beadf1ce4ebd8abb01 (diff) | |
| download | hercules-4a9c55a77daa478b9f994d5a1b06619104b82982.tar.gz hercules-4a9c55a77daa478b9f994d5a1b06619104b82982.tar.bz2 hercules-4a9c55a77daa478b9f994d5a1b06619104b82982.tar.xz hercules-4a9c55a77daa478b9f994d5a1b06619104b82982.zip | |
Fixed a mapserver crash when using instanced maps with custom names
- Fixes bugreport:7658 (thanks to purityz)
http://hercules.ws/board/tracker/issue-7658-instance-mapserver-crashing/
- The crash was caused by a pointer becoming invalid when reallocating
map[] (i.e. when adding maps), since 20bdc01f
Signed-off-by: Haru <haru@dotalux.com>
Diffstat (limited to 'src/map/map.h')
| -rw-r--r-- | src/map/map.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/map/map.h b/src/map/map.h index d372a68b6..266d0ccde 100644 --- a/src/map/map.h +++ b/src/map/map.h @@ -677,8 +677,7 @@ struct map_data { /* long_damage_rate mapflag */ unsigned short long_damage_rate; - /* instance unique name */ - char *cName; + bool custom_name; ///< Whether the instanced map is using a custom name /* */ int (*getcellp)(struct map_data* m,int16 x,int16 y,cell_chk cellchk); |