summaryrefslogtreecommitdiffstats
path: root/src/Game.hs
diff options
context:
space:
mode:
authorMatthias Schiffer <matthias@gamezock.de>2010-03-09 06:08:42 +0100
committerMatthias Schiffer <matthias@gamezock.de>2010-03-09 06:08:42 +0100
commit89e87826a8b5874cee1ce370315e0af4b9297000 (patch)
tree7dc300a4b99cb35a09f7a9e81268c0d612a347a3 /src/Game.hs
parent7327695ca3d9aee5da1d0bc98572d877dd8c8546 (diff)
downloadhtanks-89e87826a8b5874cee1ce370315e0af4b9297000.tar
htanks-89e87826a8b5874cee1ce370315e0af4b9297000.zip
Renamed shoot to bullet
Diffstat (limited to 'src/Game.hs')
-rw-r--r--src/Game.hs24
1 files changed, 12 insertions, 12 deletions
diff --git a/src/Game.hs b/src/Game.hs
index b31009e..9aef422 100644
--- a/src/Game.hs
+++ b/src/Game.hs
@@ -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)