Changeset 20641 for lang/haskell/nario/Main.hs

Timestamp:

10/03/08 23:41:05 (3 months ago)

Author:

mokehehe

Message:

ブロックを叩いたときのアニメをマシにした

Files:

• lang/haskell/nario/Main.hs (modified) (4 diffs)

lang/haskell/nario/Main.hs

@@ -75 +75 @@
                 _               -> checkSDLEvent
 
-----
-data ObjWrapper = forall a. Actor a => ObjWrapper a     -- 存在型aの動く範囲を型クラスDuckに制限
-
-updateActors :: [ObjWrapper] -> [(ObjWrapper, [Event])]
-updateActors = map (\(ObjWrapper x) -> let (x', ev') = update x in (ObjWrapper x', ev'))
-
-renderActors :: ImageResource -> Int -> Surface -> [ObjWrapper] -> IO ()
-renderActors imgres ofsx sur = mapM_ (\(ObjWrapper x) -> render x imgres ofsx sur)
-
 
 -- 状態
@@ -144 +135 @@
                                 (pl', ev) = updatePlayer kp (fld gs) (pl gs)
                                 actors_updates = updateActors (actors gs)
-                                actors' = map fst actors_updates
+                                actors' = filterActors $ map fst actors_updates
                                 ev' = concatMap snd actors_updates
 
@@ -159 +150 @@
 procEvent gs ev = foldl f gs ev
         where
-                f gs (EvHitBlock imgtype cx cy) = gs { fld = fld', actors = actors' }
-                        where
+                f gs (EvHitBlock imgtype cx cy)
+                        | hardBlock c   = gs
+                        | otherwise             = gs { fld = fld', actors = actors' }
+                        where
+                                c = fieldRef (fld gs) cx cy
+                                actors' = actors gs ++ [ObjWrapper $ newAnimBlock cx cy $ fieldRef (fld gs) cx cy]
                                 fld' = fieldSet (fld gs) cx cy '*'
-                                actors' = (ObjWrapper $ newAnimBlock cx cy) : actors gs
                 f gs (EvSetField cx cy c) = gs { fld = fld' }
                         where
@@ -189 +183 @@
 renderInfo :: GameGame -> ImageResource -> Scr
 renderInfo gs imgres sur = do
-        puts 3 1 "MARIO"
+        puts 3 1 "NARIO"
         puts 3 2 $ deciWide 6 '0' $ getPlayerScore (pl gs)
         puts 11 2 ("?*" ++ deciWide 2 '0' (getPlayerMedal (pl gs)))