Mirroristas/rathena
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

-Fix old warnings. 1st step to get ride of -wno flag in configure.

Browse Source 
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@16987 54d463be-8e91-2dee-dedb-b68131a5f0ec
This commit is contained in:
glighta 2012-11-30 04:13:46 +00:00
parent 2821d94d7b
commit 14ecbcf666
6 changed files with 14 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

@ -14,7 +14,7 @@
# ENABLE_* : option to use an internal feature/code or not # ENABLE_* : option to use an internal feature/code or not
# HAVE_* : internal variable indicating if we have and are using something # HAVE_* : internal variable indicating if we have and are using something
# #
# Maintainer: Flávio J. Saraiva (feel free to send complaints or suggestions) # Maintainer: Fl<EFBFBD>vio J. Saraiva (feel free to send complaints or suggestions)
# flaviojs @ rAthena forum/irc # flaviojs @ rAthena forum/irc
# flaviojs2005 \A-T/ gmail <D.o,T> com # flaviojs2005 \A-T/ gmail <D.o,T> com
# #

2
src/map/atcommand.c
View File

@ -7410,7 +7410,7 @@ ACMD_FUNC(mapflag)
clif_displaymessage(sd->fd,atcmd_output);\ clif_displaymessage(sd->fd,atcmd_output);\
return 0;\ return 0;\
} }
unsigned char flag_name[100]; char flag_name[100];
int flag=0,i; int flag=0,i;
nullpo_retr(-1, sd); nullpo_retr(-1, sd);
memset(flag_name, '\0', sizeof(flag_name)); memset(flag_name, '\0', sizeof(flag_name));

5
src/map/battle.c
View File

@ -3472,7 +3472,8 @@ struct Damage battle_calc_magic_attack(struct block_list *src,struct block_list
short s_ele = 0; short s_ele = 0;
unsigned int skillratio = 100; //Skill dmg modifiers. unsigned int skillratio = 100; //Skill dmg modifiers.
struct map_session_data *sd, *tsd; TBL_PC *sd;
// TBL_PC *tsd;
struct Damage ad; struct Damage ad;
struct status_data *sstatus = status_get_status_data(src); struct status_data *sstatus = status_get_status_data(src);
struct status_data *tstatus = status_get_status_data(target); struct status_data *tstatus = status_get_status_data(target);
@ -3499,7 +3500,7 @@ struct Damage battle_calc_magic_attack(struct block_list *src,struct block_list
flag.imdef = nk &NK_IGNORE_DEF?1:0; flag.imdef = nk &NK_IGNORE_DEF?1:0;
sd = BL_CAST(BL_PC, src); sd = BL_CAST(BL_PC, src);
tsd = BL_CAST(BL_PC, target); // tsd = BL_CAST(BL_PC, target);
if (skill_num == SO_PSYCHIC_WAVE) { if (skill_num == SO_PSYCHIC_WAVE) {
struct status_change *sc = status_get_sc(src); struct status_change *sc = status_get_sc(src);

4
src/map/clif.c
View File

@ -5345,7 +5345,7 @@ void clif_displaymessage(const int fd, const char *mes)
WFIFOHEAD(fd, 5 + len); WFIFOHEAD(fd, 5 + len);
WFIFOW(fd,0) = 0x8e; WFIFOW(fd,0) = 0x8e;
WFIFOW(fd,2) = 5 + len; // 4 + len + NULL teminate WFIFOW(fd,2) = 5 + len; // 4 + len + NULL teminate
safestrncpy(WFIFOP(fd,4), line, len + 1); safestrncpy((char *)WFIFOP(fd,4), line, len + 1);
WFIFOSET(fd, 5 + len); WFIFOSET(fd, 5 + len);
} }
line = strtok(NULL, "\n"); line = strtok(NULL, "\n");
@ -6438,7 +6438,7 @@ void clif_party_message(struct party_data *p, int account_id, const char *mes, i
WBUFW(buf,0)=0x109; WBUFW(buf,0)=0x109;
WBUFW(buf,2)=len+8; WBUFW(buf,2)=len+8;
WBUFL(buf,4)=account_id; WBUFL(buf,4)=account_id;
safestrncpy(WBUFP(buf,8), mes, len); safestrncpy((char *)WBUFP(buf,8), mes, len);
clif_send(buf,len+8,&sd->bl,PARTY); clif_send(buf,len+8,&sd->bl,PARTY);
} }
} }

2
src/map/intif.c
View File

@ -2134,7 +2134,7 @@ void intif_request_accinfo(int u_fd, int aid, int group_id, char *query)
WFIFOL(inter_fd,2) = u_fd; WFIFOL(inter_fd,2) = u_fd;
WFIFOL(inter_fd,6) = aid; WFIFOL(inter_fd,6) = aid;
WFIFOL(inter_fd,10) = group_id; WFIFOL(inter_fd,10) = group_id;
safestrncpy(WFIFOP(inter_fd,14), query, NAME_LENGTH); safestrncpy((char *)WFIFOP(inter_fd,14), query, NAME_LENGTH);
WFIFOSET(inter_fd,2 + 4 + 4 + 4 + NAME_LENGTH); WFIFOSET(inter_fd,2 + 4 + 4 + 4 + NAME_LENGTH);

4
src/map/status.c
View File

@ -3806,7 +3806,7 @@ void status_calc_bl_main(struct block_list *bl, /*enum scb_flag*/int flag)
status->matk_min = status_calc_matk(bl, sc, status->matk_min); status->matk_min = status_calc_matk(bl, sc, status->matk_min);
status->matk_max = status_calc_matk(bl, sc, status->matk_max); status->matk_max = status_calc_matk(bl, sc, status->matk_max);
if (bl->type&BL_HOM && battle_config.hom_setting&0x20 //Hom Min Matk is always the same as Max Matk if ((bl->type&BL_HOM && battle_config.hom_setting&0x20) //Hom Min Matk is always the same as Max Matk
|| ( sc && sc->data[SC_RECOGNIZEDSPELL] )) || ( sc && sc->data[SC_RECOGNIZEDSPELL] ))
status->matk_min = status->matk_max; status->matk_min = status->matk_max;
@ -6210,7 +6210,7 @@ int status_get_sc_def(struct block_list *bl, enum sc_type type, int rate, int ti
tick -= (status->int_ + status->luk) / 20 * 1000; tick -= (status->int_ + status->luk) / 20 * 1000;
break; break;
case SC_STASIS: case SC_STASIS:
//5 second (fixed) + { Stasis Skill level * 5 - (Target’s VIT + DEX) / 20 } //5 second (fixed) + { Stasis Skill level * 5 - (Target<EFBFBD>s VIT + DEX) / 20 }
tick -= (status->vit + status->dex) / 20 * 1000; tick -= (status->vit + status->dex) / 20 * 1000;
break; break;
case SC_WHITEIMPRISON: case SC_WHITEIMPRISON: