Changeset 20244 for lang/haskell

Timestamp:

09/30/08 08:02:25 (7 weeks ago)

Author:

mokehehe

Message:

落下チェックで床を２点見るように

Location:

lang/haskell/nario

Files:

• Event.hs (modified) (1 diff)
• Field.hs (modified) (1 diff)
• Player.hs (modified) (1 diff)

lang/haskell/nario/Event.hs

@@ -3 +3 @@
 
 import Const
+import Field
 
 data Event =
                 EvHitBlock ImageType Int Int
-        |       EvSetField Int Int Char
+        |       EvSetField Int Int Cell

lang/haskell/nario/Field.hs

@@ -8 +8 @@
 module Field (
         Field,
+        Cell,
         loadField,
         fieldRef,

lang/haskell/nario/Player.hs

@@ -147 +147 @@
         | otherwise     = player { stand = stand' }
         where
-                stand' = isGround $ y player
+                stand'
+                        | vy player >= 0        = isGround (-6) || isGround 5
+                        | otherwise                     = stand player
                 ystand = (cellCrd $ y player) * (chrSize * one)
 
-                isGround y = isBlock $ fieldRef fld (cellCrd $ x player) (cellCrd y)
+                isGround ofsx = isBlock $ fieldRef fld (cellCrd $ x player + ofsx * one) (cellCrd (y player))
 
 -- 上をチェック