diff options
Diffstat (limited to 'src/map/mob.h')
| -rw-r--r-- | src/map/mob.h | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/src/map/mob.h b/src/map/mob.h index c33d82501..797d2484b 100644 --- a/src/map/mob.h +++ b/src/map/mob.h @@ -92,7 +92,7 @@ struct spawn_info { unsigned short mapindex; unsigned short qty; }; - + struct mob_db { char sprite[NAME_LENGTH],name[NAME_LENGTH],jname[NAME_LENGTH]; unsigned int base_exp,job_exp; @@ -143,7 +143,7 @@ struct mob_data { unsigned char attacked_count; //For rude attacked. int provoke_flag; // Celest } state; - struct guardian_data* guardian_data; + struct guardian_data* guardian_data; struct { int id; unsigned int dmg; @@ -163,7 +163,7 @@ struct mob_data { short move_fail_count; short lootitem_count; short min_chase; - + int deletetimer; int master_id,master_dist; @@ -268,7 +268,9 @@ void mob_heal(struct mob_data *md,unsigned int heal); #define mob_stop_walking(md, type) unit_stop_walking(&(md)->bl, type) #define mob_stop_attack(md) unit_stop_attack(&(md)->bl) -#define mob_is_battleground(md) ( map[(md)->bl.m].flag.battleground && ((md)->class_ == 1906 || ((md)->class_ >= 1909 && (md)->class_ <= 1915)) ) +#define mob_is_battleground(md) ( map[(md)->bl.m].flag.battleground && ((md)->class_ == MOBID_BARRICADE2 || ((md)->class_ >= MOBID_FOOD_STOR && (md)->class_ <= MOBID_PINK_CRYST)) ) +#define mob_is_gvg(md) (map[(md)->bl.m].flag.gvg_castle && ( (md)->class_ == MOBID_EMPERIUM || (md)->class_ == MOBID_BARRICADE1 || (md)->class_ == MOBID_GUARIDAN_STONE1 || (md)->class_ == MOBID_GUARIDAN_STONE2) ) +#define mob_is_treasure(md) (((md)->class_ >= MOBID_TREAS01 && (md)->class_ <= MOBID_TREAS40) || ((md)->class_ >= MOBID_TREAS41 && (md)->class_ <= MOBID_TREAS49)) void mob_clear_spawninfo(); int do_init_mob(void); |