diff options
| author | MadCamel <madcamel@gmail.com> | 2010-04-04 16:15:43 -0400 |
|---|---|---|
| committer | MadCamel <madcamel@gmail.com> | 2010-04-04 16:15:43 -0400 |
| commit | b683a1ba9ba9e46bab0d8f94e38ef56669f8530a (patch) | |
| tree | c90685468d3a67f4f2dc98d72b1d23d0745ad693 /src/map | |
| parent | 3db7c2cd1c4fb0d8888416e9b5733abab574ebe9 (diff) | |
| download | tmwa-b683a1ba9ba9e46bab0d8f94e38ef56669f8530a.tar.gz tmwa-b683a1ba9ba9e46bab0d8f94e38ef56669f8530a.tar.bz2 tmwa-b683a1ba9ba9e46bab0d8f94e38ef56669f8530a.tar.xz tmwa-b683a1ba9ba9e46bab0d8f94e38ef56669f8530a.zip | |
Fixed some bad code that was generating compiler warnings
Diffstat (limited to 'src/map')
| -rw-r--r-- | src/map/atcommand.c | 2 | ||||
| -rw-r--r-- | src/map/battle.c | 6 | ||||
| -rw-r--r-- | src/map/npc.c | 6 |
3 files changed, 8 insertions, 6 deletions
diff --git a/src/map/atcommand.c b/src/map/atcommand.c index d3ea644..062e898 100644 --- a/src/map/atcommand.c +++ b/src/map/atcommand.c @@ -3228,7 +3228,7 @@ int atcommand_produce (const int fd, struct map_session_data *sd, if (item_id != 0 && itemdb_exists (item_id)) sprintf (output, msg_table[169], item_id, item_data->name); // This item (%d: '%s') is not an equipment. else - sprintf (output, msg_table[170]); // This item is not an equipment. + sprintf (output, "%s", msg_table[170]); // This item is not an equipment. clif_displaymessage (fd, output); return -1; } diff --git a/src/map/battle.c b/src/map/battle.c index 1cee690..4ec942f 100644 --- a/src/map/battle.c +++ b/src/map/battle.c @@ -1671,7 +1671,7 @@ int battle_calc_damage (struct block_list *src, struct block_list *bl, { // ボルケーノ if (flag & BF_SKILL && skill_get_pl (skill_num) == 3) damage += damage * sc_data[SC_VOLCANO].val4 / 100; - else if (!flag & BF_SKILL && battle_get_attack_element (bl) == 3) + else if (!(flag & BF_SKILL) && (battle_get_attack_element (bl) == 3)) damage += damage * sc_data[SC_VOLCANO].val4 / 100; } @@ -1679,7 +1679,7 @@ int battle_calc_damage (struct block_list *src, struct block_list *bl, { // バイオレントゲイル if (flag & BF_SKILL && skill_get_pl (skill_num) == 4) damage += damage * sc_data[SC_VIOLENTGALE].val4 / 100; - else if (!flag & BF_SKILL && battle_get_attack_element (bl) == 4) + else if (!(flag & BF_SKILL) && (battle_get_attack_element (bl) == 4)) damage += damage * sc_data[SC_VIOLENTGALE].val4 / 100; } @@ -1687,7 +1687,7 @@ int battle_calc_damage (struct block_list *src, struct block_list *bl, { // デリュージ if (flag & BF_SKILL && skill_get_pl (skill_num) == 1) damage += damage * sc_data[SC_DELUGE].val4 / 100; - else if (!flag & BF_SKILL && battle_get_attack_element (bl) == 1) + else if (!(flag & BF_SKILL) && (battle_get_attack_element (bl) == 1)) damage += damage * sc_data[SC_DELUGE].val4 / 100; } diff --git a/src/map/npc.c b/src/map/npc.c index edbf548..ab0e7ff 100644 --- a/src/map/npc.c +++ b/src/map/npc.c @@ -1543,7 +1543,8 @@ static int npc_parse_script (char *w1, char *w2, char *w3, char *w4, for (i = strlen (srcbuf) - 1; i >= 0 && isspace (srcbuf[i]); i--); if (i >= 0 && srcbuf[i] == '}') break; - fgets (line, 1020, fp); + if (!fgets (line, 1020, fp)) + break; (*lines)++; if (feof (fp)) break; @@ -1827,7 +1828,8 @@ static int npc_parse_function (char *w1, char *w2, char *w3, char *w4, for (i = strlen (srcbuf) - 1; i >= 0 && isspace (srcbuf[i]); i--); if (i >= 0 && srcbuf[i] == '}') break; - fgets (line, 1020, fp); + if (!fgets (line, 1020, fp)) + break; (*lines)++; if (feof (fp)) break; |