Browse Source

- More cleanup of Barricades (final i think)
- Fixed a bug, missing sizeof(add_steal_rate).

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@13100 54d463be-8e91-2dee-dedb-b68131a5f0ec

zephyrus 16 years ago
parent
commit
ab500d3207
3 changed files with 3 additions and 3 deletions
  1. 0 1
      src/map/mob.h
  2. 1 1
      src/map/skill.c
  3. 2 1
      src/map/status.c

+ 0 - 1
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.

+ 1 - 1
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;

+ 2 - 1
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
 	}