diff options
author | Matthias Schiffer <matthias@gamezock.de> | 2010-04-12 16:17:41 +0200 |
---|---|---|
committer | Matthias Schiffer <matthias@gamezock.de> | 2010-04-12 16:17:41 +0200 |
commit | 08762ddc9ac9be5a4a63b1d15b3955ceb27f76b2 (patch) | |
tree | bb4f2f36cd4fc5c230744d44bdd40aa3e4badaa8 /src/HTanks.hs | |
parent | dafe16f191f99dc1199a5b386fad916a78c5c4f1 (diff) | |
download | htanks-08762ddc9ac9be5a4a63b1d15b3955ceb27f76b2.tar htanks-08762ddc9ac9be5a4a63b1d15b3955ceb27f76b2.zip |
Simplified texture and model loading; also use crosshair for DefaultPlayer
Diffstat (limited to 'src/HTanks.hs')
-rw-r--r-- | src/HTanks.hs | 6 |
1 files changed, 3 insertions, 3 deletions
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} |