diff options
author | Kevin Hockey <Blitzkev@gmail.com> | 2010-08-02 17:32:19 (GMT) |
---|---|---|
committer | Kevin Hockey <Blitzkev@gmail.com> | 2010-08-02 17:32:19 (GMT) |
commit | c5c9e6239a4b65f1e89909c82aeb904e3460434c (patch) | |
tree | 31e442707a5305ac98bdf8fae486c47c96e65956 | |
parent | 1cdfbf90c6317f9855ea4f76f25efeafa04c1597 (diff) |
welcome once again dave grohl
-rw-r--r-- | MAFH2/BattleMenu.py | 13 | ||||
-rw-r--r-- | MAFH2/fortuneengine/DrawableObject.py | 6 |
2 files changed, 18 insertions, 1 deletions
diff --git a/MAFH2/BattleMenu.py b/MAFH2/BattleMenu.py index 6f1d29d..f924a15 100644 --- a/MAFH2/BattleMenu.py +++ b/MAFH2/BattleMenu.py @@ -46,6 +46,7 @@ class BattleMenuHolder( GameEngineElement ): def clear_menu(self): if self.menu: + self.menu.clear() self.menu.remove_from_engine() self.menu = None @@ -122,6 +123,9 @@ class BattleMenu(GameEngineElement): def draw(self,screen,time_delta): self.menu.draw( screen ) + + def clear(self): + self.menu.clear() class Menu(object): def __init__(self, options, cols, scene): @@ -147,7 +151,8 @@ class Menu(object): ren = self.font.render(o[0], 1, [0,0,0]) if ren.get_width() > self.width: self.width = ren.get_width() - surf = pygame.Surface((60,60)) + for o in self.options: + surf = pygame.Surface((self.height,self.width)) self.rect_list.append(DrawableObject([surf], "")) self.rect_list.append(DrawableObject([surf], "")) @@ -226,6 +231,12 @@ class Menu(object): return return_val + def clear(self): + for text in self.font_list: + self.scene.removeObject(text) + for rect in self.rect_list: + self.scene.removeObject(rect) + def set_pos(self, x, y): """Set the topleft of the menu at x,y""" self.x = x diff --git a/MAFH2/fortuneengine/DrawableObject.py b/MAFH2/fortuneengine/DrawableObject.py index 71bb091..6bc5de5 100644 --- a/MAFH2/fortuneengine/DrawableObject.py +++ b/MAFH2/fortuneengine/DrawableObject.py @@ -64,6 +64,12 @@ class DrawableObject(pygame.sprite.Sprite): self._origImages[i] = pygame.transform.scale(self._origImages[i], (self.xSize, self.ySize))
self._images[i] = self._origImages[i]
+ def fill(self, color):
+ for i in range(len(self._images)):
+ #print "filling with ", color
+ self._origImages[i].fill(color)
+ self._images[i].fill(color)
+
def getXSize(self):
return self.xSize
|