From e1fc44f4e01c8bb327d2cb9ae5a8be9cff344a9e Mon Sep 17 00:00:00 2001
From: Fabian Dill <fabian.dill@web.de>
Date: Fri, 10 Dec 2021 09:29:59 +0100
Subject: [PATCH] Clients: compatibility change for old Intel graphics.

---
 SNIClient.py                            | 1 +
 kvui.py                                 | 9 ++++++---
 setup.py                                | 3 ++-
 worlds/sm/variaRandomizer/randomizer.py | 4 +---
 4 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/SNIClient.py b/SNIClient.py
index 2229eadf..6d7540ea 100644
--- a/SNIClient.py
+++ b/SNIClient.py
@@ -1048,6 +1048,7 @@ async def game_watcher(ctx: Context):
                     ctx.location_name_getter(item.location), itemOutPtr, len(ctx.items_received)))
             await snes_flush_writes(ctx)
 
+
 async def run_game(romfile):
     auto_start = Utils.get_options()["lttp_options"].get("rom_start", True)
     if auto_start is True:
diff --git a/kvui.py b/kvui.py
index 8039f659..cd8da14d 100644
--- a/kvui.py
+++ b/kvui.py
@@ -8,11 +8,16 @@ os.environ["KIVY_NO_FILELOG"] = "1"
 os.environ["KIVY_NO_ARGS"] = "1"
 os.environ["KIVY_LOG_ENABLE"] = "0"
 
+from kivy.base import Config
+Config.set("input", "mouse", "mouse,disable_multitouch")
+Config.set('kivy', 'exit_on_escape', '0')
+Config.set('graphics', 'multisamples', '0')  # multisamples crash old intel drivers
+
 from kivy.app import App
 from kivy.core.window import Window
 from kivy.core.clipboard import Clipboard
 from kivy.core.text.markup import MarkupLabel
-from kivy.base import ExceptionHandler, ExceptionManager, Config, Clock
+from kivy.base import ExceptionHandler, ExceptionManager, Clock
 from kivy.factory import Factory
 from kivy.properties import BooleanProperty, ObjectProperty
 from kivy.uix.button import Button
@@ -431,6 +436,4 @@ class KivyJSONtoTextParser(JSONtoTextParser):
 
 ExceptionManager.add_handler(E())
 
-Config.set("input", "mouse", "mouse,disable_multitouch")
-Config.set('kivy', 'exit_on_escape', '0')
 Builder.load_file(Utils.local_path("data", "client.kv"))
diff --git a/setup.py b/setup.py
index 76d953eb..c72846b1 100644
--- a/setup.py
+++ b/setup.py
@@ -141,7 +141,7 @@ for folder in sdl2.dep_bins + glew.dep_bins:
     shutil.copytree(folder, libfolder, dirs_exist_ok=True)
     print('copying', folder, '->', libfolder)
 
-extra_data = ["LICENSE", "data", "EnemizerCLI", "host.yaml", "SNI", "meta.yaml"]
+extra_data = ["LICENSE", "data", "EnemizerCLI", "host.yaml", "SNI"]
 
 for data in extra_data:
     installfile(Path(data))
@@ -155,6 +155,7 @@ for worldname, worldtype in AutoWorldRegister.world_types.items():
         file_name = worldname+".yaml"
         shutil.copyfile(os.path.join("WebHostLib", "static", "generated", "configs", file_name),
                         buildfolder / "Players" / "Templates" / file_name)
+shutil.copyfile("meta.yaml", buildfolder / "Players" / "Templates" / "meta.yaml")
 
 try:
     from maseya import z3pr
diff --git a/worlds/sm/variaRandomizer/randomizer.py b/worlds/sm/variaRandomizer/randomizer.py
index 5b1312fe..a95764df 100644
--- a/worlds/sm/variaRandomizer/randomizer.py
+++ b/worlds/sm/variaRandomizer/randomizer.py
@@ -364,13 +364,11 @@ class VariaRandomizer:
             self.seed = args.seed
         logger.debug("seed: {}".format(self.seed))
 
-        seed4rand = self.seed
         if args.raceMagic is not None:
             if args.raceMagic <= 0 or args.raceMagic >= 0x10000:
                 print("Invalid magic")
                 sys.exit(-1)
-            seed4rand = self.seed ^ args.raceMagic
-        # random.seed(seed4rand)
+
         # if no max diff, set it very high
         if args.maxDifficulty:
             if args.maxDifficulty == 'random':