new timeline fixes

Author: Mikhael-Danilov

RemixedDungeon/src/main/java/com/watabou/pixeldungeon/actors/Actor.java

@@ -206,13 +206,16 @@ private static void processReaTime(float elapsed) {
 
     public static void processTurnBased(float elapsed) {
         Hero hero = Dungeon.hero;
+        if(!hero.isAlive()) {
+            if (motionInProgress()) {
+                return;
+            }
+        }
         // action still in progress
         if (current == hero && !current.timeout()) {
             return;
         }
 
-        CharSprite heroSprite = hero.getSprite();
-
         GLog.debug("Main loop start");
         while ((current = nextActor()) != null) {
             now = current.time;
@@ -222,11 +225,15 @@ public static void processTurnBased(float elapsed) {
                     return;
                 }
             }
+
             GLog.debug("actor %s %4.1f hero: %4.1f now: %4.1f", current, current.time, hero.actorTime(), now);
 
             if (current != hero) {
                 current.act();
                 current = null;
+                if(!hero.isAlive()) {
+                    break;
+                }
             } else {
                 current.act();
                 break;

RemixedDungeon/src/main/java/com/watabou/pixeldungeon/actors/Char.java

@@ -1237,21 +1237,17 @@ public void updateSprite() {
     }
 
     private void updateSprite(CharSprite sprite) {
-        if(! isOnStage()) {
+        if(!isOnStage()) {
             sprite = DummySprite.instance;
-        }
-        if ( level().cellValid(getPos())) {
-            sprite.setVisible(Dungeon.isCellVisible(getPos()) && invisible >= 0);
         } else {
-            EventCollector.logException("invalid pos " + getPos() + " for:"  + this + ":" + getEntityKind());
+            if (level().cellValid(getPos())) {
+                sprite.setVisible(Dungeon.isCellVisible(getPos()) && invisible >= 0);
+            } else {
+                EventCollector.logException("invalid pos " + getPos() + " for:" + this + ":" + getEntityKind());
+            }
         }
         GameScene.addMobSpriteDirect(this, sprite);
 
-        if (isOnStage()) {
-            assert (sprite.getParent() != null);
-        }
-
-
         if (sprite.getParent() == null) {
             String err = String.format("sprite addition failed for %s %b", getEntityKind(), GameScene.isSceneReady());
             GLog.debug(err);
@@ -1281,19 +1277,16 @@ public CharSprite getSprite() {
         }
 
         if (sprite == null) {
-
             if (!GameScene.mayCreateSprites()) {
                 throw new TrackedRuntimeException("scene not ready for " + getEntityKind());
             }
-
-            if (Util.isDebug()) {
-                if (!isAlive()) {
-                    //throw new TrackedRuntimeException("its dead! leave it alone! " + getEntityKind());
-                }
+            if (isAlive()) {
+                sprite = newSprite();
+                sprite.lightness(lightness);
+                setGlowing(glowColor, glowPeriod);
+            } else {
+                sprite = DummySprite.instance;
             }
-            sprite = newSprite();
-            sprite.lightness(lightness);
-            setGlowing(glowColor, glowPeriod);
         }
 
         if (sprite == null) {
@@ -1306,7 +1299,9 @@ public CharSprite getSprite() {
             updateSprite(sprite);
         }
 
-        assert (sprite.getParent() != null);
+        if(sprite.getParent() == null) {
+            sprite = DummySprite.instance;
+        }
 
         return sprite;
     }

RemixedDungeon/src/main/java/com/watabou/pixeldungeon/actors/hero/Hero.java

@@ -406,6 +406,10 @@ public void damage(int dmg, @NotNull NamedEntityKind src) {
         restoreHealth = false;
         super.damage(dmg, src);
 
+        if (!isAlive()) {
+            return;
+        }
+
         setControlTarget(this);
 
         if (!myMove()) {