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

Follow up to 58776da

Browse Source 
Fixed a few compiler warnings.
Thanks to @RadianFord
This commit is contained in:
Lemongrass3110 2017-06-21 15:07:37 +02:00
parent 9d7d368a33
commit 3acf1aada3
3 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/char/int_mail.c
View File

@ -539,12 +539,10 @@ static void mapif_parse_Mail_send(int fd)
{ {
struct mail_message msg; struct mail_message msg;
char esc_name[NAME_LENGTH*2+1]; char esc_name[NAME_LENGTH*2+1];
uint32 account_id = 0;
if(RFIFOW(fd,2) != 8 + sizeof(struct mail_message)) if(RFIFOW(fd,2) != 8 + sizeof(struct mail_message))
return; return;
account_id = RFIFOL(fd,4);
memcpy(&msg, RFIFOP(fd,8), sizeof(struct mail_message)); memcpy(&msg, RFIFOP(fd,8), sizeof(struct mail_message));
// Try to find the Dest Char by Name // Try to find the Dest Char by Name
@ -556,6 +554,8 @@ static void mapif_parse_Mail_send(int fd)
{ {
char *data; char *data;
#if PACKETVER < 20150513 #if PACKETVER < 20150513
uint32 account_id = RFIFOL(fd,4);
Sql_GetData(sql_handle, 0, &data, NULL); Sql_GetData(sql_handle, 0, &data, NULL);
if (atoi(data) != account_id) if (atoi(data) != account_id)
{ // Cannot send mail to char in the same account { // Cannot send mail to char in the same account

5
src/map/clif.c
View File

@ -15307,7 +15307,7 @@ void clif_parse_Mail_read(int fd, struct map_session_data *sd){
#if PACKETVER < 20150513 #if PACKETVER < 20150513
int mail_id = RFIFOL(fd,packet_db[sd->packet_ver][RFIFOW(fd,0)].pos[0]); int mail_id = RFIFOL(fd,packet_db[sd->packet_ver][RFIFOW(fd,0)].pos[0]);
#else #else
uint8 openType = RFIFOB(fd, 2); //uint8 openType = RFIFOB(fd, 2);
int mail_id = (int)RFIFOQ(fd, 3); int mail_id = (int)RFIFOQ(fd, 3);
#endif #endif
@ -15393,7 +15393,6 @@ void clif_parse_Mail_Receiver_Check(int fd, struct map_session_data *sd) {
/// 09f3 <mail id>.Q <mail tab>.B (CZ_REQ_ITEM_FROM_MAIL) /// 09f3 <mail id>.Q <mail tab>.B (CZ_REQ_ITEM_FROM_MAIL)
void clif_parse_Mail_getattach( int fd, struct map_session_data *sd ){ void clif_parse_Mail_getattach( int fd, struct map_session_data *sd ){
int i; int i;
bool fail = false;
struct mail_message* msg; struct mail_message* msg;
#if PACKETVER < 20150513 #if PACKETVER < 20150513
int mail_id = RFIFOL(fd, packet_db[sd->packet_ver][RFIFOW(fd, 0)].pos[0]); int mail_id = RFIFOL(fd, packet_db[sd->packet_ver][RFIFOW(fd, 0)].pos[0]);
@ -15495,7 +15494,7 @@ void clif_parse_Mail_delete(int fd, struct map_session_data *sd){
#if PACKETVER < 20150513 #if PACKETVER < 20150513
int mail_id = RFIFOL(fd,packet_db[sd->packet_ver][RFIFOW(fd,0)].pos[0]); int mail_id = RFIFOL(fd,packet_db[sd->packet_ver][RFIFOW(fd,0)].pos[0]);
#else #else
int openType = RFIFOB(fd, 2); //int openType = RFIFOB(fd, 2);
int mail_id = (int)RFIFOQ(fd, 3); int mail_id = (int)RFIFOQ(fd, 3);
#endif #endif
int i, j; int i, j;

2
src/map/clif.h
View File

@ -32,6 +32,8 @@ struct quest;
struct party_booking_ad_info; struct party_booking_ad_info;
enum e_party_member_withdraw; enum e_party_member_withdraw;
struct sale_item_data; struct sale_item_data;
enum mail_inbox_type;
struct mail_message;
#include <stdarg.h> #include <stdarg.h>
enum { // packet DB enum { // packet DB