fix monsters unable to attack selected hero

I misuderstood how the action monad "abort" propagates through nested actions.
AllureOfTheStars · Feb 4, 2011 · 790861c · 790861c
1 parent 4f4fa31
commit 790861c
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/src/Actions.hs b/src/Actions.hs
@@ -328,9 +328,9 @@ swapCurrentHero (ni, np) =
     player <- gets splayer
     let i = heroNumber player
         upd hs = IM.insert i player $ IM.delete ni hs
-    when (ni == i) abort
-    modify (updateLevel (updateHeroes upd))
-    modify (updatePlayer (const np))
+    when (ni /= i) (do
+                      modify (updateLevel (updateHeroes upd))
+                      modify (updatePlayer (const np)))
 
 -- | Calculate loot's worth. TODO: move to another module, and refine significantly. TODO: calculate for all heroes on the current level.
 calculateTotal :: Hero -> Int