summaryrefslogtreecommitdiffstats
path: root/src/Game.hs
diff options
context:
space:
mode:
Diffstat (limited to 'src/Game.hs')
-rw-r--r--src/Game.hs17
1 files changed, 2 insertions, 15 deletions
diff --git a/src/Game.hs b/src/Game.hs
index 248287b..651918c 100644
--- a/src/Game.hs
+++ b/src/Game.hs
@@ -1,13 +1,13 @@
{-# LANGUAGE GeneralizedNewtypeDeriving #-}
-module Game ( Tank(..)
- , Bullet(..)
+module Game ( Bullet(..)
, GameState(..)
, Game
, runGame
) where
import Level
+import Tank
import Texture
import Control.Monad
@@ -16,19 +16,6 @@ import Data.Fixed
import qualified Data.Map as M
-data Tank = Tank
- { tankX :: !Micro
- , tankY :: !Micro
- , tankDir :: !Micro
- , tankAim :: !Micro
- , tankSpeed :: !Micro
- , tankTurnspeed :: !Micro
- , tankMoving :: !Bool
- , tankBulletSpeed :: !Micro
- , tankBulletBounces :: !Int
- , tankBulletsLeft :: !Int
- } deriving Show
-
data Bullet = Bullet
{ bulletX :: !Micro
, bulletY :: !Micro