Added bullet texture and movement; restructured game state

1 files changed, 4 insertions, 4 deletions

diff --git a/Player.hs b/Player.hs
index 5c41841..baf1cbe 100644
--- a/Player.hs
+++ b/Player.hs
@@ -7,12 +7,12 @@ module Player ( Player(..)
 import Data.Fixed
 import Data.Typeable
 
-import Tank
+import Game (Tank(..))
 import GLDriver (SomeEvent)
 
 
 class Player a where
-    playerUpdate :: a -> Tank -> (a, Maybe Micro, Bool, Maybe Micro)
+    playerUpdate :: a -> Tank -> (a, Maybe Micro, Bool, Maybe Micro, Bool)
     handleEvent :: a -> SomeEvent -> a
     
     handleEvent player _ = player
@@ -22,6 +22,6 @@ data SomePlayer = forall a. Player a => SomePlayer a
 
 instance Player SomePlayer where
     playerUpdate (SomePlayer player) tank = 
-        let (p, angle, move, aangle) = playerUpdate player tank
-        in (SomePlayer p, angle, move, aangle)
+        let (p, angle, move, aangle, shoot) = playerUpdate player tank
+        in (SomePlayer p, angle, move, aangle, shoot)
     handleEvent (SomePlayer player) event = SomePlayer $ handleEvent player event