summaryrefslogtreecommitdiff
path: root/src/map/script.c
diff options
context:
space:
mode:
authorHaru <haru@dotalux.com>2016-10-01 00:16:21 +0200
committerGitHub <noreply@github.com>2016-10-01 00:16:21 +0200
commitdd71362b10e5986e034ed86db08961926440ace0 (patch)
tree119c8d409657cee1d90cd0c072ef3b7e846fa3f0 /src/map/script.c
parent84ecefb4db23bbd98194a43a592cfe313477a1ab (diff)
parent2000a698da35915afb1a598433337a735d27ae24 (diff)
downloadhercules-dd71362b10e5986e034ed86db08961926440ace0.tar.gz
hercules-dd71362b10e5986e034ed86db08961926440ace0.tar.bz2
hercules-dd71362b10e5986e034ed86db08961926440ace0.tar.xz
hercules-dd71362b10e5986e034ed86db08961926440ace0.zip
Merge pull request #1450 from 4144/gcc7fixes
Add different fixes for gcc 7 warnings.
Diffstat (limited to 'src/map/script.c')
-rw-r--r--src/map/script.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/map/script.c b/src/map/script.c
index f8754660c..a1efbb3b8 100644
--- a/src/map/script.c
+++ b/src/map/script.c
@@ -2291,7 +2291,7 @@ void read_constdb(void)
struct config_setting_t *t;
int i = 0;
- sprintf(filepath, "%s/constants.conf", map->db_path);
+ snprintf(filepath, 256, "%s/constants.conf", map->db_path);
if (!libconfig->load_file(&constants_conf, filepath))
return;
@@ -9269,7 +9269,7 @@ BUILDIN(bonus) {
val1 = skill->name2id(script_getstr(st, 3));
break;
}
- // else fall through
+ FALLTHROUGH
default:
val1 = script_getnum(st,3);
break;