From f352efded2aea00e1d075f6a8f5c785dbdd79095 Mon Sep 17 00:00:00 2001
From: Evan Debenham <Evan.SHPX@gmail.com>
Date: Tue, 21 Oct 2014 00:41:44 -0400
Subject: [PATCH] Merging Source v1.7.2: corrected sleeping typo

---
 .../actors/buffs/MagicalSleep.java                   |  2 +-
 .../shatteredpixeldungeon/actors/mobs/Mob.java       | 12 ++++++------
 .../actors/mobs/npcs/RatKing.java                    |  5 ++---
 .../shatteredpixeldungeon/sprites/MobSprite.java     |  2 +-
 4 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/actors/buffs/MagicalSleep.java b/src/com/shatteredpixel/shatteredpixeldungeon/actors/buffs/MagicalSleep.java
index d4bc3a33b..9dbbf2ac4 100644
--- a/src/com/shatteredpixel/shatteredpixeldungeon/actors/buffs/MagicalSleep.java
+++ b/src/com/shatteredpixel/shatteredpixeldungeon/actors/buffs/MagicalSleep.java
@@ -41,7 +41,7 @@ public class MagicalSleep extends Buff {
                     GLog.i("You fall into a deep magical sleep.");
                 }
             else if (target instanceof Mob)
-                ((Mob)target).state = ((Mob)target).SLEEPEING;
+                ((Mob)target).state = ((Mob)target).SLEEPING;
 
             target.paralysed = true;
 
diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/Mob.java b/src/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/Mob.java
index fdb7ccdcc..10d87724a 100644
--- a/src/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/Mob.java
+++ b/src/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/Mob.java
@@ -49,12 +49,12 @@ public abstract class Mob extends Char {
 	protected static final String TXT_RAGE		= "#$%^";
 	protected static final String TXT_EXP		= "%+dEXP";
 
-    public AiState SLEEPEING	= new Sleeping();
+    public AiState SLEEPING     = new Sleeping();
     public AiState HUNTING		= new Hunting();
     public AiState WANDERING	= new Wandering();
     public AiState FLEEING		= new Fleeing();
     public AiState PASSIVE		= new Passive();
-    public AiState state = SLEEPEING;
+    public AiState state = SLEEPING;
 	
 	public Class<? extends CharSprite> spriteClass;
 	
@@ -89,7 +89,7 @@ public abstract class Mob extends Char {
 		
 		super.storeInBundle( bundle );
 
-        if (state == SLEEPEING) {
+        if (state == SLEEPING) {
             bundle.put( STATE, Sleeping.TAG );
         } else if (state == WANDERING) {
             bundle.put( STATE, Wandering.TAG );
@@ -110,7 +110,7 @@ public abstract class Mob extends Char {
 
         String state = bundle.getString( STATE );
         if (state.equals( Sleeping.TAG )) {
-            this.state = SLEEPEING;
+            this.state = SLEEPING;
         } else if (state.equals( Wandering.TAG )) {
             this.state = WANDERING;
         } else if (state.equals( Hunting.TAG )) {
@@ -206,7 +206,7 @@ public abstract class Mob extends Char {
 		} else if (buff instanceof Terror) {
 			state = FLEEING;
 		} else if (buff instanceof Sleep) {
-			state = SLEEPEING;
+			state = SLEEPING;
             this.sprite().showSleep();
 			postpone( Sleep.SWS );
 		}
@@ -318,7 +318,7 @@ public abstract class Mob extends Char {
 
 		Terror.recover( this );
 
-        if (state == SLEEPEING) {
+        if (state == SLEEPING) {
             state = WANDERING;
         }
 		alerted = true;
diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/npcs/RatKing.java b/src/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/npcs/RatKing.java
index 8b2a6af30..bb789c612 100644
--- a/src/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/npcs/RatKing.java
+++ b/src/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/npcs/RatKing.java
@@ -20,7 +20,6 @@ package com.shatteredpixel.shatteredpixeldungeon.actors.mobs.npcs;
 import com.shatteredpixel.shatteredpixeldungeon.Dungeon;
 import com.shatteredpixel.shatteredpixeldungeon.actors.Char;
 import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.Buff;
-import com.shatteredpixel.shatteredpixeldungeon.actors.mobs.Mob;
 
 import com.shatteredpixel.shatteredpixeldungeon.sprites.RatKingSprite;
 
@@ -30,7 +29,7 @@ public class RatKing extends NPC {
 		name = "rat king";
 		spriteClass = RatKingSprite.class;
 		
-		state = SLEEPEING;
+		state = SLEEPING;
 	}
 	
 	@Override
@@ -64,7 +63,7 @@ public class RatKing extends NPC {
 	@Override
 	public void interact() {
 		sprite.turnTo( pos, Dungeon.hero.pos );
-		if (state == SLEEPEING) {
+		if (state == SLEEPING) {
 			notice();
 			yell( "I'm not sleeping!" );
 			state = WANDERING;
diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/sprites/MobSprite.java b/src/com/shatteredpixel/shatteredpixeldungeon/sprites/MobSprite.java
index af596a54e..c7c42a486 100644
--- a/src/com/shatteredpixel/shatteredpixeldungeon/sprites/MobSprite.java
+++ b/src/com/shatteredpixel/shatteredpixeldungeon/sprites/MobSprite.java
@@ -31,7 +31,7 @@ public class MobSprite extends CharSprite {
 	
 	@Override
 	public void update() {
-		sleeping = ch != null && ((Mob)ch).state == ((Mob)ch).SLEEPEING;
+		sleeping = ch != null && ((Mob)ch).state == ((Mob)ch).SLEEPING;
 		super.update();
 	}