Changeset 248:129afb4417cf


Ignore:
Timestamp:
04/07/11 17:44:04 (12 years ago)
Author:
Jeremy Thurgood <firxen@…>
Branch:
default
Phase:
public
Rebase:
38626366343566343639613333386534326135346335336131373633663031653161303562303930
Message:

Some light cleanup.

Location:
skaapsteker
Files:
8 edited

Legend:

Unmodified
Added
Removed
  • skaapsteker/engine.py

    r244 r248  
    66from pygame.locals import QUIT, USEREVENT
    77
    8 from skaapsteker.gamestate import GameState
     8from .gamestate import GameState
    99
    1010class Engine(object):
  • skaapsteker/gamestate.py

    r225 r248  
    11import json
    22
    3 from skaapsteker import data
    4 from skaapsteker.sprites.base import find_sprite
     3from . import data
     4from .sprites.base import find_sprite
    55
    66
  • skaapsteker/level.py

    r243 r248  
    33from pygame import Rect, Surface, Color, mixer
    44from pygame.sprite import LayeredUpdates
    5 from pygame.locals import SRCALPHA, HWSURFACE
    65
    76from . import data
    87from .constants import Layers
    9 from .sprites import enemies
    108from .sprites.base import TILE_SIZE, find_sprite, Geography
    119from .widgets.text import Text
  • skaapsteker/levelscene.py

    r244 r248  
    44                           K_SEMICOLON, K_UP, K_p, K_q, K_x, K_z, K_RETURN)
    55
     6import pygame
     7
    68from . import options
    7 import engine
    8 import level
    9 import physics
    10 import sprites.player
    11 from skaapsteker.widgets.text import Text
    12 import pygame
     9from . import engine
     10from . import level
     11from . import physics
     12from .sprites import player
     13from .widgets.text import Text
     14
    1315
    1416class LevelScene(engine.Scene):
     
    1719        super(LevelScene, self).__init__(game_state)
    1820
    19         self._player = sprites.player.Player(game_state.world)
     21        self._player = player.Player(game_state.world)
    2022        self._level = level.Level(leveldef, self._player)
    2123        self._leveldef = leveldef
  • skaapsteker/menuscene.py

    r218 r248  
    66from .levelscene import LevelScene
    77from .widgets.text import Text, TextChoice
     8
    89
    910class MenuScene(Scene):
  • skaapsteker/sprites/base.py

    r242 r248  
    11"""Basic sprite classes."""
    22
     3import re
     4
    35from pygame import Rect
    4 import re
    5 
    6 from skaapsteker.physics import Sprite
    7 from skaapsteker.constants import Layers
    8 from skaapsteker import data
    9 from skaapsteker import dialogue
     6
     7from ..physics import Sprite
     8from ..constants import Layers
     9from .. import data
     10from .. import dialogue
    1011
    1112
  • skaapsteker/sprites/player.py

    r244 r248  
    44import time
    55
    6 from skaapsteker.sprites.base import TILE_SIZE, PC_LAYER, MONSTER_LAYER
    7 from skaapsteker.physics import Sprite
    8 from skaapsteker.constants import Layers
    9 from skaapsteker.data import get_files, load_image
    10 from skaapsteker.engine import PlayerDied
     6from ..sprites.base import TILE_SIZE, PC_LAYER, MONSTER_LAYER
     7from ..physics import Sprite
     8from ..constants import Layers
     9from ..data import get_files, load_image
     10from ..engine import PlayerDied
    1111
    1212
  • skaapsteker/widgets/text.py

    r247 r248  
    22
    33import collections
    4 import os.path
    54
    65import pygame
Note: See TracChangeset for help on using the changeset viewer.