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

* Made mob_delayspawn check the spawn_timer in the mob.

Browse Source 
* Added missing delete_timer's every time spawn_timer is being set. (except when allocating)

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@13543 54d463be-8e91-2dee-dedb-b68131a5f0ec
This commit is contained in:
FlavioJS 2009-02-23 15:57:02 +00:00
parent e362a5ce6f
commit 92d80d2e99
2 changed files with 27 additions and 4 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.
2009/02/23
* Made mob_delayspawn check the spawn_timer in the mob. [FlavioJS]
* Added missing delete_timer's every time spawn_timer is being set. (except when allocating)
2009/02/20 2009/02/20
* Increased variable size for status/skill points to remove the 65k cap (bugreport:1579) [ultramage] * Increased variable size for status/skill points to remove the 65k cap (bugreport:1579) [ultramage]
* Modified WFIFOSET to trigger a fatal error when trying to send a packet that is too big. [FlavioJS] * Modified WFIFOSET to trigger a fatal error when trying to send a packet that is too big. [FlavioJS]

26
src/map/mob.c
View File

@ -722,9 +722,19 @@ int mob_linksearch(struct block_list *bl,va_list ap)
*------------------------------------------*/ *------------------------------------------*/
int mob_delayspawn(int tid, unsigned int tick, int id, intptr data) int mob_delayspawn(int tid, unsigned int tick, int id, intptr data)
{ {
struct block_list *bl = map_id2bl(id); struct block_list* bl = map_id2bl(id);
if (bl && bl->type == BL_MOB && bl->prev == NULL) struct mob_data* md = BL_CAST(BL_MOB, bl);
mob_spawn((TBL_MOB*)bl);
if( md )
{
if( md->spawn_timer != tid )
{
ShowError("mob_delayspawn: Timer mismatch: %d != %d\n", tid, md->spawn_timer);
return 0;
}
md->spawn_timer = INVALID_TIMER;
mob_spawn(md);
}
return 0; return 0;
} }
@ -745,6 +755,8 @@ int mob_setdelayspawn(struct mob_data *md)
if (spawntime < 5000) //Min respawn time (is it needed?) if (spawntime < 5000) //Min respawn time (is it needed?)
spawntime = 5000; spawntime = 5000;
if( md->spawn_timer != INVALID_TIMER )
delete_timer(md->spawn_timer, mob_delayspawn);
md->spawn_timer = add_timer(gettick()+spawntime, mob_delayspawn, md->bl.id, 0); md->spawn_timer = add_timer(gettick()+spawntime, mob_delayspawn, md->bl.id, 0);
return 0; return 0;
} }
@ -783,12 +795,16 @@ int mob_spawn (struct mob_data *md)
{ //Monster can be spawned on an area. { //Monster can be spawned on an area.
if( !map_search_freecell(&md->bl, -1, &md->bl.x, &md->bl.y, md->spawn->xs, md->spawn->ys, battle_config.no_spawn_on_player?4:0) ) if( !map_search_freecell(&md->bl, -1, &md->bl.x, &md->bl.y, md->spawn->xs, md->spawn->ys, battle_config.no_spawn_on_player?4:0) )
{ // retry again later { // retry again later
if( md->spawn_timer != INVALID_TIMER )
delete_timer(md->spawn_timer, mob_delayspawn);
md->spawn_timer = add_timer(tick+5000,mob_delayspawn,md->bl.id,0); md->spawn_timer = add_timer(tick+5000,mob_delayspawn,md->bl.id,0);
return 1; return 1;
} }
} }
else if( battle_config.no_spawn_on_player > 99 && map_foreachinrange(mob_count_sub, &md->bl, AREA_SIZE, BL_PC) ) else if( battle_config.no_spawn_on_player > 99 && map_foreachinrange(mob_count_sub, &md->bl, AREA_SIZE, BL_PC) )
{ // retry again later (players on sight) { // retry again later (players on sight)
if( md->spawn_timer != INVALID_TIMER )
delete_timer(md->spawn_timer, mob_delayspawn);
md->spawn_timer = add_timer(tick+5000,mob_delayspawn,md->bl.id,0); md->spawn_timer = add_timer(tick+5000,mob_delayspawn,md->bl.id,0);
return 1; return 1;
} }
@ -799,7 +815,11 @@ int mob_spawn (struct mob_data *md)
md->attacked_id = 0; md->attacked_id = 0;
md->target_id = 0; md->target_id = 0;
md->move_fail_count = 0; md->move_fail_count = 0;
if( md->spawn_timer != INVALID_TIMER )
{
delete_timer(md->spawn_timer, mob_delayspawn);
md->spawn_timer = INVALID_TIMER; md->spawn_timer = INVALID_TIMER;
}
// md->master_id = 0; // md->master_id = 0;
md->master_dist = 0; md->master_dist = 0;