From 563ee9b2fa01d56402af54258d9f50c6c4b83978 Mon Sep 17 00:00:00 2001
From: Jesusaves <cpntb1@ymail.com>
Date: Tue, 29 Dec 2020 18:01:12 -0300
Subject: Disable screen prediction entirely. Probably not needed, but it
 worked so smoothly on mobile, that I made it final.

---
 game/05_init.rpy | 12 ++++++++++++
 game/battle.rpy  |  2 +-
 game/options.rpy |  3 +++
 game/quest.rpy   |  2 ++
 4 files changed, 18 insertions(+), 1 deletion(-)

diff --git a/game/05_init.rpy b/game/05_init.rpy
index c82f27b..60b8878 100644
--- a/game/05_init.rpy
+++ b/game/05_init.rpy
@@ -28,6 +28,11 @@ label prestart:
         tr_uptodate=False
         tr_memcheck=False
         session_id=uuid.uuid4().hex
+        config.predict_screens=False
+        config.predict_screen_statements=False
+        config.predict_file_pages=False
+        config.predict_statements_callback=None
+        config.predict_statements=0
     return
 
 label splashscreen:
@@ -61,3 +66,10 @@ init 2 python:
 
     config.overlay_functions.append(TermWatcher)
 
+    # Do not attempt to predict screens: They may need unitialized data
+    config.predict_screens=False
+    config.predict_screen_statements=False
+    config.predict_file_pages=False
+    config.predict_statements_callback=None
+    config.predict_statements=0
+
diff --git a/game/battle.rpy b/game/battle.rpy
index 5cbb4a7..731682e 100644
--- a/game/battle.rpy
+++ b/game/battle.rpy
@@ -86,7 +86,7 @@ label combat:
     $ btl_ready = False
     python:
         try:
-            renpy.call_screen("battle")
+            renpy.call_screen("battle", _with_none=True)
         except:
             traceback.print_exc()
             stdout("FAILED to render battle screen, trying again...")
diff --git a/game/options.rpy b/game/options.rpy
index 16b5c31..09d7ebb 100644
--- a/game/options.rpy
+++ b/game/options.rpy
@@ -26,6 +26,9 @@ init -2 python:
 define gui.show_name = True
 define _confirm_quit = False
 
+## Debug
+#define config.profile = True
+
 ## Text that is placed on the game's about screen. Place the text between the
 ## triple-quotes, and leave a blank line between paragraphs.
 
diff --git a/game/quest.rpy b/game/quest.rpy
index 7e3dc21..4ba1185 100644
--- a/game/quest.rpy
+++ b/game/quest.rpy
@@ -115,6 +115,7 @@ label quest_selected:
 
     # Begin the quest
     $ Battle=loadquest(qid)
+    $ sdelay(0.02)
 
     # Check for error
     if (Battle in [FAILUREMSG, OFFLINEMSG, ERR_JSONDECODER, ERR_LOGIN_DEFAULT]):
@@ -169,6 +170,7 @@ label quest_selected:
     #play music MUSIC_BATTLE.id() fadein 0.5
     $ renpy.free_memory()
     window hide
+    $ renpy.stop_predict_screen("battle")
     #$ renpy.jump_out_of_context("combat")
     #$ renpy.call_in_new_context("combat")
     #jump restore
-- 
cgit v1.2.3-70-g09d2