diff options
| author | glighta <glighta@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2012-12-05 14:24:00 +0000 |
|---|---|---|
| committer | glighta <glighta@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2012-12-05 14:24:00 +0000 |
| commit | 4463d3c44108b98735aaccd21b821647da6e23cc (patch) | |
| tree | dee39577a614c4faf761138b458d30f04cf26e2c | |
| parent | 819a81b5fd39095b417fa7b4873555e8f6304be1 (diff) | |
| download | hercules-4463d3c44108b98735aaccd21b821647da6e23cc.tar.gz hercules-4463d3c44108b98735aaccd21b821647da6e23cc.tar.bz2 hercules-4463d3c44108b98735aaccd21b821647da6e23cc.tar.xz hercules-4463d3c44108b98735aaccd21b821647da6e23cc.zip | |
- Re-committed r16987 (pid:161281).
-Re-commiting part is now ended
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@17003 54d463be-8e91-2dee-dedb-b68131a5f0ec
| -rw-r--r-- | src/map/atcommand.c | 2 | ||||
| -rw-r--r-- | src/map/battle.c | 5 | ||||
| -rw-r--r-- | src/map/clif.c | 4 | ||||
| -rw-r--r-- | src/map/intif.c | 2 |
4 files changed, 7 insertions, 6 deletions
diff --git a/src/map/atcommand.c b/src/map/atcommand.c index ec2f3ed43..d115fdffa 100644 --- a/src/map/atcommand.c +++ b/src/map/atcommand.c @@ -7484,7 +7484,7 @@ ACMD_FUNC(mapflag) { clif_displaymessage(sd->fd,atcmd_output);\ return 0;\ } - unsigned char flag_name[100]; + char flag_name[100]; int flag=0,i; nullpo_retr(-1, sd); memset(flag_name, '\0', sizeof(flag_name)); diff --git a/src/map/battle.c b/src/map/battle.c index ed832106f..9dd31d02b 100644 --- a/src/map/battle.c +++ b/src/map/battle.c @@ -3505,7 +3505,8 @@ struct Damage battle_calc_magic_attack(struct block_list *src,struct block_list short s_ele = 0; unsigned int skillratio = 100; //Skill dmg modifiers. - struct map_session_data *sd, *tsd; + TBL_PC *sd; +// TBL_PC *tsd; struct Damage ad; struct status_data *sstatus = status_get_status_data(src); struct status_data *tstatus = status_get_status_data(target); @@ -3533,7 +3534,7 @@ struct Damage battle_calc_magic_attack(struct block_list *src,struct block_list flag.imdef = nk&NK_IGNORE_DEF?1:0; sd = BL_CAST(BL_PC, src); - tsd = BL_CAST(BL_PC, target); +// tsd = BL_CAST(BL_PC, target); if( skill_num == SO_PSYCHIC_WAVE ) { struct status_change *sc = status_get_sc(src); diff --git a/src/map/clif.c b/src/map/clif.c index 385aaff13..5ae67d77b 100644 --- a/src/map/clif.c +++ b/src/map/clif.c @@ -5406,7 +5406,7 @@ void clif_displaymessage(const int fd, const char* mes) WFIFOHEAD(fd, 5 + len); WFIFOW(fd,0) = 0x8e; 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); } line = strtok(NULL, "\n"); @@ -6502,7 +6502,7 @@ void clif_party_message(struct party_data* p, int account_id, const char* mes, i WBUFW(buf,0)=0x109; WBUFW(buf,2)=len+8; 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); } } diff --git a/src/map/intif.c b/src/map/intif.c index 3bbb92216..5f3eb374e 100644 --- a/src/map/intif.c +++ b/src/map/intif.c @@ -2130,7 +2130,7 @@ void intif_request_accinfo( int u_fd, int aid, int group_id, char* query ) { WFIFOL(inter_fd,2) = u_fd; WFIFOL(inter_fd,6) = aid; 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); |