Merge pull request ozkriff#669 from ozkriff/fix_end_turn_crash

Fix EndTurn-related crash by checking all zscene actions

src/screen/battle.rs

@@ -653,7 +653,7 @@ impl Screen for Battle {
         }
         self.view.tick(dtime);
         self.update_block_timer(dtime)?;
-        if self.block_timer.is_none() {
+        if self.block_timer.is_none() && !self.view.any_unfinished_actions() {
             if let Some(result) = self.state.battle_result().clone() {
                 self.send_battle_result(Some(result));
                 return Ok(StackCommand::Pop);

src/screen/battle/view.rs

@@ -239,6 +239,10 @@ impl BattleView {
         self.scene.add_action(action);
     }
 
+    pub fn any_unfinished_actions(&self) -> bool {
+        self.scene.any_unfinished_actions()
+    }
+
     // TODO: return `(f32, f32)`? width and height separately?
     pub fn tile_size(&self) -> f32 {
         self.tile_size

zscene/src/action.rs

@@ -24,6 +24,8 @@ pub trait Action: Debug {
     fn update(&mut self, _dtime: Duration) {}
     fn end(&mut self) {}
 
+    /// Note that it return only the main actions' duration and ignores all forks.
+    /// Also see [Scene::any_unfinished_actions] if you need to check for alive forks.
     fn duration(&self) -> Duration {
         Duration::new(0, 0)
     }

zscene/src/lib.rs

@@ -130,6 +130,10 @@ impl Scene {
     pub fn tick(&mut self, dtime: Duration) {
         self.interpreter.tick(dtime);
     }
+
+    pub fn any_unfinished_actions(&self) -> bool {
+        !self.interpreter.actions.is_empty()
+    }
 }
 
 #[derive(Debug)]