diff options
| author | Haru <haru@dotalux.com> | 2019-06-30 19:38:16 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-06-30 19:38:16 +0200 |
| commit | abc127d7a82891e9d079847a4c01f5e7c429eee2 (patch) | |
| tree | 9d78ec954a980b3d439a1dd8fe385d92b3d6343c | |
| parent | bd4c28934cc1b9701757669cd20f929bc6e54404 (diff) | |
| parent | e4ea52c0651b7b204aad696d600e623ef1890016 (diff) | |
| download | hercules-abc127d7a82891e9d079847a4c01f5e7c429eee2.tar.gz hercules-abc127d7a82891e9d079847a4c01f5e7c429eee2.tar.bz2 hercules-abc127d7a82891e9d079847a4c01f5e7c429eee2.tar.xz hercules-abc127d7a82891e9d079847a4c01f5e7c429eee2.zip | |
Merge pull request #2410 from AnnieRuru/74-adjust_skill_damage_ShowWarning
Suppress ShowWarning for certain mapflags when @reloadscript
| -rw-r--r-- | src/map/npc.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/src/map/npc.c b/src/map/npc.c index c7fc7e133..fea82c873 100644 --- a/src/map/npc.c +++ b/src/map/npc.c @@ -4368,8 +4368,7 @@ static const char *npc_parse_mapflag(const char *w1, const char *w2, const char if (!strcmpi(w3, "nosave")) { char savemap[32]; int savex, savey; - if (state == 0) - ; //Map flag disabled. + if (state == 0); //Map flag disabled. else if (w4 && !strcmpi(w4, "SavePoint")) { map->list[m].save.map = 0; map->list[m].save.x = -1; @@ -4662,7 +4661,8 @@ static const char *npc_parse_mapflag(const char *w1, const char *w2, const char } } - if( modifier[0] == '\0' ) { + if (state == 0); //Map flag disabled. + else if (modifier[0] == '\0') { ShowWarning("npc_parse_mapflag: Missing 5th param for 'adjust_unit_duration' flag! removing flag from %s in file '%s', line '%d'.\n", map->list[m].name, filepath, strline(buffer,start-buffer)); if (retval) *retval = EXIT_FAILURE; } else if( !( skill_id = skill->name2id(skill_name) ) || !skill->get_unit_id( skill->name2id(skill_name), 0) ) { @@ -4721,7 +4721,8 @@ static const char *npc_parse_mapflag(const char *w1, const char *w2, const char } } - if( modifier[0] == '\0' ) { + if (state == 0); //Map flag disabled. + else if (modifier[0] == '\0') { ShowWarning("npc_parse_mapflag: Missing 5th param for 'adjust_skill_damage' flag! removing flag from %s in file '%s', line '%d'.\n", map->list[m].name, filepath, strline(buffer,start-buffer)); if (retval) *retval = EXIT_FAILURE; } else if( !( skill_id = skill->name2id(skill_name) ) ) { |