Mercurial > skaapsteker
changeset 279:8d2e4b2a65bf
fixed level editor
| author | Adrianna Pińska <adrianna.pinska@gmail.com> |
|---|---|
| date | Fri, 08 Apr 2011 19:59:05 +0200 |
| parents | abe77599ac47 |
| children | 849e59e919af |
| files | scripts/level-editor skaapsteker/level.py |
| diffstat | 2 files changed, 2 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/scripts/level-editor Fri Apr 08 19:32:54 2011 +0200 +++ b/scripts/level-editor Fri Apr 08 19:59:05 2011 +0200 @@ -19,6 +19,7 @@ from skaapsteker.sprites.player import Player from skaapsteker.widgets.text import Text from skaapsteker.gamestate import GameState +from skaapsteker.sound import SoundSystem FRAMERATE = 60 @@ -26,7 +27,7 @@ clock = pygame.time.Clock() screen_surface = pygame.display.get_surface() game = GameState("game.json") - player = Player(game.world) + player = Player(game.world, SoundSystem(False)) level = DebugLevel(levelname, player) level_surface = level.get_surface() position = [0, 0]
--- a/skaapsteker/level.py Fri Apr 08 19:32:54 2011 +0200 +++ b/skaapsteker/level.py Fri Apr 08 19:59:05 2011 +0200 @@ -152,8 +152,6 @@ objects = [] objects += self.level_data.get('enemies', []) objects += self.level_data.get('sprites', []) - if 'pos' in self.level_data['player']: - objects.append(self.level_data['player']) for object_ in objects: if [x, y] == object_['pos']: