From 630838a54cc2406ecbc21089800f702ac816673d Mon Sep 17 00:00:00 2001 From: skotlex Date: Tue, 11 Apr 2006 14:01:04 +0000 Subject: - Fixed Looted items always dropping in quantities of 1. - Removed the check that deletes Magnus Exorcism cells after they hit once. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@5984 54d463be-8e91-2dee-dedb-b68131a5f0ec --- Changelog-Trunk.txt | 4 ++++ src/map/mob.c | 2 +- src/map/skill.c | 3 ++- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/Changelog-Trunk.txt b/Changelog-Trunk.txt index f9df450aa..9da5a4256 100644 --- a/Changelog-Trunk.txt +++ b/Changelog-Trunk.txt @@ -3,6 +3,10 @@ Date Added 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. +2006/04/11 + * Fixed Looted items always dropping in quantities of one. [Skotlex] + * Removed the check that deletes Magnus Exorcism cells after they hit once. + [Skotlex] 2006/04/10 * Temperory replaced strtoll to strtoul until the function changes. [Lance] * Multiple optimizations to the unit_data auto-chase upgrade, also diff --git a/src/map/mob.c b/src/map/mob.c index 7c428e60e..b9c90c1f3 100644 --- a/src/map/mob.c +++ b/src/map/mob.c @@ -1434,7 +1434,7 @@ static int mob_delay_item_drop(int tid,unsigned int tick,int id,int data) struct delay_item_drop *ditem; ditem=(struct delay_item_drop *)id; - map_addflooritem(&ditem->item_data,1,ditem->m,ditem->x,ditem->y,ditem->first_sd,ditem->second_sd,ditem->third_sd,0); + map_addflooritem(&ditem->item_data,ditem->item_data.amount,ditem->m,ditem->x,ditem->y,ditem->first_sd,ditem->second_sd,ditem->third_sd,0); ers_free(delay_drop_ers, ditem); return 0; } diff --git a/src/map/skill.c b/src/map/skill.c index 66332bac5..f0964ec01 100644 --- a/src/map/skill.c +++ b/src/map/skill.c @@ -6827,7 +6827,6 @@ int skill_unit_onplace_timer(struct skill_unit *src,struct block_list *bl,unsign if (!battle_check_undead(race,status_get_elem_type(bl)) && race!=6) break; skill_attack(BF_MAGIC,ss,&src->bl,bl,sg->skill_id,sg->skill_lv,tick,0); - src->val2++; break; } @@ -9615,11 +9614,13 @@ int skill_unit_timer_sub( struct block_list *bl, va_list ap ) group->bl_flag,bl,tick); if (!unit->alive) return 0; + /*Apparently magnus shouldn't get it's cells deleted like this. [Skotlex] // ƒ}ƒOƒkƒX‚Í”­“®‚µ‚½ƒ†ƒjƒbƒg‚Í?í?œ‚·‚é if (group->skill_id==PR_MAGNUS && unit->val2) { skill_delunit(unit); return 0; } + */ } /* ŽžŠÔ?Ø‚ê?í?œ */ if((DIFF_TICK(tick,group->tick)>=group->limit || DIFF_TICK(tick,group->tick)>=unit->limit)){ -- cgit v1.2.3-70-g09d2