Removed some boilerplate.

[uxul-world.git] / simple-enemy.lisp

diff --git a/simple-enemy.lisp b/simple-enemy.lisp
index ae8d3b7..4315c5b 100755 (executable)
--- a/simple-enemy.lisp
+++ b/simple-enemy.lisp
@@ -1,4 +1,4 @@
-;;; Copyright 2009 Christoph Senjak
+;;; Copyright 2009-2011 Christoph Senjak
 
 (in-package :uxul-world)
 
@@ -34,17 +34,15 @@
           (setf (activated obj) T))))))
 
 (defun simple-enemy-and-player (player enemy)
-  (decf (power player))
-  (setf (active enemy) nil)
-  (setf (visible enemy) nil)
-  (setf (colliding enemy) nil))
+  (decf (power player)))
 
 (defmethod player-hits-enemy ((player player) (enemy simple-enemy) &rest args)
   (cond
     ((eql (direction (car args)) :DOWN)
      (setf (animation enemy) (flat-animation enemy))
      (setf (active enemy) nil)
-     (setf (colliding enemy) nil))
+     (setf (colliding enemy) nil)
+     (setf (listen-to player) (remove enemy (listen-to player))))
     (T
      (simple-enemy-and-player player enemy))))