From a209d1487599c55ff3803512a2c3f839258aacbc Mon Sep 17 00:00:00 2001
From: Jesusaves <cpntb1@ymail.com>
Date: Sat, 6 Aug 2022 20:13:42 -0300
Subject: Fix a bug with async_loader

---
 game/03_init.rpy | 10 ++++++++--
 game/script.rpy  | 10 +++++-----
 2 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/game/03_init.rpy b/game/03_init.rpy
index 352878b..33ab838 100644
--- a/game/03_init.rpy
+++ b/game/03_init.rpy
@@ -87,8 +87,14 @@ init python:
         # We need to try to get rarity
         try:
             r=allunits[int(cid)]["rare"]
+        except NameError: # allunits is not yet defined
+            r=8
+            print("WARNING: %s %s %d without allunits" % (str(cid), path, ei))
         except:
             r=8 # FIXME: Also, is allunits already initialized?
+            print("CC %s %s %d" % (str(cid), path, ei))
+            #traceback.print_stack()
+            #traceback.print_exc()
 
         # We need to try to get the element
         try:
@@ -174,7 +180,7 @@ init python:
             continue
 
 
-    # Load sprite images: "unit"
+    # Load sprite images: "unit" (FIXME: Unitialized)
     for file in renpy.list_files():
         fn=file.replace('gfx/units/','').replace('/', ' ').replace('.png','').replace('.webp','')
         if file.startswith('gfx/units/'):
@@ -249,7 +255,7 @@ init python:
             continue
 
 
-    # Load summon images: "square"
+    # Load summon images: "square" (FIXME unitialized)
     for file in renpy.list_files():
         fn=file.replace('gfx/square/','').replace('/', ' ').replace('.png','').replace('.webp','')
         if file.startswith('gfx/square/'):
diff --git a/game/script.rpy b/game/script.rpy
index 2a1f356..7eafe5b 100644
--- a/game/script.rpy
+++ b/game/script.rpy
@@ -32,11 +32,6 @@ label start:
 
     $ stdout("Connection established!")
 
-    # FIXME: This be bad for old phones
-    # Load all downloaded images to RAM
-    # (For a smoother gameplay)
-    $ renpy.invoke_in_thread(async_loader)
-
     # Open game
     scene bg town with Dissolve(0.3)
     pause 0.1
@@ -93,6 +88,11 @@ label login:
         #while not tr_load:
         #    sdelay()
 
+    # FIXME: This be bad for old phones
+    # Load all downloaded images to RAM
+    # (For a smoother gameplay)
+    $ renpy.invoke_in_thread(async_loader)
+
     show spinner at truecenter
     $ persistent.password=password
     $ dlcode-=5000
-- 
cgit v1.2.3-60-g2f50