diff options
| author | shennetsind <ind@henn.et> | 2013-11-06 21:23:31 -0200 |
|---|---|---|
| committer | shennetsind <ind@henn.et> | 2013-11-06 21:23:31 -0200 |
| commit | d56017e3d1bf783cfdc67a702d2b70a0a27c8863 (patch) | |
| tree | a47bd0ef6340ce1d011d198f430c7d96d620afe0 /src/map/map.h | |
| parent | 5c94e76753c0cdb4ffb7dabbd6e135f1f7d42ef2 (diff) | |
| parent | 3a3d2297068809d25ca43e19fd2977f97b2728f5 (diff) | |
| download | hercules-d56017e3d1bf783cfdc67a702d2b70a0a27c8863.tar.gz hercules-d56017e3d1bf783cfdc67a702d2b70a0a27c8863.tar.bz2 hercules-d56017e3d1bf783cfdc67a702d2b70a0a27c8863.tar.xz hercules-d56017e3d1bf783cfdc67a702d2b70a0a27c8863.zip | |
Merge remote-tracking branch 'upstream/master'
Signed-off-by: shennetsind <ind@henn.et>
Conflicts:
src/map/pc.c
Diffstat (limited to 'src/map/map.h')
| -rw-r--r-- | src/map/map.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/map/map.h b/src/map/map.h index 06c3829b1..20e328c88 100644 --- a/src/map/map.h +++ b/src/map/map.h @@ -1023,7 +1023,7 @@ struct map_interface { int (*eraseallipport_sub) (DBKey key, DBData *data, va_list va); char* (*init_mapcache) (FILE *fp); int (*readfromcache) (struct map_data *m, char *buffer); - int (*addmap) (char *mapname); + int (*addmap) (const char *mapname); void (*delmapid) (int id); void (*zone_db_clear) (void); void (*list_final) (void); |