Merging Source v1.7.2: actor changes

This commit is contained in:
Evan Debenham
2014-10-20 23:51:15 -04:00
parent 724338b57f
commit 4a49763309
30 changed files with 980 additions and 682 deletions
@@ -42,7 +42,7 @@ public class Statue extends Mob {
spriteClass = StatueSprite.class;
EXP = 0;
state = State.PASSIVE;
state = PASSIVE;
}
private Weapon weapon;
@@ -106,8 +106,8 @@ public class Statue extends Mob {
@Override
public void damage( int dmg, Object src ) {
if (state == State.PASSIVE) {
state = State.HUNTING;
if (state == PASSIVE) {
state = HUNTING;
}
super.damage( dmg, src );
@@ -137,7 +137,7 @@ public class Statue extends Mob {
@Override
public boolean reset() {
state = State.PASSIVE;
state = PASSIVE;
return true;
}