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

- Fixed a visual itemdupple bug on mail system.

Browse Source 
- Fixed Overthrusth status cannot being recalled at same skill lvl.

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@12023 54d463be-8e91-2dee-dedb-b68131a5f0ec
This commit is contained in:
zephyrus 2008-01-06 16:43:02 +00:00
parent 144afd8189
commit 825d214242
5 changed files with 20 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Changelog-Trunk.txt
View File

@ -3,6 +3,9 @@ Date Added
AS OF SVN REV. 5091, WE ARE NOW USING TRUNK. ALL UNTESTED BUGFIXES/FEATURES GO INTO TRUNK. AS OF SVN REV. 5091, WE ARE NOW USING TRUNK. ALL UNTESTED BUGFIXES/FEATURES GO INTO TRUNK.
IF YOU HAVE A WORKING AND TESTED BUGFIX PUT IT INTO STABLE AS WELL AS TRUNK. IF YOU HAVE A WORKING AND TESTED BUGFIX PUT IT INTO STABLE AS WELL AS TRUNK.
2008/01/06
* Fixed a visual itemdupple bug on mail system.
- Fixed Overthrush status cannot being recalled at same skill lvl.
2008/01/04 2008/01/04
* Fixed a mistake in r11991 that let knockback work through walls * Fixed a mistake in r11991 that let knockback work through walls
* Modified the map_setcell() code to to use a boolean flag instead of * Modified the map_setcell() code to to use a boolean flag instead of

5
src/map/clif.c
View File

@ -7048,6 +7048,9 @@ int clif_message(struct block_list* bl, const char* msg)
int clif_refresh(struct map_session_data *sd) int clif_refresh(struct map_session_data *sd)
{ {
nullpo_retr(-1, sd); nullpo_retr(-1, sd);
mail_clear(sd);
clif_changemap(sd,sd->mapindex,sd->bl.x,sd->bl.y); clif_changemap(sd,sd->mapindex,sd->bl.x,sd->bl.y);
clif_inventorylist(sd); clif_inventorylist(sd);
if(pc_iscarton(sd)) { if(pc_iscarton(sd)) {
@ -7688,6 +7691,8 @@ void clif_parse_LoadEndAck(int fd,struct map_session_data *sd)
return; return;
} }
mail_clear(sd);
if (sd->state.rewarp) if (sd->state.rewarp)
{ //Rewarp player. { //Rewarp player.
sd->state.rewarp = 0; sd->state.rewarp = 0;

10
src/map/mail.c
View File

@ -20,6 +20,16 @@ time_t mail_calctimes(void)
return mktime(localtime(&temp)); return mktime(localtime(&temp));
} }
void mail_clear(struct map_session_data *sd)
{
sd->mail.nameid = 0;
sd->mail.index = 0;
sd->mail.amount = 0;
sd->mail.zeny = 0;
return;
}
int mail_removeitem(struct map_session_data *sd, short flag) int mail_removeitem(struct map_session_data *sd, short flag)
{ {
nullpo_retr(0,sd); nullpo_retr(0,sd);

1
src/map/mail.h
View File

@ -8,6 +8,7 @@
time_t mail_calctimes(void); time_t mail_calctimes(void);
void mail_clear(struct map_session_data *sd);
int mail_removeitem(struct map_session_data *sd, short flag); int mail_removeitem(struct map_session_data *sd, short flag);
int mail_removezeny(struct map_session_data *sd, short flag); int mail_removezeny(struct map_session_data *sd, short flag);
unsigned char mail_setitem(struct map_session_data *sd, int idx, int amount); unsigned char mail_setitem(struct map_session_data *sd, int idx, int amount);

2
src/map/status.c
View File

@ -4925,7 +4925,7 @@ int status_change_start(struct block_list* bl,enum sc_type type,int rate,int val
case SC_ADRENALINE2: case SC_ADRENALINE2:
case SC_WEAPONPERFECTION: case SC_WEAPONPERFECTION:
case SC_OVERTHRUST: case SC_OVERTHRUST:
if (sce->val2 > val2) if (sce->val1 > val1)
return 0; return 0;
break; break;
case SC_HPREGEN: case SC_HPREGEN: