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

* Moved the mob killmonster flag to a more appropriate area. (bugreport:1795)

Browse Source 
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@12914 54d463be-8e91-2dee-dedb-b68131a5f0ec
This commit is contained in:
sketchyphoenix 2008-07-05 07:54:53 +00:00
parent 4e1d094db0
commit 263261d9f6
4 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Changelog-Trunk.txt
View File

@ -3,6 +3,8 @@ 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/07/05
* Moved the mob killmonster flag to a more appropriate area. (bugreport:1795) [SketchyPhoenix]
2008/07/04 2008/07/04
* Fixed AM_PHARMACY produce chances based on info gathered by flaviojs, aegis zone ep 11.2, of 20070629 [Brain/FlavioJS] * Fixed AM_PHARMACY produce chances based on info gathered by flaviojs, aegis zone ep 11.2, of 20070629 [Brain/FlavioJS]
* Rev. 12911 Homunculus will no longer auto-vaporize on master death. [L0ne_W0lf] * Rev. 12911 Homunculus will no longer auto-vaporize on master death. [L0ne_W0lf]

2
src/map/mob.c
View File

@ -2545,7 +2545,7 @@ int mob_dead(struct mob_data *md, struct block_list *src, int type)
if(md->nd) if(md->nd)
mob_script_callback(md, src, CALLBACK_DEAD); mob_script_callback(md, src, CALLBACK_DEAD);
else else
if(md->npc_event[0] && !md->npc_killmonster) if(md->npc_event[0] && !md->state.npc_killmonster)
{ {
md->status.hp = 0; //So that npc_event invoked functions KNOW that I am dead. md->status.hp = 0; //So that npc_event invoked functions KNOW that I am dead.
if(src) if(src)

2
src/map/mob.h
View File

@ -112,6 +112,7 @@ struct mob_data {
unsigned spotted: 1; unsigned spotted: 1;
unsigned char attacked_count; //For rude attacked. unsigned char attacked_count; //For rude attacked.
int provoke_flag; // Celest int provoke_flag; // Celest
unsigned npc_killmonster: 1; //for new killmonster behavior
} state; } state;
struct guardian_data* guardian_data; struct guardian_data* guardian_data;
struct { struct {
@ -141,7 +142,6 @@ struct mob_data {
short skillidx; short skillidx;
unsigned int skilldelay[MAX_MOBSKILL]; unsigned int skilldelay[MAX_MOBSKILL];
char npc_event[50]; char npc_event[50];
int npc_killmonster; //for new killmonster behavior
}; };

4
src/map/script.c
View File

@ -7473,7 +7473,7 @@ BUILDIN_FUNC(areamonster)
char *event=va_arg(ap,char *); char *event=va_arg(ap,char *);
int allflag=va_arg(ap,int); int allflag=va_arg(ap,int);
md->npc_killmonster = 1; md->state.npc_killmonster = 1;
if(!allflag){ if(!allflag){
if(strcmp(event,md->npc_event)==0) if(strcmp(event,md->npc_event)==0)
@ -7482,7 +7482,7 @@ BUILDIN_FUNC(areamonster)
if(!md->spawn) if(!md->spawn)
status_kill(bl); status_kill(bl);
} }
md->npc_killmonster = 0; md->state.npc_killmonster = 0;
return 0; return 0;
} }
static int buildin_killmonster_sub(struct block_list *bl,va_list ap) static int buildin_killmonster_sub(struct block_list *bl,va_list ap)