Mercurial > nagslang
comparison tools/area_editor.py @ 195:b8701c0bb184
Reorder startup to avoid pygame init issues
author | Neil Muller <drnlmuller@gmail.com> |
---|---|
date | Tue, 03 Sep 2013 22:10:38 +0200 |
parents | 42a10c4f70c8 |
children | 05c2c592ce2e |
comparison
equal
deleted
inserted
replaced
194:3477f5a28605 | 195:b8701c0bb184 |
---|---|
355 def mouse_move(self, ev): | 355 def mouse_move(self, ev): |
356 self.level_widget.mouse_move(ev) | 356 self.level_widget.mouse_move(ev) |
357 | 357 |
358 | 358 |
359 if __name__ == "__main__": | 359 if __name__ == "__main__": |
360 if len(sys.argv) == 2: | 360 if len(sys.argv) not in [2, 4]: |
361 level = EditorLevel(sys.argv[1]) | |
362 level.load(pymunk.Space()) | |
363 elif len(sys.argv) == 4: | |
364 level = EditorLevel(sys.argv[1], int(sys.argv[2]), int(sys.argv[3])) | |
365 else: | |
366 print 'Please supply a levelname or levelname and level size' | 361 print 'Please supply a levelname or levelname and level size' |
367 sys.exit() | 362 sys.exit() |
368 pygame.display.init() | 363 pygame.display.init() |
369 pygame.font.init() | 364 pygame.font.init() |
370 pygame.display.set_mode((SCREEN[0] + MENU_WIDTH, SCREEN[1]), | 365 pygame.display.set_mode((SCREEN[0] + MENU_WIDTH, SCREEN[1]), |
371 pgl.SWSURFACE) | 366 pgl.SWSURFACE) |
367 if len(sys.argv) == 2: | |
368 level = EditorLevel(sys.argv[1]) | |
369 level.load(pymunk.Space()) | |
370 elif len(sys.argv) == 4: | |
371 level = EditorLevel(sys.argv[1], int(sys.argv[2]), int(sys.argv[3])) | |
372 pygame.display.set_caption('Nagslang Area Editor') | 372 pygame.display.set_caption('Nagslang Area Editor') |
373 pygame.key.set_repeat(200, 100) | 373 pygame.key.set_repeat(200, 100) |
374 app = EditorApp(level, pygame.display.get_surface()) | 374 app = EditorApp(level, pygame.display.get_surface()) |
375 app.run() | 375 app.run() |