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

* Changed Sacrifice status to end on caster's death, not at 25% HP.

Browse Source 
- Should also fix over-flow damage returning to sacrificed targets. Partially fixes bugreport:1332


git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@12631 54d463be-8e91-2dee-dedb-b68131a5f0ec
This commit is contained in:
L0ne_W0lf 2008-04-21 21:22:33 +00:00
parent 355d69194a
commit 7708c0c766
2 changed files with 12 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Changelog-Trunk.txt
View File

@ -3,8 +3,11 @@ 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/04/19 2008/04/21
* Rev. 12631 Changed Sacrifice status to end on caster's death, not at 25% HP. [L0ne_W0lf]
- Should also fix over-flow damage returning to sacrificed targets. Partially fixes bugreport:1332
* Updated sql files to latest [Toms] * Updated sql files to latest [Toms]
2008/04/19
* Made some cleanup in changesex [Toms] * Made some cleanup in changesex [Toms]
* Fixed a bug in (init/start/stop)npctimer [Toms] * Fixed a bug in (init/start/stop)npctimer [Toms]
2008/04/18 2008/04/18

20
src/map/pc.c
View File

@ -4936,17 +4936,6 @@ void pc_damage(struct map_session_data *sd,struct block_list *src,unsigned int h
clif_updatestatus(sd,SP_HP); clif_updatestatus(sd,SP_HP);
if (sd->battle_status.hp<sd->battle_status.max_hp>>2)
{ //25% HP left effects.
int i=0;
for(i = 0; i < 5; i++)
if (sd->devotion[i]){
struct map_session_data *devsd = map_id2sd(sd->devotion[i]);
if (devsd) status_change_end(&devsd->bl,SC_DEVOTION,-1);
sd->devotion[i] = 0;
}
}
if(!src || src == &sd->bl) if(!src || src == &sd->bl)
return; return;
@ -4959,12 +4948,19 @@ void pc_damage(struct map_session_data *sd,struct block_list *src,unsigned int h
int pc_dead(struct map_session_data *sd,struct block_list *src) int pc_dead(struct map_session_data *sd,struct block_list *src)
{ {
int i=0,j=0; int i=0,j=0,k=0;
unsigned int tick = gettick(); unsigned int tick = gettick();
if(sd->vender_id) if(sd->vender_id)
vending_closevending(sd); vending_closevending(sd);
for(k = 0; k < 5; k++)
if (sd->devotion[k]){
struct map_session_data *devsd = map_id2sd(sd->devotion[k]);
if (devsd) status_change_end(&devsd->bl,SC_DEVOTION,-1);
sd->devotion[k] = 0;
}
if(sd->status.pet_id > 0 && sd->pd) if(sd->status.pet_id > 0 && sd->pd)
{ {
struct s_pet *pet = &sd->pd->pet; struct s_pet *pet = &sd->pd->pet;