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

- Added a missing "return 0" that fixes a crash on failed lookups on status_change_timer

Browse Source 
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@5818 54d463be-8e91-2dee-dedb-b68131a5f0ec
This commit is contained in:
skotlex 2006-03-30 21:04:17 +00:00
parent 57ce40d17a
commit a36dcfd0ac
3 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Changelog-Trunk.txt
View File

@ -4,6 +4,8 @@ AS OF SVN REV. 5091, WE ARE NOW USING TRUNK. ALL UNTESTED BUGFIXES/FEATURES GO
IF YOU HAVE A WORKING AND TESTED BUGFIX PUT IT INTO STABLE AS WELL AS TRUNK.
2006/03/30
* Added a missing return that fixes crashes on status_change_timer when
source is not found. [Skotlex]
* Added year day return in gettime function. gettime(8) returns 1~366
[Foruken]
* the auth function in login.c won't jstrescapecpy passwords that were

6
src/map/battle.c
View File

@ -165,7 +165,7 @@ int battle_damage(struct block_list *src,struct block_list *target,int damage, i
struct map_session_data *sd = NULL;
struct status_change *sc;
nullpo_retr(0, target); //stcはNULLで呼ばれることがあるので他でチェック
nullpo_retr(0, target); //srcはNULLで呼ばれることがあるので他でチェック
sc = status_get_sc(target);
@ -2175,8 +2175,8 @@ static struct Damage battle_calc_weapon_attack(
{
if(wd.damage2<1) {
wd.damage=battle_calc_damage(src,target,wd.damage,wd.div_,skill_num,skill_lv,wd.flag);
if (map_flag_gvg(target->m))
wd.damage=battle_calc_gvg_damage(src,target,wd.damage,wd.div_,skill_num,skill_lv,wd.flag);
if (map_flag_gvg(target->m))
wd.damage=battle_calc_gvg_damage(src,target,wd.damage,wd.div_,skill_num,skill_lv,wd.flag);
} else if(wd.damage<1) {
wd.damage2=battle_calc_damage(src,target,wd.damage2,wd.div_,skill_num,skill_lv,wd.flag);
if (map_flag_gvg(target->m))

1
src/map/status.c
View File

@ -5204,6 +5204,7 @@ int status_change_timer(int tid, unsigned int tick, int id, int data)
if (!sc)
{ //Temporal debug until case is resolved. [Skotlex]
ShowDebug("status_change_timer: Null pointer id: %d data: %d bl-type: %d\n", id, data, bl?bl->type:-1);
return 0;
}
if(bl->type==BL_PC)