Renamed shoot to bullet

This commit is contained in:
Matthias Schiffer 2010-03-09 06:08:42 +01:00
parent 7327695ca3
commit 89e87826a8
3 changed files with 36 additions and 36 deletions

View file

@ -1,7 +1,7 @@
{-# LANGUAGE GeneralizedNewtypeDeriving #-}
module Game ( Tank(..)
, Shoot(..)
, Bullet(..)
, GameState(..)
, Game
, runGame
@ -24,24 +24,24 @@ data Tank = Tank
, tankSpeed :: !Micro
, tankTurnspeed :: !Micro
, tankMoving :: !Bool
, tankShootSpeed :: !Micro
, tankShootBounces :: !Int
, tankShootsLeft :: !Int
, tankBulletSpeed :: !Micro
, tankBulletBounces :: !Int
, tankBulletsLeft :: !Int
} deriving Show
data Shoot = Shoot
{ shootX :: !Micro
, shootY :: !Micro
, shootDir :: !Micro
, shootSpeed :: !Micro
, shootBouncesLeft :: !Int
, shootTank :: !Int
data Bullet = Bullet
{ bulletX :: !Micro
, bulletY :: !Micro
, bulletDir :: !Micro
, bulletSpeed :: !Micro
, bulletBouncesLeft :: !Int
, bulletTank :: !Int
} deriving Show
data GameState = GameState
{ level :: !Level
, tanks :: ![Tank]
, shoots :: ![Shoot]
, bullets :: ![Bullet]
, textures :: !(M.Map Texture TextureObject)
} deriving (Show)