branch: elpa/pacmacs
commit 9527a965e14e123a425e6a80b3e9a10479a28139
Merge: 86d701a167 22dd5e5cf9
Author: rexim <[email protected]>
Commit: rexim <[email protected]>
Merge branch 'switch-game-state-in-logic-functions-97'. Close #97
---
pacmacs.el | 16 +++++++---------
1 file changed, 7 insertions(+), 9 deletions(-)
diff --git a/pacmacs.el b/pacmacs.el
index 61eb8c3827..0df6d55e47 100644
--- a/pacmacs.el
+++ b/pacmacs.el
@@ -326,12 +326,11 @@
(= column p-column))))
pacmacs-pills)))))
-(defun pacmacs--detect-ghost-collision ()
+(defun pacmacs--ghost-collision-p ()
(plist-bind ((row :row)
(column :column))
pacmacs-player-state
- (-when-let (ghost (pacmacs--ghost-at-p row column))
- (pacmacs--switch-to-death-state))))
+ (pacmacs--ghost-at-p row column)))
(defun pacmacs-play-state-logic ()
(pacmacs-anim-object-next-frame pacmacs-player-state
pacmacs-tick-duration-ms)
@@ -341,15 +340,14 @@
(pacmacs-anim-object-next-frame pill pacmacs-tick-duration-ms))
(pacmacs--recalc-track-board)
- (pacmacs--detect-ghost-collision)
- (when (equal pacmacs-game-state 'play)
+ (if (pacmacs--ghost-collision-p)
+ (pacmacs--switch-to-death-state)
(pacmacs-step-object pacmacs-player-state)
(pacmacs--detect-pill-collision)
(if pacmacs-pills
- (progn
- (pacmacs--detect-ghost-collision)
- (when (equal pacmacs-game-state 'play)
- (pacmacs--step-ghosts)))
+ (if (pacmacs--ghost-collision-p)
+ (pacmacs--switch-to-death-state)
+ (pacmacs--step-ghosts))
(pacmacs--load-next-level)
(pacmacs--switch-to-prepare-state))))
