projects
/
uxul-world.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Enemies dont go away when hitting you anymore
[uxul-world.git]
/
on-collision.lisp
diff --git
a/on-collision.lisp
b/on-collision.lisp
index
68e284e
..
8647884
100755
(executable)
--- a/
on-collision.lisp
+++ b/
on-collision.lisp
@@
-77,7
+77,11
@@
(setf (autojump moving-rectangle) 5)
(player-hits-enemy moving-rectangle
standing-rectangle
(setf (autojump moving-rectangle) 5)
(player-hits-enemy moving-rectangle
standing-rectangle
- collision))
+ collision)
+ (setf (colliding standing-rectangle) nil)
+ (move-about moving-rectangle (desired-movement collision))
+ (setf (colliding standing-rectangle) t)
+)
(defmethod on-collision
((moving-rectangle player)
(defmethod on-collision
((moving-rectangle player)
@@
-225,4
+229,8
@@
collision)
(enemy-hits-player moving-rectangle
standing-rectangle
collision)
(enemy-hits-player moving-rectangle
standing-rectangle
- collision))
+ collision)
+ (setf (colliding standing-rectangle) nil)
+ (move-about moving-rectangle (desired-movement collision))
+ (setf (colliding standing-rectangle) t)
+)