From df2c3e1645be0c22b0cb9e92ce45ac004ffe7c00 Mon Sep 17 00:00:00 2001 From: aleos89 Date: Mon, 17 Jul 2017 14:55:44 -0400 Subject: [PATCH] Fixed a compile warning for ADJUST_SKILL_DAMAGE * Fixes #2231. Thanks to @technoken! --- src/common/ers.c | 2 +- src/common/ers.h | 2 +- src/map/map.cpp | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/common/ers.c b/src/common/ers.c index 8903a57934..ef31fc92be 100644 --- a/src/common/ers.c +++ b/src/common/ers.c @@ -290,7 +290,7 @@ void ers_cache_size(ERS *self, unsigned int new_size) { } -ERS *ers_new(uint32 size, char *name, enum ERSOptions options) +ERS *ers_new(uint32 size, const char *name, enum ERSOptions options) { struct ers_instance_t *instance; CREATE(instance,struct ers_instance_t, 1); diff --git a/src/common/ers.h b/src/common/ers.h index 8a1f617540..c54d5999f4 100644 --- a/src/common/ers.h +++ b/src/common/ers.h @@ -162,7 +162,7 @@ typedef struct eri { * @param The requested size of the entry in bytes * @return Interface of the object */ -ERS *ers_new(uint32 size, char *name, enum ERSOptions options); +ERS *ers_new(uint32 size, const char *name, enum ERSOptions options); /** * Print a report about the current state of the Entry Reusage System. diff --git a/src/map/map.cpp b/src/map/map.cpp index f18e10d278..710e0f56cc 100644 --- a/src/map/map.cpp +++ b/src/map/map.cpp @@ -4697,7 +4697,7 @@ int do_init(int argc, char *argv[]) iwall_db = strdb_alloc(DB_OPT_RELEASE_DATA,2*NAME_LENGTH+2+1); // [Zephyrus] Invisible Walls #ifdef ADJUST_SKILL_DAMAGE - map_skill_damage_ers = ers_new(sizeof(struct s_skill_damage), "map.c:map_skill_damage_ers", ERS_OPT_NONE); + map_skill_damage_ers = ers_new(sizeof(struct s_skill_damage), "map.cpp:map_skill_damage_ers", ERS_OPT_NONE); #endif map_sql_init();