diff options
Diffstat (limited to 'src/HTanks.hs')
| -rw-r--r-- | src/HTanks.hs | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/HTanks.hs b/src/HTanks.hs index 5a8bdec..c9525b9 100644 --- a/src/HTanks.hs +++ b/src/HTanks.hs @@ -14,20 +14,20 @@ import Tank import GLDriver import GLX -import Control.Concurrent (threadDelay) import Control.Monad.State import Data.Maybe import qualified Data.Map as M import qualified Data.Set as S import Data.Time -import Foreign.C.Types +import Data.Obj3D +import Data.Obj3D.GL main :: IO () main = do let theLevel = testLevel - hwiidPlayer <- newHWiidPlayer + --hwiidPlayer <- newHWiidPlayer gl <- initGL $ glxDriver (levelWidth theLevel) (levelHeight theLevel) when (initialized gl) $ do @@ -36,10 +36,10 @@ main = do , Tank 5.0 3.5 0 0 1.5 270 False 3 1 5 1 ], bullets = []} mainstate = MainState {run = True, driver = SomeDriver gl, time = currentTime, players = - [ --SomePlayer $ DefaultPlayer S.empty 0 0 False - SomePlayer $ hwiidPlayer + [ SomePlayer $ DefaultPlayer S.empty 0 0 False + --SomePlayer $ hwiidPlayer , SomePlayer $ CPUPlayer 0 - ], textures = M.empty, gameState = gamestate} + ], textures = M.empty, models = M.empty, gameState = gamestate} runMain mainstate $ do setup |