Changeset 417

Show
Ignore:
Timestamp:
04/06/2012 10:44:04 PM (2 years ago)
Author:
ecoughlan
Message:

Moved research and build menu locations

Location:
src
Files:
3 modified

Legend:

Unmodified
Added
Removed
  • src/buildMenuEntry.py

    r406 r417  
    1010from info import Info 
    1111from stats import Stats 
     12from dim import buildMenuEntryDim as DIM 
    1213from globals import * 
    1314 
     
    2122 
    2223        buildingStats = self.building.stats.contSpecs.getAllStats() 
    23         self.stats = Stats((600,375),False, buildingStats,isBuilding=True) 
     24        self.stats = Stats((DIM.DESCRIP_LEFT + 50, DIM.DESCRIP_TOP + 125),False, buildingStats,isBuilding=True) 
    2425        MenuEntry.__init__(self, pos, visible, self.info) 
    25  
     26         
    2627        self.stats.stayBack = True 
    2728        self.info.createFromBuilding(building, True, self.able) 
    28         popup = BuildDescription((550, 250), False, self.info, self.able) 
     29        popup = BuildDescription((DIM.DESCRIP_LEFT, DIM.DESCRIP_TOP), False, self.info, self.able) 
    2930        popup.addWindow(self.stats) 
    3031        self.subwindows.append(popup) 
  • src/researchDescription.py

    r381 r417  
    1717            input type: Info 
    1818        """ 
     19        print "ResearchDescription Position: ", pos 
    1920        DetailedDescription.__init__(self, pos, visible, True, info) 
    2021 
  • src/researchMenuEntry.py

    r402 r417  
    1010from info import Info 
    1111from stats import Stats 
     12from dim import researchMenuEntryDim as DIM 
    1213from globals import * 
    1314 
     
    2223 
    2324        self.info.createFromResearch(researchCat, True, self.nextUnlock) 
    24         popup = ResearchDescription((550, 250), False, self.info) 
     25        popup = ResearchDescription((DIM.DESCRIP_LEFT, DIM.DESCRIP_TOP), False, self.info) 
    2526        self.subwindows.append(popup) 
    2627        self.addResponse((popup.toggle,)) 
     
    4546 
    4647            self.info.createFromResearch(self.researchCat, True, self.nextUnlock) 
    47             popup = ResearchDescription((550, 250), False, self.info) 
     48            popup = ResearchDescription((DIM.DESCRIP_LEFT, DIM.DESCRIP_TOP), False, self.info) 
    4849            popup.setYesResponse((self.researchResponse, self.researchCat)) 
    4950            self.subwindows.append(popup)