Merging Source v1.7.2: actor changes

2014-10-20 23:51:15 -04:00
parent 724338b57f
commit 4a49763309
30 changed files with 980 additions and 682 deletions
@@ -18,7 +18,7 @@
 package com.shatteredpixel.shatteredpixeldungeon.actors.hero;

 import com.shatteredpixel.shatteredpixeldungeon.actors.Char;
-import com.shatteredpixel.shatteredpixeldungeon.actors.mobs.Mob;
+import com.shatteredpixel.shatteredpixeldungeon.actors.mobs.npcs.NPC;


 public class HeroAction {
@@ -50,8 +50,8 @@ public class HeroAction {
 	}
 	
 	public static class Interact extends HeroAction {
-		public Mob.NPC npc;
-		public Interact( Mob.NPC npc ) {
+		public NPC npc;
+		public Interact( NPC npc ) {
 			this.npc = npc;
 		}
 	}