# HG changeset patch # User Jeremy Thurgood # Date 1328959440 -7200 # Node ID 38fb04728ac58b8f43b5ba57a72071e0403c45f4 # Parent 53cc4049fb3096212ca2b1590a09b47ab83dbb33 Rearrange import. diff -r 53cc4049fb30 -r 38fb04728ac5 pyntnclick/cursor.py --- a/pyntnclick/cursor.py Sat Feb 11 13:22:21 2012 +0200 +++ b/pyntnclick/cursor.py Sat Feb 11 13:24:00 2012 +0200 @@ -11,7 +11,7 @@ import pygame.cursors import pygame.mouse -from gamelib.constants import SCENE_SIZE +from pyntnclick.constants import SCENE_SIZE class CursorSprite(Sprite): diff -r 53cc4049fb30 -r 38fb04728ac5 pyntnclick/endscreen.py --- a/pyntnclick/endscreen.py Sat Feb 11 13:22:21 2012 +0200 +++ b/pyntnclick/endscreen.py Sat Feb 11 13:24:00 2012 +0200 @@ -5,7 +5,7 @@ from albow.screen import Screen from albow.resource import get_image -from gamelib.widgets import BoomImageButton +from pyntnclick.widgets import BoomImageButton class EndImageButton(BoomImageButton): diff -r 53cc4049fb30 -r 38fb04728ac5 pyntnclick/gamescreen.py --- a/pyntnclick/gamescreen.py Sat Feb 11 13:22:21 2012 +0200 +++ b/pyntnclick/gamescreen.py Sat Feb 11 13:24:00 2012 +0200 @@ -9,11 +9,11 @@ from pygame import Rect, mouse from pygame.color import Color -from constants import SCREEN, BUTTON_SIZE, SCENE_SIZE, LEAVE -from cursor import CursorWidget -from state import initial_state, handle_result -from widgets import (MessageDialog, BoomButton, HandButton, PopupMenu, - PopupMenuButton) +from pyntnclick.constants import SCREEN, BUTTON_SIZE, SCENE_SIZE, LEAVE +from pyntnclick.cursor import CursorWidget +from pyntnclick.state import initial_state, handle_result +from pyntnclick.widgets import ( + MessageDialog, BoomButton, HandButton, PopupMenu, PopupMenuButton) class InventoryView(PaletteView): diff -r 53cc4049fb30 -r 38fb04728ac5 pyntnclick/main.py --- a/pyntnclick/main.py Sat Feb 11 13:22:21 2012 +0200 +++ b/pyntnclick/main.py Sat Feb 11 13:24:00 2012 +0200 @@ -16,14 +16,13 @@ from pygame.locals import SWSURFACE from albow.shell import Shell -from menu import MenuScreen -from gamescreen import GameScreen -from endscreen import EndScreen -from constants import ( +from pyntnclick.menu import MenuScreen +from pyntnclick.gamescreen import GameScreen +from pyntnclick.endscreen import EndScreen +from pyntnclick.constants import ( SCREEN, FRAME_RATE, FREQ, BITSIZE, CHANNELS, BUFFER, DEBUG) -from sound import no_sound, disable_sound -import state -import data +from pyntnclick.sound import no_sound, disable_sound +from pyntnclick import state, data def parse_args(args): diff -r 53cc4049fb30 -r 38fb04728ac5 pyntnclick/menu.py --- a/pyntnclick/menu.py Sat Feb 11 13:22:21 2012 +0200 +++ b/pyntnclick/menu.py Sat Feb 11 13:24:00 2012 +0200 @@ -5,7 +5,7 @@ from albow.screen import Screen from albow.resource import get_image -from gamelib.widgets import BoomImageButton +from pyntnclick.widgets import BoomImageButton class SplashButton(BoomImageButton): diff -r 53cc4049fb30 -r 38fb04728ac5 pyntnclick/scenewidgets.py --- a/pyntnclick/scenewidgets.py Sat Feb 11 13:22:21 2012 +0200 +++ b/pyntnclick/scenewidgets.py Sat Feb 11 13:24:00 2012 +0200 @@ -7,9 +7,9 @@ from pygame.surface import Surface from albow.resource import get_image -from gamelib.state import Thing -from gamelib.constants import DEBUG -from gamelib.widgets import BoomLabel +from pyntnclick.state import Thing +from pyntnclick.constants import DEBUG +from pyntnclick.widgets import BoomLabel class Interact(object): diff -r 53cc4049fb30 -r 38fb04728ac5 pyntnclick/speech.py --- a/pyntnclick/speech.py Sat Feb 11 13:22:21 2012 +0200 +++ b/pyntnclick/speech.py Sat Feb 11 13:24:00 2012 +0200 @@ -4,7 +4,7 @@ import re -from sound import get_sound +from pyntnclick.sound import get_sound # cache of string -> sound object mappings diff -r 53cc4049fb30 -r 38fb04728ac5 pyntnclick/state.py --- a/pyntnclick/state.py Sat Feb 11 13:22:21 2012 +0200 +++ b/pyntnclick/state.py Sat Feb 11 13:24:00 2012 +0200 @@ -8,9 +8,10 @@ from pygame.rect import Rect from pygame.color import Color -import constants -from scenes import SCENE_LIST, INITIAL_SCENE -from sound import get_sound +from pyntnclick import constants +from pyntnclick.sound import get_sound + +from gamelib.scenes import SCENE_LIST, INITIAL_SCENE # override the initial scene to for debugging DEBUG_SCENE = None diff -r 53cc4049fb30 -r 38fb04728ac5 pyntnclick/widgets.py --- a/pyntnclick/widgets.py Sat Feb 11 13:22:21 2012 +0200 +++ b/pyntnclick/widgets.py Sat Feb 11 13:24:00 2012 +0200 @@ -13,8 +13,8 @@ from pygame.draw import lines as draw_lines from pygame import mouse -from constants import BUTTON_SIZE -from cursor import CursorWidget +from pyntnclick.constants import BUTTON_SIZE +from pyntnclick.cursor import CursorWidget class BoomLabel(albow.controls.Label): diff -r 53cc4049fb30 -r 38fb04728ac5 run_game.py --- a/run_game.py Sat Feb 11 13:22:21 2012 +0200 +++ b/run_game.py Sat Feb 11 13:24:00 2012 +0200 @@ -1,4 +1,4 @@ #! /usr/bin/env python -from gamelib import main +from pyntnclick import main main.main()