Mercurial > dw

changeset 40:b752350d6e03

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Removed exception catching around monster.act()
author Radomir Dopieralski <moindev@sheep.art.pl>
date Tue, 25 Dec 2007 22:21:17 +0100
parents 62f224d11915
children c5eeda44b63b
files lib/game.py lib/mesg.py lib/monster/__init__.py
diffstat 3 files changed, 8 insertions(+), 13 deletions(-) [+]
line wrap: on
line diff
--- a/lib/game.py	Tue Dec 25 22:11:45 2007 +0100
+++ b/lib/game.py	Tue Dec 25 22:21:17 2007 +0100
@@ -5,6 +5,7 @@
 from util import *
 from level import Level
 import display
+import mesg
 
 class Game:
     def __init__(self):
@@ -26,16 +27,16 @@
                 self.level.player.attack(d, bump.monster)
             self.end_turn()
         except MoveError:
-            Mesg(self.level.player, "blocked")
+            mesg.Mesg(self.display, self.level.player, "blocked")
     
     def end_turn(self):
         for monster in self.level.monsters.values():
             if not monster.dead:
-                try:
+#                try:
                     monster.act()
-                except Exception, e:
-                    print "Monster %s acting weird!" % repr(monster)
-                    print repr(e)
+#                except ActError, e:
+#                    print "Monster %s acting weird!" % repr(monster)
+#                    print repr(e)
     
     def all_finished(self):
         """Are all animations ready?"""
--- a/lib/mesg.py	Tue Dec 25 22:11:45 2007 +0100
+++ b/lib/mesg.py	Tue Dec 25 22:21:17 2007 +0100
@@ -11,7 +11,7 @@
 class Mesg(pygame.sprite.Sprite):
     """Messages float up and disappear."""
     
-    def __init__(self, sprite, text, color=(255, 255, 255)):
+    def __init__(self, display, sprite, text, color=(255, 255, 255)):
         pygame.sprite.Sprite.__init__(self)
         self.dh = 10
         self.image = font.render(text, False, color).convert()
@@ -19,7 +19,7 @@
         self.rect = self.image.get_rect()
         self.rect.center = sprite.rect.center
         self.sprite = sprite
-        sprite.level.effects.add(self)
+        display.effects.add(self)
 
     def update(self):
         if self.alpha <= 0:
--- a/lib/monster/__init__.py	Tue Dec 25 22:11:45 2007 +0100
+++ b/lib/monster/__init__.py	Tue Dec 25 22:21:17 2007 +0100
@@ -2,8 +2,6 @@
 from pygame.locals import *
 import os
 
-from mesg import Mesg
-from shadow import Shadow
 from util import *
 
 class MoveError(Exception):
@@ -38,10 +36,7 @@
         self.h = 0
         self.dead = False
         self.place(pos)
-#        self.shadow = Shadow(self)
-#        self.level.add_sprite(self)
         self.anim = self.anim_stand()
-#        self.shadow.update()
         self.update()
 
     def place(self, pos):
@@ -124,7 +119,6 @@
     def hit(self, damage=5):
         if self.dead:
             return
-        Mesg(self, "-%d" % damage, color=(255,0,0))
         self.die()
         
     def die(self):