From 9910478ce2be160492d2cd072d906d1365de5113 Mon Sep 17 00:00:00 2001 From: aleos89 Date: Wed, 16 Nov 2016 13:07:19 -0500 Subject: [PATCH] Resolved some compile warnings * Resolved two unreachable code warnings. * Resolved two potentially uninitialized local variable warnings. --- src/map/atcommand.c | 1 - src/map/script.c | 4 ++-- src/map/skill.c | 2 -- 3 files changed, 2 insertions(+), 5 deletions(-) diff --git a/src/map/atcommand.c b/src/map/atcommand.c index a44abd9ad7..85c3c62762 100644 --- a/src/map/atcommand.c +++ b/src/map/atcommand.c @@ -3478,7 +3478,6 @@ ACMD_FUNC(breakguild) clif_displaymessage(fd, msg_txt(sd,252)); // You are not in a guild. return -1; } - return 0; } /** diff --git a/src/map/script.c b/src/map/script.c index 47aaf4c76d..b72500fd9c 100644 --- a/src/map/script.c +++ b/src/map/script.c @@ -20378,9 +20378,9 @@ BUILDIN_FUNC(party_create) { char party_name[NAME_LENGTH]; int item1 = 0, item2 = 0; - TBL_PC *sd; + TBL_PC *sd = NULL; - if( (!script_hasdata(st,3) && !(sd = script_rid2sd(st))) || (script_hasdata(st,3) && !(sd = map_charid2sd(script_getnum(st,3)))) ) { + if (!script_charid2sd(3, sd)) { script_pushint(st,-1); return SCRIPT_CMD_FAILURE; } diff --git a/src/map/skill.c b/src/map/skill.c index 8cd4e6ae10..ea2e3fcd36 100755 --- a/src/map/skill.c +++ b/src/map/skill.c @@ -14424,8 +14424,6 @@ int skill_check_condition_char_sub (struct block_list *bl, va_list ap) { p_sd[(*c)++]=tsd->bl.id; return skill_lv; - } else { - return 0; } } break;