From 08762ddc9ac9be5a4a63b1d15b3955ceb27f76b2 Mon Sep 17 00:00:00 2001 From: Matthias Schiffer Date: Mon, 12 Apr 2010 16:17:41 +0200 Subject: Simplified texture and model loading; also use crosshair for DefaultPlayer --- src/HTanks.hs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/HTanks.hs') diff --git a/src/HTanks.hs b/src/HTanks.hs index f1e0e98..c9525b9 100644 --- a/src/HTanks.hs +++ b/src/HTanks.hs @@ -27,7 +27,7 @@ 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,8 +36,8 @@ 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, models = M.empty, gameState = gamestate} -- cgit v1.2.3