diff options
| author | zephyrus <zephyrus@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2008-08-20 20:08:00 +0000 |
|---|---|---|
| committer | zephyrus <zephyrus@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2008-08-20 20:08:00 +0000 |
| commit | 95a7f7d5ac462e982a427445108c0a1bda12692e (patch) | |
| tree | c8d2b61666e1268653444246e63771abbd7c6343 /src/map | |
| parent | 290e1d4e87da4b197d004f6855e26a9b634f4b3b (diff) | |
| download | hercules-95a7f7d5ac462e982a427445108c0a1bda12692e.tar.gz hercules-95a7f7d5ac462e982a427445108c0a1bda12692e.tar.bz2 hercules-95a7f7d5ac462e982a427445108c0a1bda12692e.tar.xz hercules-95a7f7d5ac462e982a427445108c0a1bda12692e.zip | |
- More cleanup of Barricades (final i think)
- Fixed a bug, missing sizeof(add_steal_rate).
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@13100 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/map')
| -rw-r--r-- | src/map/mob.h | 1 | ||||
| -rw-r--r-- | src/map/skill.c | 2 | ||||
| -rw-r--r-- | src/map/status.c | 3 |
3 files changed, 3 insertions, 3 deletions
diff --git a/src/map/mob.h b/src/map/mob.h index 3aff2ccb5..5e4492e69 100644 --- a/src/map/mob.h +++ b/src/map/mob.h @@ -91,7 +91,6 @@ struct mob_data { struct status_data status, *base_status; //Second one is in case of leveling up mobs, or tiny/large mobs. struct status_change sc; struct mob_db *db; //For quick data access (saves doing mob_db(md->class_) all the time) [Skotlex] - struct barricade_data *barricade; char name[NAME_LENGTH]; struct { unsigned size : 2; //Small/Big monsters. diff --git a/src/map/skill.c b/src/map/skill.c index 136a4dfd5..284e64f47 100644 --- a/src/map/skill.c +++ b/src/map/skill.c @@ -1277,7 +1277,7 @@ int skill_blown(struct block_list* src, struct block_list* target, int count, in case BL_MOB: { struct mob_data* md = BL_CAST(BL_MOB, target); - if( md->class_ == MOBID_EMPERIUM || md->barricade ) + if( md->class_ == MOBID_EMPERIUM ) return 0; if(src != target && is_boss(target)) //Bosses can't be knocked-back return 0; diff --git a/src/map/status.c b/src/map/status.c index 1ff562eff..55b5918ce 100644 --- a/src/map/status.c +++ b/src/map/status.c @@ -1768,6 +1768,7 @@ int status_calc_pc(struct map_session_data* sd,int first) // shorts + sizeof(sd->splash_range) + sizeof(sd->splash_add_range) + + sizeof(sd->add_steal_rate) + sizeof(sd->hp_gain_value) + sizeof(sd->sp_gain_value) + sizeof(sd->sp_vanish_rate) @@ -4614,7 +4615,7 @@ int status_change_start(struct block_list* bl,enum sc_type type,int rate,int val if( bl->type == BL_MOB ) { struct mob_data *md = BL_CAST(BL_MOB,bl); - if( (md->class_ == MOBID_EMPERIUM && type != SC_SAFETYWALL && type != SC_PNEUMA) || md->barricade ) + if( md->class_ == MOBID_EMPERIUM && type != SC_SAFETYWALL && type != SC_PNEUMA ) return 0; //Emperium can't be afflicted by status changes } |