Reintroduce support for remotely downloaded audio files...

...By overriding the default music file loader >.>

2 files changed, 26 insertions, 3 deletions

diff --git a/game/01_init.rpy b/game/01_init.rpy
index 4903b37..99f8587 100644
--- a/game/01_init.rpy
+++ b/game/01_init.rpy
@@ -21,6 +21,7 @@
 init -3 python:
     renpy.add_python_directory("python-extra")
     import requests, zlib, base64, sys, copy, uuid, time, json, traceback
+    import os.path
     from threading import Timer
     from ws4py.client.threadedclient import WebSocketClient
 
@@ -256,6 +257,26 @@ init -3 python:
         else:
             return renpy.loader.transfn(path)
 
+
+    # Override music audio loader
+    def SpheresLoadAudioFile(fn):
+        """
+        Returns a file-like object for the given filename.
+        """
+
+        try:
+            fna = get_path_if_exists(fn)
+            if not os.path.isfile(fna):
+                raise Exception("Not a file")
+            rv = renpy.loader.open_file(fna, "rb")
+        except:
+            rv = renpy.loader.load(fn)
+
+        return rv
+
+    renpy.audio.audio.load=SpheresLoadAudioFile
+
+    #############################################################################
     # URL3 Function
     def GAME_UPDATER():
         global tr_uptodate
diff --git a/game/03_init.rpy b/game/03_init.rpy
index df63339..6bc5cad 100644
--- a/game/03_init.rpy
+++ b/game/03_init.rpy
@@ -263,11 +263,13 @@ init python:
                 f.write(x.content)
                 f.close()
                 # Android needs paths to be saved by full
-                if True or renpy.android:
+                # But audio hates it, so.
+                if ext not in [".mp3", ".ogg"]:
                     addr=get_path(addr)
                 path=((img, addr))
                 persistent.allfiles.append(path)
             else:
+                stdout("ERROR FOR: %s://%s/assets/%s?token=%s" % (ifte(persistent.ssl_enabled, "https", "http"), HOST, img.replace(" ", "_"), get_token()))
                 try:
                     retry=renpy.call_screen("confirm", "Error downloading file.\nError Code: %d\n\nRetry?" % x.status_code, Return(True), Return(False))
                     if not retry:
@@ -311,10 +313,10 @@ init python:
     MUSIC_BATTLE=RetString("sfx/bgm03.mp3")
     MUSIC_BOSS=RetString("sfx/bgm04.mp3")
     MUSIC_PARTY=RetString("sfx/bgm02.mp3")
-    #MUSIC_PARTY=ExecuteOnCall(get_sfx, "sfx_bgm05", ".mp3")#"sfx/bgm05.mp3"
+    MUSIC_PARTY=ExecuteOnCall(get_sfx, "sfx_bgm05", ".mp3")#"sfx/bgm05.mp3"
     MUSIC_VICTORY=RetString("sfx/bgm06.mp3")
     MUSIC_WORLDMAP=RetString("sfx/bgm02.mp3")
-    #MUSIC_WORLDMAP=ExecuteOnCall(get_sfx, "sfx_bgm07", ".mp3")#"sfx/bgm07.mp3"
+    MUSIC_WORLDMAP=ExecuteOnCall(get_sfx, "sfx_bgm07", ".mp3")#"sfx/bgm07.mp3"
     MUSIC_PROLOGUE01=RetString("sfx/regnum.mp3")
     MUSIC_PROLOGUE02=RetString("sfx/prologue.mp3")
     MUSIC_PROLOGUE03=RetString("sfx/shining.mp3")