Changeset 573

Show
Ignore:
Timestamp:
04/21/2012 09:49:00 PM (2 years ago)
Author:
ecoughlan
Message:

DIM files and unused imports

Location:
src
Files:
1 added
4 modified

Legend:

Unmodified
Added
Removed
  • src/background.py

    r538 r573  
    77from window import Window 
    88from image import Image 
    9 from globals import * 
     9from fileio import iconDir 
     10from dim import backgroundDim as DIM 
    1011 
    1112 
     
    2425 
    2526        if image != None: 
    26             self.addImg(Image(self.pos, 1080, 792, iconDir + image)) 
     27            self.addImg(Image(self.pos, DIM.W, DIM.H, iconDir + image)) 
    2728        self.restore = doRestore 
    2829 
  • src/blank.py

    r558 r573  
    99from window import Window 
    1010from image import Image 
     11from text import Text 
     12from dim import blankDim as DIM 
    1113from globals import * 
    12 from rectangle import Rectangle 
    13 from dim import blankDim as DIM 
    14 from text import Text 
     14 
    1515 
    1616 
     
    3434        self.addImg(Image((DIM.RECT_LEFT, DIM.RECT_TOP + (DIM.TEXT_H - text_h)), DIM.RECT_W, text_h + DIM.RECT_OFF, iconDir + 'speech_bubble')) 
    3535        self.addText(Text((DIM.TEXT_LEFT, DIM.TEXT_TOP + (DIM.TEXT_H - text_h)), text, DIM.TEXT_SIZE, FAKEBLACK, DIM.TEXT_W)) 
    36         #self.addRect(Rectangle((DIM.RECT_LEFT, DIM.RECT_TOP + (DIM.TEXT_H - text_h)), DIM.RECT_W, text_h, BLUE)) 
    3736         
    3837        self.addImg(Image(arrowLoc, DIM.ARROW_W, DIM.ARROW_H, arrowsDir + 'tutorial_' + arrowDirection)) 
  • src/block.py

    r562 r573  
    1717from mapBuilding import MapBuilding 
    1818from alien import Alien 
    19 from alert import Alert 
    2019from buildables import buildingLUT 
    2120from image import Image 
     
    4544        self.addImg(Image(self.pos, MAPDIM.W, MAPDIM.H, landscapeDir + os.sep + "landscape-0" + str(self.ID + 1))) 
    4645 
    47         left = LeftRight((self.pos[0] + 65, self.pos[1] + MAPDIM.H + 8), 
     46        left = LeftRight((self.pos[0] + DIM.L_X, self.pos[1] + MAPDIM.H + DIM.ARROW_Y), 
    4847                          True, False) 
    4948        left.addResponse(responses[0]) 
    50         right = LeftRight((self.pos[0] + MAPDIM.W - 60, self.pos[1] + MAPDIM.H + 8), 
     49        right = LeftRight((self.pos[0] + MAPDIM.W - DIM.R_X, self.pos[1] + MAPDIM.H + DIM.ARROW_Y), 
    5150                         True, True) 
    5251        right.addResponse(responses[1]) 
     
    9493            self.removeAllElements(MapBuilding) 
    9594            self.removeAllElements(Alien) 
    96             #self.removeAllElements(Alert) 
    9795 
    9896            blockBuildings = state.getBlockBuildings(self.ID) 
  • src/dim/blockDim.py

    r493 r573  
    33CHAR_TOP = 620 
    44CHAR_POS = (CHAR_LEFT, CHAR_TOP) 
     5 
     6L_X = 65 
     7R_X = 60 
     8ARROW_Y = 8