Linted code
This commit is contained in:
18
__main__.py
18
__main__.py
@ -76,14 +76,14 @@ class Launcher:
|
|||||||
os.chdir(game.path)
|
os.chdir(game.path)
|
||||||
# Load the games game.py file.
|
# Load the games game.py file.
|
||||||
spec = importlib.util.spec_from_file_location(game.id, os.path.join(game.path, 'game.py'))
|
spec = importlib.util.spec_from_file_location(game.id, os.path.join(game.path, 'game.py'))
|
||||||
foo = importlib.util.module_from_spec(spec)
|
module = importlib.util.module_from_spec(spec)
|
||||||
spec.loader.exec_module(foo)
|
spec.loader.exec_module(module)
|
||||||
# Initialise the games Game class, then set the
|
# Initialise the games Game class, then set the
|
||||||
# current game to that.
|
# current game to that.
|
||||||
self.currentGame = foo.Game(self.gameSurface)
|
self.currentGame = module.Game(self.gameSurface)
|
||||||
# Set the window title to the games name
|
# Set the window title to the games name
|
||||||
pygame.display.set_caption(game.name)
|
pygame.display.set_caption(game.name)
|
||||||
|
|
||||||
def update(self):
|
def update(self):
|
||||||
for event in pygame.event.get():
|
for event in pygame.event.get():
|
||||||
if self.gameRunning:
|
if self.gameRunning:
|
||||||
@ -98,7 +98,7 @@ class Launcher:
|
|||||||
os.chdir(originalCWD)
|
os.chdir(originalCWD)
|
||||||
pygame.display.set_caption('Pain Jam Launcher')
|
pygame.display.set_caption('Pain Jam Launcher')
|
||||||
# If we launched directly into a game
|
# If we launched directly into a game
|
||||||
if args.gameID != None:
|
if args.gameID is not None:
|
||||||
# Exit the launcher when we exit the game
|
# Exit the launcher when we exit the game
|
||||||
self.running = False
|
self.running = False
|
||||||
else:
|
else:
|
||||||
@ -108,7 +108,7 @@ class Launcher:
|
|||||||
elif event.type == pygame.KEYDOWN:
|
elif event.type == pygame.KEYDOWN:
|
||||||
if event.key == pygame.K_1:
|
if event.key == pygame.K_1:
|
||||||
self.loadGame(games['russianRoulette'])
|
self.loadGame(games['russianRoulette'])
|
||||||
|
|
||||||
if self.gameRunning:
|
if self.gameRunning:
|
||||||
self.currentGame._update()
|
self.currentGame._update()
|
||||||
self.screen.blit(self.currentGame.surf, (0, 0))
|
self.screen.blit(self.currentGame.surf, (0, 0))
|
||||||
@ -118,13 +118,13 @@ class Launcher:
|
|||||||
pygame.display.update()
|
pygame.display.update()
|
||||||
|
|
||||||
self.clock.tick(args.fpsCap)
|
self.clock.tick(args.fpsCap)
|
||||||
|
|
||||||
@property
|
@property
|
||||||
def gameRunning(self):
|
def gameRunning(self):
|
||||||
return self.currentGame != None
|
return self.currentGame is not None
|
||||||
|
|
||||||
launcher = Launcher()
|
launcher = Launcher()
|
||||||
if args.gameID != None:
|
if args.gameID is not None:
|
||||||
launcher.loadGame(games[args.gameID])
|
launcher.loadGame(games[args.gameID])
|
||||||
while launcher.running:
|
while launcher.running:
|
||||||
launcher.update()
|
launcher.update()
|
||||||
|
|||||||
Reference in New Issue
Block a user