X-Git-Url: http://uxul.de/gitweb/?p=uxul-world.git;a=blobdiff_plain;f=burning-marshmallow.lisp;fp=burning-marshmallow.lisp;h=cb8b374eb4f56ea58cf19054cae50a841be95444;hp=5d08382c85ed9efa61ad9f8ae45a56966ca3fbfe;hb=a1b8d36904d4152a102637bdd61cbf064a247a72;hpb=ab302d9ac8adefaf2bfe630e29c0847b0d372e16

diff --git a/burning-marshmallow.lisp b/burning-marshmallow.lisp
index 5d08382..cb8b374 100644
--- a/burning-marshmallow.lisp
+++ b/burning-marshmallow.lisp
@@ -101,12 +101,13 @@
 	(setf (animation obj) (slot-value obj 'rd-animation)))))))
 
 
+; already defined in simple-enemy.lisp - possibly a bug?
 
-(defun simple-enemy-and-player (player enemy)
-  (decf (power player))
-  (setf (active enemy) nil)
-  (setf (visible enemy) nil)
-  (setf (colliding enemy) nil))
+;; (defun simple-enemy-and-player (player enemy)
+;;   (decf (power player))
+;;   (setf (active enemy) nil)
+;;   (setf (visible enemy) nil)
+;;   (setf (colliding enemy) nil))
 
 (defmethod player-hits-enemy ((player player) (enemy burning-marshmallow) &rest args)
   (declare (ignore args))