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

Fixed bugreport http://rathena.org/board/tracker/issue-8221-fresh-rathena-compiling-error/

Browse Source 
Signed-off-by: Cahyadi Ramadhan Togihon <house.bad@gmail.com>
This commit is contained in:
Cahyadi Ramadhan Togihon 2013-11-08 14:53:24 +07:00
parent 1ebe1ada8a
commit 8ad5d4f7c4
2 changed files with 22 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
src/char/char.c
View File

@ -1970,7 +1970,7 @@ void char_parse_req_charlist(int fd, struct char_session_data* sd){
//----------------------------------------
int mmo_char_send006b(int fd, struct char_session_data* sd){
int j, offset = 0;
bool newvers = (sd->version >= date2version(20100413) );
bool newvers = (sd->version >= (uint32)date2version(20100413));
if(newvers) //20100413
offset += 3;
if (save_log)
@ -2012,7 +2012,7 @@ void mmo_char_send082d(int fd, struct char_session_data* sd) {
void mmo_char_send(int fd, struct char_session_data* sd){
//ShowInfo("sd->version = %d\n",sd->version);
if(sd->version > date2version(20130000) ){
if(sd->version > (uint32)date2version(20130000) ){
mmo_char_send082d(fd,sd);
char_charlist_notify(fd,sd);
char_block_character(fd,sd);
@ -2175,12 +2175,14 @@ int loginif_BankingReq(int32 account_id, int8 type, int32 data){
int loginif_parse_BankingAck(int fd){
if (RFIFOREST(fd) < 11)
return 0;
uint32 aid = RFIFOL(fd,2);
int32 bank_vault = RFIFOL(fd,6);
char not_fw = RFIFOB(fd,10);
RFIFOSKIP(fd,11);
else {
uint32 aid = RFIFOL(fd,2);
int32 bank_vault = RFIFOL(fd,6);
char not_fw = RFIFOB(fd,10);
RFIFOSKIP(fd,11);
if(not_fw==0) mapif_BankingAck(aid, bank_vault);
if(not_fw==0) mapif_BankingAck(aid, bank_vault);
}
return 1;
}
@ -2203,10 +2205,12 @@ int mapif_BankingAck(int32 account_id, int32 bank_vault){
int mapif_parse_UpdBankInfo(int fd){
if( RFIFOREST(fd) < 10 )
return 0;
uint32 aid = RFIFOL(fd,2);
int money = RFIFOL(fd,6);
RFIFOSKIP(fd,10);
loginif_BankingReq(aid, 2, money);
else {
uint32 aid = RFIFOL(fd,2);
int money = RFIFOL(fd,6);
RFIFOSKIP(fd,10);
loginif_BankingReq(aid, 2, money);
}
return 1;
}
@ -2219,9 +2223,11 @@ int mapif_parse_UpdBankInfo(int fd){
int mapif_parse_ReqBankInfo(int fd){
if( RFIFOREST(fd) < 6 )
return 0;
uint32 aid = RFIFOL(fd,2);
RFIFOSKIP(fd,6);
loginif_BankingReq(aid, 1, 0);
else {
uint32 aid = RFIFOL(fd,2);
RFIFOSKIP(fd,6);
loginif_BankingReq(aid, 1, 0);
}
return 1;
}

6
src/map/clif.c
View File

@ -6309,8 +6309,7 @@ void clif_parse_BankDeposit(int fd, struct map_session_data* sd) {
int money = RFIFOL(fd,info->pos[1]);
if(sd->status.account_id == aid){
money = max(0,money);
enum e_BANKING_DEPOSIT_ACK reason = pc_bank_deposit(sd,money);
enum e_BANKING_DEPOSIT_ACK reason = pc_bank_deposit(sd,max(0,money));
clif_bank_deposit(sd,reason);
}
}
@ -6356,8 +6355,7 @@ void clif_parse_BankWithdraw(int fd, struct map_session_data* sd) {
int aid = RFIFOL(fd,info->pos[0]); //unused should we check vs fd ?
int money = RFIFOL(fd,info->pos[1]);
if(sd->status.account_id == aid){
money = max(0,money);
enum e_BANKING_WITHDRAW_ACK reason = pc_bank_withdraw(sd,money);
enum e_BANKING_WITHDRAW_ACK reason = pc_bank_withdraw(sd,max(0,money));
clif_bank_withdraw(sd,reason);
}
}