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

Fixed NPC markets

Browse Source 
Fixed signedness warnings for the sanity zero-terminations
This commit is contained in:
Lemongrass3110 2016-10-13 08:32:40 +02:00
parent e443f846c6
commit 6a8985531b
4 changed files with 72 additions and 70 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
sql-files/main.sql
View File

@ -715,7 +715,7 @@ CREATE TABLE IF NOT EXISTS `mapreg` (
--
CREATE TABLE IF NOT EXISTS `market` (
`name` varchar(32) NOT NULL DEFAULT '',
`name` varchar(50) NOT NULL DEFAULT '',
`nameid` SMALLINT(5) UNSIGNED NOT NULL,
`price` INT(11) UNSIGNED NOT NULL,
`amount` SMALLINT(5) UNSIGNED NOT NULL,

2
sql-files/upgrades/upgrade_20161013.sql Normal file
View File

@ -0,0 +1,2 @@
ALTER TABLE `market`
MODIFY `name` varchar(50) NOT NULL DEFAULT '';

134
src/map/clif.c
View File

@ -1499,7 +1499,7 @@ void clif_hominfo(struct map_session_data *sd, struct homun_data *hd, int flag)
memset(buf,0,packet_len(cmd));
WBUFW(buf,0) = cmd;
safestrncpy(WBUFP(buf,2), hd->homunculus.name, NAME_LENGTH);
safestrncpy((char*)WBUFP(buf,2), hd->homunculus.name, NAME_LENGTH);
// Bit field, bit 0 : rename_flag (1 = already renamed), bit 1 : homunc vaporized (1 = true), bit 2 : homunc dead (1 = true)
WBUFB(buf,26) = (battle_config.hom_rename ? 0 : hd->homunculus.rename_flag) | (hd->homunculus.vaporize << 1) | (hd->homunculus.hp ? 0 : 4);
WBUFW(buf,27) = hd->homunculus.level;
@ -4096,15 +4096,15 @@ void clif_joinchatok(struct map_session_data *sd,struct chat_data* cd)
if(cd->owner->type == BL_NPC){
WFIFOL(fd, 30) = 1;
WFIFOL(fd, 8) = 0;
safestrncpy(WFIFOP(fd, 12), ((struct npc_data *)cd->owner)->name, NAME_LENGTH);
safestrncpy((char*)WFIFOP(fd, 12), ((struct npc_data *)cd->owner)->name, NAME_LENGTH);
for (i = 0; i < cd->users; i++) {
WFIFOL(fd, 8+(i+1)*28) = 1;
safestrncpy(WFIFOP(fd, 8+(i+t)*28+4), cd->usersd[i]->status.name, NAME_LENGTH);
safestrncpy((char*)WFIFOP(fd, 8+(i+t)*28+4), cd->usersd[i]->status.name, NAME_LENGTH);
}
}else{
for (i = 0; i < cd->users; i++) {
WFIFOL(fd, 8+i*28) = (i != 0 || cd->owner->type == BL_NPC);
safestrncpy(WFIFOP(fd, 8+(i+t)*28+4), cd->usersd[i]->status.name, NAME_LENGTH);
safestrncpy((char*)WFIFOP(fd, 8+(i+t)*28+4), cd->usersd[i]->status.name, NAME_LENGTH);
}
}
WFIFOSET(fd, WFIFOW(fd, 2));
@ -4122,7 +4122,7 @@ void clif_addchat(struct chat_data* cd,struct map_session_data *sd)
WBUFW(buf, 0) = 0xdc;
WBUFW(buf, 2) = cd->users;
safestrncpy(WBUFP(buf, 4),sd->status.name,NAME_LENGTH);
safestrncpy((char*)WBUFP(buf, 4),sd->status.name,NAME_LENGTH);
clif_send(buf,packet_len(0xdc),&sd->bl,CHAT_WOS);
}
@ -4141,11 +4141,11 @@ void clif_changechatowner(struct chat_data* cd, struct map_session_data* sd)
WBUFW(buf, 0) = 0xe1;
WBUFL(buf, 2) = 1;
safestrncpy(WBUFP(buf,6),cd->usersd[0]->status.name,NAME_LENGTH);
safestrncpy((char*)WBUFP(buf,6),cd->usersd[0]->status.name,NAME_LENGTH);
WBUFW(buf,30) = 0xe1;
WBUFL(buf,32) = 0;
safestrncpy(WBUFP(buf,36),sd->status.name,NAME_LENGTH);
safestrncpy((char*)WBUFP(buf,36),sd->status.name,NAME_LENGTH);
clif_send(buf,packet_len(0xe1)*2,&sd->bl,CHAT);
}
@ -4165,7 +4165,7 @@ void clif_leavechat(struct chat_data* cd, struct map_session_data* sd, bool flag
WBUFW(buf, 0) = 0xdd;
WBUFW(buf, 2) = cd->users-1;
safestrncpy(WBUFP(buf,4),sd->status.name,NAME_LENGTH);
safestrncpy((char*)WBUFP(buf,4),sd->status.name,NAME_LENGTH);
WBUFB(buf,28) = flag;
clif_send(buf,packet_len(0xdd),&sd->bl,CHAT);
@ -7219,8 +7219,8 @@ void clif_party_member_info(struct party_data *p, struct map_session_data *sd)
WBUFW(buf,10) = sd->bl.x;
WBUFW(buf,12) = sd->bl.y;
WBUFB(buf,14) = (p->party.member[i].online)?0:1;
safestrncpy(WBUFP(buf,15), p->party.name, NAME_LENGTH);
safestrncpy(WBUFP(buf,39), sd->status.name, NAME_LENGTH);
safestrncpy((char*)WBUFP(buf,15), p->party.name, NAME_LENGTH);
safestrncpy((char*)WBUFP(buf,39), sd->status.name, NAME_LENGTH);
mapindex_getmapname_ext(map_mapid2mapname(sd->bl.m), (char*)WBUFP(buf,63));
WBUFB(buf,79) = (p->party.item&1)?1:0;
WBUFB(buf,80) = (p->party.item&2)?1:0;
@ -7245,7 +7245,7 @@ void clif_party_info(struct party_data* p, struct map_session_data *sd)
nullpo_retv(p);
WBUFW(buf,0) = 0xfb;
safestrncpy(WBUFP(buf,4), p->party.name, NAME_LENGTH);
safestrncpy((char*)WBUFP(buf,4), p->party.name, NAME_LENGTH);
for(i = 0, c = 0; i < MAX_PARTY; i++)
{
struct party_member* m = &p->party.member[i];
@ -7254,7 +7254,7 @@ void clif_party_info(struct party_data* p, struct map_session_data *sd)
if(party_sd == NULL) party_sd = p->data[i].sd;
WBUFL(buf,28+c*46) = m->account_id;
safestrncpy(WBUFP(buf,28+c*46+4), m->name, NAME_LENGTH);
safestrncpy((char*)WBUFP(buf,28+c*46+4), m->name, NAME_LENGTH);
mapindex_getmapname_ext(mapindex_id2name(m->map), (char*)WBUFP(buf,28+c*46+28));
WBUFB(buf,28+c*46+44) = (m->leader) ? 0 : 1;
WBUFB(buf,28+c*46+45) = (m->online) ? 0 : 1;
@ -7312,7 +7312,7 @@ void clif_party_invite(struct map_session_data *sd,struct map_session_data *tsd)
WFIFOHEAD(fd,packet_len(cmd));
WFIFOW(fd,0)=cmd;
WFIFOL(fd,2)=sd->status.party_id;
safestrncpy(WFIFOP(fd,6),p->party.name,NAME_LENGTH);
safestrncpy((char*)WFIFOP(fd,6),p->party.name,NAME_LENGTH);
WFIFOSET(fd,packet_len(cmd));
}
@ -7686,7 +7686,7 @@ void clif_send_petstatus(struct map_session_data *sd)
pet = &sd->pd->pet;
WFIFOHEAD(fd,packet_len(0x1a2));
WFIFOW(fd,0)=0x1a2;
safestrncpy(WFIFOP(fd,2),pet->name,NAME_LENGTH);
safestrncpy((char*)WFIFOP(fd,2),pet->name,NAME_LENGTH);
WFIFOB(fd,26)=battle_config.pet_rename?0:pet->rename_flag;
WFIFOW(fd,27)=pet->level;
WFIFOW(fd,29)=pet->hungry;
@ -8003,7 +8003,7 @@ void clif_guild_belonginfo(struct map_session_data *sd, struct guild *g)
WFIFOL(fd,10)=g->position[ps].mode;
WFIFOB(fd,14)=(bool)(sd->state.gmaster_flag==1);
WFIFOL(fd,15)=0; // InterSID (unknown purpose)
safestrncpy(WFIFOP(fd,19),g->name,NAME_LENGTH);
safestrncpy((char*)WFIFOP(fd,19),g->name,NAME_LENGTH);
WFIFOSET(fd,packet_len(0x16c));
}
@ -8131,8 +8131,8 @@ void clif_guild_basicinfo(struct map_session_data *sd) {
WFIFOL(fd,34)=0; // Honor: (left) Vulgar [-100,100] Famed (right)
WFIFOL(fd,38)=0; // Virtue: (down) Wicked [-100,100] Righteous (up)
WFIFOL(fd,42)=g->emblem_id;
safestrncpy(WFIFOP(fd,46),g->name, NAME_LENGTH);
safestrncpy(WFIFOP(fd,70),g->master, NAME_LENGTH);
safestrncpy((char*)WFIFOP(fd,46),g->name, NAME_LENGTH);
safestrncpy((char*)WFIFOP(fd,70),g->master, NAME_LENGTH);
safestrncpy((char*)WFIFOP(fd,94),msg_txt(sd,300+guild_checkcastles(g)),16); // "'N' castles"
WFIFOL(fd,110) = 0; // zeny
@ -8160,7 +8160,7 @@ void clif_guild_allianceinfo(struct map_session_data *sd)
if(a->guild_id>0){
WFIFOL(fd,c*32+4)=a->opposition;
WFIFOL(fd,c*32+8)=a->guild_id;
safestrncpy(WFIFOP(fd,c*32+12),a->name,NAME_LENGTH);
safestrncpy((char*)WFIFOP(fd,c*32+12),a->name,NAME_LENGTH);
c++;
}
}
@ -8205,7 +8205,7 @@ void clif_guild_memberlist(struct map_session_data *sd)
WFIFOL(fd,c*104+26)=m->online;
WFIFOL(fd,c*104+30)=m->position;
memset(WFIFOP(fd,c*104+34),0,50); //[Ind] - This is displayed in the 'note' column but being you can't edit it it's sent empty.
safestrncpy(WFIFOP(fd,c*104+84),m->name,NAME_LENGTH);
safestrncpy((char*)WFIFOP(fd,c*104+84),m->name,NAME_LENGTH);
c++;
}
WFIFOW(fd, 2)=c*104+4;
@ -8229,7 +8229,7 @@ void clif_guild_positionnamelist(struct map_session_data *sd)
WFIFOW(fd, 0)=0x166;
for(i=0;i<MAX_GUILDPOSITION;i++){
WFIFOL(fd,i*28+4)=i;
safestrncpy(WFIFOP(fd,i*28+8),g->position[i].name,NAME_LENGTH);
safestrncpy((char*)WFIFOP(fd,i*28+8),g->position[i].name,NAME_LENGTH);
}
WFIFOW(fd,2)=i*28+4;
WFIFOSET(fd,WFIFOW(fd,2));
@ -8291,7 +8291,7 @@ void clif_guild_positionchanged(struct guild *g,int idx)
WBUFL(buf, 8)=g->position[idx].mode;
WBUFL(buf,12)=idx;
WBUFL(buf,16)=g->position[idx].exp_mode;
safestrncpy(WBUFP(buf,20),g->position[idx].name,NAME_LENGTH);
safestrncpy((char*)WBUFP(buf,20),g->position[idx].name,NAME_LENGTH);
// }*
if( (sd=guild_getavailablesd(g))!=NULL )
clif_send(buf,WBUFW(buf,2),&sd->bl,GUILD);
@ -8437,7 +8437,7 @@ void clif_guild_invite(struct map_session_data *sd,struct guild *g)
WFIFOHEAD(fd,packet_len(0x16a));
WFIFOW(fd,0)=0x16a;
WFIFOL(fd,2)=g->guild_id;
safestrncpy(WFIFOP(fd,6),g->name,NAME_LENGTH);
safestrncpy((char*)WFIFOP(fd,6),g->name,NAME_LENGTH);
WFIFOSET(fd,packet_len(0x16a));
}
@ -8472,7 +8472,7 @@ void clif_guild_leave(struct map_session_data *sd,const char *name,const char *m
nullpo_retv(sd);
WBUFW(buf, 0)=0x15a;
safestrncpy(WBUFP(buf, 2),name,NAME_LENGTH);
safestrncpy((char*)WBUFP(buf, 2),name,NAME_LENGTH);
memcpy(WBUFP(buf,26),mes,40);
clif_send(buf,packet_len(0x15a),&sd->bl,GUILD_NOBG);
}
@ -8531,7 +8531,7 @@ void clif_guild_expulsionlist(struct map_session_data* sd)
if( e->account_id > 0 )
{
safestrncpy(WFIFOP(fd,4 + c*offset), e->name, NAME_LENGTH);
safestrncpy((char*)WFIFOP(fd,4 + c*offset), e->name, NAME_LENGTH);
#if PACKETVER < 20100803
memset(WFIFOP(fd,4 + c*offset+24), 0, NAME_LENGTH); // account name (not used for security reasons)
memcpy(WFIFOP(fd,4 + c*offset+48), e->mes, 40);
@ -8583,7 +8583,7 @@ void clif_guild_reqalliance(struct map_session_data *sd,uint32 account_id,const
WFIFOHEAD(fd,packet_len(0x171));
WFIFOW(fd,0)=0x171;
WFIFOL(fd,2)=account_id;
safestrncpy(WFIFOP(fd,6),name,NAME_LENGTH);
safestrncpy((char*)WFIFOP(fd,6),name,NAME_LENGTH);
WFIFOSET(fd,packet_len(0x171));
}
@ -8747,7 +8747,7 @@ void clif_callpartner(struct map_session_data *sd)
const char *p = map_charid2nick(sd->status.partner_id);
struct map_session_data *p_sd = pc_get_partner(sd);
if( p != NULL && p_sd != NULL && !p_sd->state.autotrade )
safestrncpy(WBUFP(buf,2), p, NAME_LENGTH);
safestrncpy((char*)WBUFP(buf,2), p, NAME_LENGTH);
else
WBUFB(buf,2) = 0;
} else {// Send zero-length name if no partner, to initialize the client buffer.
@ -8785,7 +8785,7 @@ void clif_divorced(struct map_session_data* sd, const char* name)
fd=sd->fd;
WFIFOHEAD(fd,packet_len(0x205));
WFIFOW(fd,0)=0x205;
safestrncpy(WFIFOP(fd,2), name, NAME_LENGTH);
safestrncpy((char*)WFIFOP(fd,2), name, NAME_LENGTH);
WFIFOSET(fd, packet_len(0x205));
}
@ -9265,11 +9265,11 @@ void clif_charnameack (int fd, struct block_list *bl)
if( ssd->fakename[0] ) {
WBUFW(buf, 0) = cmd = 0x195;
safestrncpy(WBUFP(buf,6), ssd->fakename, NAME_LENGTH);
safestrncpy((char*)WBUFP(buf,6), ssd->fakename, NAME_LENGTH);
WBUFB(buf,30) = WBUFB(buf,54) = WBUFB(buf,78) = 0;
break;
}
safestrncpy(WBUFP(buf,6), ssd->status.name, NAME_LENGTH);
safestrncpy((char*)WBUFP(buf,6), ssd->status.name, NAME_LENGTH);
if( ssd->status.party_id ) {
p = party_search(ssd->status.party_id);
@ -9292,14 +9292,14 @@ void clif_charnameack (int fd, struct block_list *bl)
WBUFW(buf, 0) = cmd = 0x195;
if (p)
safestrncpy(WBUFP(buf,30), p->party.name, NAME_LENGTH);
safestrncpy((char*)WBUFP(buf,30), p->party.name, NAME_LENGTH);
else
WBUFB(buf,30) = 0;
if (g && ps >= 0 && ps < MAX_GUILDPOSITION)
{
safestrncpy(WBUFP(buf,54), g->name,NAME_LENGTH);
safestrncpy(WBUFP(buf,78), g->position[ps].name, NAME_LENGTH);
safestrncpy((char*)WBUFP(buf,54), g->name,NAME_LENGTH);
safestrncpy((char*)WBUFP(buf,78), g->position[ps].name, NAME_LENGTH);
} else { //Assume no guild.
WBUFB(buf,54) = 0;
WBUFB(buf,78) = 0;
@ -9308,29 +9308,29 @@ void clif_charnameack (int fd, struct block_list *bl)
break;
//[blackhole89]
case BL_HOM:
safestrncpy(WBUFP(buf,6), ((TBL_HOM*)bl)->homunculus.name, NAME_LENGTH);
safestrncpy((char*)WBUFP(buf,6), ((TBL_HOM*)bl)->homunculus.name, NAME_LENGTH);
break;
case BL_MER:
safestrncpy(WBUFP(buf,6), ((TBL_MER*)bl)->db->name, NAME_LENGTH);
safestrncpy((char*)WBUFP(buf,6), ((TBL_MER*)bl)->db->name, NAME_LENGTH);
break;
case BL_PET:
safestrncpy(WBUFP(buf,6), ((TBL_PET*)bl)->pet.name, NAME_LENGTH);
safestrncpy((char*)WBUFP(buf,6), ((TBL_PET*)bl)->pet.name, NAME_LENGTH);
break;
case BL_NPC:
safestrncpy(WBUFP(buf,6), ((TBL_NPC*)bl)->name, NAME_LENGTH);
safestrncpy((char*)WBUFP(buf,6), ((TBL_NPC*)bl)->name, NAME_LENGTH);
break;
case BL_MOB:
{
struct mob_data *md = (struct mob_data *)bl;
nullpo_retv(md);
safestrncpy(WBUFP(buf,6), md->name, NAME_LENGTH);
safestrncpy((char*)WBUFP(buf,6), md->name, NAME_LENGTH);
if( md->guardian_data && md->guardian_data->guild_id )
{
WBUFW(buf, 0) = cmd = 0x195;
WBUFB(buf,30) = 0;
safestrncpy(WBUFP(buf,54), md->guardian_data->guild_name, NAME_LENGTH);
safestrncpy(WBUFP(buf,78), md->guardian_data->castle->castle_name, NAME_LENGTH);
safestrncpy((char*)WBUFP(buf,54), md->guardian_data->guild_name, NAME_LENGTH);
safestrncpy((char*)WBUFP(buf,78), md->guardian_data->castle->castle_name, NAME_LENGTH);
}
else if( battle_config.show_mob_info )
{
@ -9347,7 +9347,7 @@ void clif_charnameack (int fd, struct block_list *bl)
if( str_p != mobhp )
{
*(str_p-3) = '\0'; //Remove trailing space + pipe.
safestrncpy(WBUFP(buf,30), mobhp, NAME_LENGTH);
safestrncpy((char*)WBUFP(buf,30), mobhp, NAME_LENGTH);
WBUFB(buf,54) = 0;
WBUFB(buf,78) = 0;
}
@ -9359,7 +9359,7 @@ void clif_charnameack (int fd, struct block_list *bl)
// break;
return;
case BL_ELEM:
safestrncpy(WBUFP(buf,6), ((TBL_ELEM*)bl)->db->name, NAME_LENGTH);
safestrncpy((char*)WBUFP(buf,6), ((TBL_ELEM*)bl)->db->name, NAME_LENGTH);
break;
default:
ShowError("clif_charnameack: bad type %d(%d)\n", bl->type, bl->id);
@ -9394,7 +9394,7 @@ void clif_charnameupdate (struct map_session_data *ssd)
WBUFW(buf,0) = cmd;
WBUFL(buf,2) = ssd->bl.id;
safestrncpy(WBUFP(buf,6), ssd->status.name, NAME_LENGTH);
safestrncpy((char*)WBUFP(buf,6), ssd->status.name, NAME_LENGTH);
if (!battle_config.display_party_name) {
if (ssd->status.party_id > 0 && ssd->status.guild_id > 0 && (g = ssd->guild) != NULL)
@ -9412,14 +9412,14 @@ void clif_charnameupdate (struct map_session_data *ssd)
}
if( p )
safestrncpy(WBUFP(buf,30), p->party.name, NAME_LENGTH);
safestrncpy((char*)WBUFP(buf,30), p->party.name, NAME_LENGTH);
else
WBUFB(buf,30) = 0;
if( g && ps >= 0 && ps < MAX_GUILDPOSITION )
{
safestrncpy(WBUFP(buf,54), g->name,NAME_LENGTH);
safestrncpy(WBUFP(buf,78), g->position[ps].name, NAME_LENGTH);
safestrncpy((char*)WBUFP(buf,54), g->name,NAME_LENGTH);
safestrncpy((char*)WBUFP(buf,78), g->position[ps].name, NAME_LENGTH);
}
else
{
@ -12891,7 +12891,7 @@ void clif_PartyBookingSearchAck(int fd, struct party_booking_ad_info** results,
{
pb_ad = results[i];
WFIFOL(fd,i*size+5) = pb_ad->index;
safestrncpy(WFIFOP(fd,i*size+9),pb_ad->charname,NAME_LENGTH);
safestrncpy((char*)WFIFOP(fd,i*size+9),pb_ad->charname,NAME_LENGTH);
WFIFOL(fd,i*size+33) = pb_ad->starttime; // FIXME: This is expire time
WFIFOW(fd,i*size+37) = pb_ad->p_detail.level;
WFIFOW(fd,i*size+39) = pb_ad->p_detail.mapid;
@ -12955,7 +12955,7 @@ void clif_PartyBookingInsertNotify(struct map_session_data* sd, struct party_boo
WBUFW(buf,0) = 0x809;
WBUFL(buf,2) = pb_ad->index;
safestrncpy(WBUFP(buf,6),pb_ad->charname,NAME_LENGTH);
safestrncpy((char*)WBUFP(buf,6),pb_ad->charname,NAME_LENGTH);
WBUFL(buf,30) = pb_ad->starttime; // FIXME: This is expire time
WBUFW(buf,34) = pb_ad->p_detail.level;
WBUFW(buf,36) = pb_ad->p_detail.mapid;
@ -14004,7 +14004,7 @@ void clif_PMIgnoreList(struct map_session_data* sd)
WFIFOW(fd,0) = 0xd4;
for( i = 0; i < ARRAYLENGTH(sd->ignore) && sd->ignore[i].name[0]; i++ ) {
safestrncpy(WFIFOP(fd,4+i*NAME_LENGTH), sd->ignore[i].name, NAME_LENGTH);
safestrncpy((char*)WFIFOP(fd,4+i*NAME_LENGTH), sd->ignore[i].name, NAME_LENGTH);
}
WFIFOW(fd,2) = 4+i*NAME_LENGTH;
@ -14119,7 +14119,7 @@ void clif_friendslist_send(struct map_session_data *sd)
for(i = 0; i < MAX_FRIENDS && sd->status.friends[i].char_id; i++) {
WFIFOL(fd, 4 + 32 * i + 0) = sd->status.friends[i].account_id;
WFIFOL(fd, 4 + 32 * i + 4) = sd->status.friends[i].char_id;
safestrncpy(WFIFOP(fd, 4 + 32 * i + 8), sd->status.friends[i].name, NAME_LENGTH);
safestrncpy((char*)WFIFOP(fd, 4 + 32 * i + 8), sd->status.friends[i].name, NAME_LENGTH);
}
if (i) {
@ -14153,7 +14153,7 @@ void clif_friendslist_reqack(struct map_session_data *sd, struct map_session_dat
if (f_sd) {
WFIFOL(fd,4) = f_sd->status.account_id;
WFIFOL(fd,8) = f_sd->status.char_id;
safestrncpy(WFIFOP(fd, 12), f_sd->status.name,NAME_LENGTH);
safestrncpy((char*)WFIFOP(fd, 12), f_sd->status.name,NAME_LENGTH);
}
WFIFOSET(fd, packet_len(0x209));
}
@ -14169,7 +14169,7 @@ void clif_friendlist_req(struct map_session_data* sd, uint32 account_id, uint32
WFIFOW(fd,0) = 0x207;
WFIFOL(fd,2) = account_id;
WFIFOL(fd,6) = char_id;
safestrncpy(WFIFOP(fd,10), name, NAME_LENGTH);
safestrncpy((char*)WFIFOP(fd,10), name, NAME_LENGTH);
WFIFOSET(fd,packet_len(0x207));
}
@ -14451,15 +14451,15 @@ void clif_alchemist(struct map_session_data* sd)
if (strcmp(chemist_fame_list[i].name, "-") == 0 &&
(name = map_charid2nick(chemist_fame_list[i].id)) != NULL)
{
safestrncpy(WFIFOP(fd, 2 + 24 * i), name, NAME_LENGTH);
safestrncpy((char*)WFIFOP(fd, 2 + 24 * i), name, NAME_LENGTH);
} else
safestrncpy(WFIFOP(fd, 2 + 24 * i), chemist_fame_list[i].name, NAME_LENGTH);
safestrncpy((char*)WFIFOP(fd, 2 + 24 * i), chemist_fame_list[i].name, NAME_LENGTH);
} else
safestrncpy(WFIFOP(fd, 2 + 24 * i), "None", NAME_LENGTH);
safestrncpy((char*)WFIFOP(fd, 2 + 24 * i), "None", NAME_LENGTH);
WFIFOL(fd, 242 + i * 4) = chemist_fame_list[i].fame;
}
for(;i < 10; i++) { //In case the MAX is less than 10.
safestrncpy(WFIFOP(fd, 2 + 24 * i), "Unavailable", NAME_LENGTH);
safestrncpy((char*)WFIFOP(fd, 2 + 24 * i), "Unavailable", NAME_LENGTH);
WFIFOL(fd, 242 + i * 4) = 0;
}
@ -14504,15 +14504,15 @@ void clif_taekwon(struct map_session_data* sd)
if (strcmp(taekwon_fame_list[i].name, "-") == 0 &&
(name = map_charid2nick(taekwon_fame_list[i].id)) != NULL)
{
safestrncpy(WFIFOP(fd, 2 + 24 * i), name, NAME_LENGTH);
safestrncpy((char*)WFIFOP(fd, 2 + 24 * i), name, NAME_LENGTH);
} else
safestrncpy(WFIFOP(fd, 2 + 24 * i), taekwon_fame_list[i].name, NAME_LENGTH);
safestrncpy((char*)WFIFOP(fd, 2 + 24 * i), taekwon_fame_list[i].name, NAME_LENGTH);
} else
safestrncpy(WFIFOP(fd, 2 + 24 * i), "None", NAME_LENGTH);
safestrncpy((char*)WFIFOP(fd, 2 + 24 * i), "None", NAME_LENGTH);
WFIFOL(fd, 242 + i * 4) = taekwon_fame_list[i].fame;
}
for(;i < 10; i++) { //In case the MAX is less than 10.
safestrncpy(WFIFOP(fd, 2 + 24 * i), "Unavailable", NAME_LENGTH);
safestrncpy((char*)WFIFOP(fd, 2 + 24 * i), "Unavailable", NAME_LENGTH);
WFIFOL(fd, 242 + i * 4) = 0;
}
WFIFOSET(fd, packet_len(0x226));
@ -14550,7 +14550,7 @@ void clif_ranking_pk(struct map_session_data* sd)
WFIFOHEAD(fd,packet_len(0x238));
WFIFOW(fd,0) = 0x238;
for(i=0;i<10;i++){
safestrncpy(WFIFOP(fd,i*24+2), "Unknown", NAME_LENGTH);
safestrncpy((char*)WFIFOP(fd,i*24+2), "Unknown", NAME_LENGTH);
WFIFOL(fd,i*4+242) = 0;
}
WFIFOSET(fd, packet_len(0x238));
@ -14927,7 +14927,7 @@ void clif_Mail_refreshinbox(struct map_session_data *sd)
WFIFOL(fd,8+73*j) = msg->id;
memcpy(WFIFOP(fd,12+73*j), msg->title, MAIL_TITLE_LENGTH);
WFIFOB(fd,52+73*j) = (msg->status != MAIL_UNREAD);
safestrncpy(WFIFOP(fd,53+73*j), msg->send_name, NAME_LENGTH);
safestrncpy((char*)WFIFOP(fd,53+73*j), msg->send_name, NAME_LENGTH);
WFIFOL(fd,77+73*j) = (uint32)msg->timestamp;
j++;
}
@ -15786,7 +15786,7 @@ void clif_Adopt_request(struct map_session_data *sd, struct map_session_data *sr
WFIFOW(fd,0) = 0x1f6;
WFIFOL(fd,2) = src->status.account_id;
WFIFOL(fd,6) = p_id;
safestrncpy(WFIFOP(fd,10), src->status.name, NAME_LENGTH);
safestrncpy((char*)WFIFOP(fd,10), src->status.name, NAME_LENGTH);
WFIFOSET(fd,34);
}
@ -16034,7 +16034,7 @@ void clif_quest_send_mission(struct map_session_data *sd)
WFIFOL(fd, i*104+22+j*30) = qi->objectives[j].mob;
WFIFOW(fd, i*104+26+j*30) = sd->quest_log[i].count[j];
mob = mob_db(qi->objectives[j].mob);
safestrncpy(WFIFOP(fd, i*104+28+j*30), mob->jname, NAME_LENGTH);
safestrncpy((char*)WFIFOP(fd, i*104+28+j*30), mob->jname, NAME_LENGTH);
}
}
@ -16063,7 +16063,7 @@ void clif_quest_add(struct map_session_data *sd, struct quest *qd)
WFIFOL(fd, i*30+17) = qi->objectives[i].mob;
WFIFOW(fd, i*30+21) = qd->count[i];
mob = mob_db(qi->objectives[i].mob);
safestrncpy(WFIFOP(fd, i*30+23), mob->jname, NAME_LENGTH);
safestrncpy((char*)WFIFOP(fd, i*30+23), mob->jname, NAME_LENGTH);
}
WFIFOSET(fd, packet_len(0x2b3));
@ -16394,7 +16394,7 @@ void clif_bg_hp(struct map_session_data *sd) {
WBUFW(buf,0) = cmd;
WBUFL(buf,2) = sd->status.account_id;
#if PACKETVER < 20140613
safestrncpy(WBUFP(buf,6), sd->status.name, NAME_LENGTH);
safestrncpy((char*)WBUFP(buf,6), sd->status.name, NAME_LENGTH);
if( sd->battle_status.max_hp > INT16_MAX ) { // To correctly display the %hp bar. [Skotlex]
WBUFW(buf,30) = sd->battle_status.hp/(sd->battle_status.max_hp/100);
WBUFW(buf,32) = 100;
@ -16424,7 +16424,7 @@ void clif_bg_xy(struct map_session_data *sd)
WBUFW(buf,0)=0x2df;
WBUFL(buf,2)=sd->status.account_id;
safestrncpy(WBUFP(buf,6), sd->status.name, NAME_LENGTH);
safestrncpy((char*)WBUFP(buf,6), sd->status.name, NAME_LENGTH);
WBUFW(buf,30)=sd->status.class_;
WBUFW(buf,32)=sd->bl.x;
WBUFW(buf,34)=sd->bl.y;
@ -16462,7 +16462,7 @@ void clif_bg_message(struct battleground_data *bg, int src_id, const char *name,
WBUFW(buf,0) = 0x2dc;
WBUFW(buf,2) = len + NAME_LENGTH + 8;
WBUFL(buf,4) = src_id;
safestrncpy(WBUFP(buf,8), name, NAME_LENGTH);
safestrncpy((char*)WBUFP(buf,8), name, NAME_LENGTH);
memcpy(WBUFP(buf,32), mes, len);
clif_send(buf,WBUFW(buf,2), &sd->bl, BG);

4
src/map/npc.c
View File

@ -44,7 +44,7 @@ static int npc_cache_mob=0;
#if PACKETVER >= 20131223
struct s_npc_market {
struct npc_item_list *list;
char exname[NAME_LENGTH+1];
char exname[NPC_NAME_LENGTH+1];
uint16 count;
};
static DBMap *NPCMarketDB; /// Stock persistency! Temporary market stocks from `market` table. struct s_npc_market, key: NPC exname
@ -3401,7 +3401,7 @@ static void npc_market_fromsql(void) {
if (!(market = (struct s_npc_market *)strdb_get(NPCMarketDB,data))) {
CREATE(market, struct s_npc_market, 1);
market->count = 0;
safestrncpy(market->exname, data, strlen(data)+1);
safestrncpy(market->exname, data, NPC_NAME_LENGTH);
strdb_put(NPCMarketDB, market->exname, market);
}