diff options
author | dmazzone <mazzone.diego@gmail.com> | 2010-10-04 16:53:36 (GMT) |
---|---|---|
committer | dmazzone <mazzone.diego@gmail.com> | 2010-10-04 16:53:36 (GMT) |
commit | a08ee1f600c8ad0f3e51adad74fd79c2cef212f8 (patch) | |
tree | 0029abe6b24e902de7475b3eafadb329cf407a67 | |
parent | 64e6d0971cefa7a950e89ebf2be89187abeb2609 (diff) |
Fix conflicts.windows_controller
-rwxr-xr-x | Saludame.activity/window.py | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/Saludame.activity/window.py b/Saludame.activity/window.py index 299a304..aa2b2c6 100755 --- a/Saludame.activity/window.py +++ b/Saludame.activity/window.py @@ -146,14 +146,14 @@ class MainWindow(Window): self.windows = [] # Lista de ventanas que 'componen' la ventana principal -<<<<<<< HEAD + #temporal para probar ActionWindow (se cargará el diccionario en un módulo aparte). self.animations_dic = {'eat_apple': (animation.Apple(pygame.Rect((210, 20), (150, 172)), 10), "Eating an apple!") } self.action_win = ActionWindow(container, pygame.Rect((0, 505), (600, 20)), 10, pygame.Surface((600, 200)), screen, windows_controller, self.animations_dic) -======= + self.status_bars = status_bars.BarsWindow((0, 0), 1, pygame.Color("gray")) - self.windows.append(self.status_bars) ->>>>>>> 73f0d4ce24750887870a439c77676d1efa9d84a4 + #self.add_window(self.status_bars) + self.windows.append(KidWindow(container, pygame.Rect((0, 0), (600, 500)), 1, screen, windows_controller)) #self.windows.append(animation.Apple(pygame.Rect((700, 90), (150, 172)), 10)) |