summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJesusaves <cpntb1@ymail.com>2021-05-10 01:05:15 -0300
committerJesusaves <cpntb1@ymail.com>2021-05-10 01:05:15 -0300
commit4732cff1b23694d98f9a55609c1e21bfeb0f9000 (patch)
tree051c774f46fc684dd6b24a64990aff1ccf449112
parenteb88008256d385aac9190ad537f83b6e813d50da (diff)
downloadrenpy-4732cff1b23694d98f9a55609c1e21bfeb0f9000.tar.gz
renpy-4732cff1b23694d98f9a55609c1e21bfeb0f9000.tar.bz2
renpy-4732cff1b23694d98f9a55609c1e21bfeb0f9000.tar.xz
renpy-4732cff1b23694d98f9a55609c1e21bfeb0f9000.zip
Windows iconify() - a pygame call - seems a bit... broken?
Therefore, disable it by default on Windows. (Can still be enabled)
-rw-r--r--game/core.rpy52
1 files changed, 27 insertions, 25 deletions
diff --git a/game/core.rpy b/game/core.rpy
index e1095d2..a9e2c0c 100644
--- a/game/core.rpy
+++ b/game/core.rpy
@@ -31,31 +31,7 @@ init -3 python:
execute=subprocess.call
#############################################################################
- ## Some other stuff
- if renpy.linux:
- os.environ["APPIMAGELAUNCHER_DISABLE"]="1"
-
- #############################################################################
- ## Configuration and Defaults
- if (persistent.discord is None):
- persistent.discord = True
- if (persistent.steam is None):
- persistent.steam = False
- if (persistent.client is None):
- persistent.client = "manaplus"
- if (persistent.iconify is None):
- persistent.iconify = True
-
- #############################################################################
- # ["themanaworld.org", "germantmw.de", "moubootaurlegends.org"]
- if config.developer:
- VAULT_HOST = "https://localhost:13370"
- VAULT_CERT = "http://localhost/launcher/cert.pem"
- else:
- VAULT_HOST = "http://api.tmw2.org:13370"
- VAULT_CERT = "https://tmw2.org/launcher/cert.pem"
- #############################################################################
-
+ # Functions
# Encodes something to md5
def md5(string):
return hashlib.md5(string.encode()).hexdigest()
@@ -114,6 +90,7 @@ init -3 python:
else:
return renpy.config.basedir + "/" + path
+ #############################################################################
# Global classes
# We need to override standard list method. Original by Triptych (stackoverflow)
class dlist(list):
@@ -137,6 +114,31 @@ init -3 python:
stdout("dlsearch: r is None")
return r
+ #############################################################################
+ ## Some other stuff
+ if renpy.linux:
+ os.environ["APPIMAGELAUNCHER_DISABLE"]="1"
+
+ #############################################################################
+ ## Configuration and Defaults
+ if (persistent.discord is None):
+ persistent.discord = True
+ if (persistent.steam is None):
+ persistent.steam = False
+ if (persistent.client is None):
+ persistent.client = "manaplus"
+ if (persistent.iconify is None):
+ persistent.iconify = ifte(renpy.windows, False, True)
+
+ #############################################################################
+ # ["themanaworld.org", "germantmw.de", "moubootaurlegends.org"]
+ if config.developer:
+ VAULT_HOST = "https://localhost:13370"
+ VAULT_CERT = "http://localhost/launcher/cert.pem"
+ else:
+ VAULT_HOST = "http://api.tmw2.org:13370"
+ VAULT_CERT = "https://tmw2.org/launcher/cert.pem"
+
###################
# Vault SSL wrapper
vault=requests.Session()