diff --git a/games/empty/__init__.py b/games/empty/__init__.py index cd2be64..0a21e53 100644 --- a/games/empty/__init__.py +++ b/games/empty/__init__.py @@ -1,3 +1,4 @@ -def init(modules, aoEngineEvents): - EngineEvent = modules['engineevents'].EngineEvent +from engineevents import EngineEvent + +def init(aoEngineEvents): aoEngineEvents.append(EngineEvent('level', lambda _: [])) diff --git a/games/squareroom/__init__.py b/games/squareroom/__init__.py index 20b1da4..653fa4d 100644 --- a/games/squareroom/__init__.py +++ b/games/squareroom/__init__.py @@ -1,10 +1,10 @@ import importlib.resources as impr import sys import json +import serialize +from engineevents import EngineEvent -def init(modules, aoEngineEvents): - serialize = modules['serialize'] - EngineEvent = modules['engineevents'].EngineEvent +def init(aoEngineEvents): curm = sys.modules[__name__] files = impr.files(curm) level = None diff --git a/games/triangleroom/__init__.py b/games/triangleroom/__init__.py index 8d7f4c9..0783281 100644 --- a/games/triangleroom/__init__.py +++ b/games/triangleroom/__init__.py @@ -1,10 +1,10 @@ import importlib.resources as impr import sys import json +import serialize +from engineevents import EngineEvent -def init(modules, aoEngineEvents): - serialize = modules['serialize'] - EngineEvent = modules['engineevents'].EngineEvent +def init(aoEngineEvents): curm = sys.modules[__name__] files = impr.files(curm) level = None diff --git a/main.py b/main.py index 1c5c7b5..e1b2a3a 100755 --- a/main.py +++ b/main.py @@ -2,6 +2,7 @@ from math import copysign, pi, acos import sys +import os from importlib import import_module import pygame @@ -123,17 +124,7 @@ def mainLoop(): except IndexError: game = import_module("games.squareroom") - game.init( - { - 'serialize': import_module('serialize'), - 'alert': import_module('alert'), - 'gyro': import_module('gyro'), - 'engineevents': import_module('engineevents'), - 'constants': import_module('constants'), - 'lines': import_module('lines'), - }, - aoEngineEvents - ) + game.init(aoEngineEvents) processevents() while bCont: @@ -184,5 +175,6 @@ def main(): return retstatus if __name__ == "__main__": + sys.path.append(os.path.realpath(__file__)) if not main(): print("An error occured")