summaryrefslogtreecommitdiffstats
path: root/src/HTanks.hs
diff options
context:
space:
mode:
authorMatthias Schiffer <matthias@gamezock.de>2010-04-14 10:55:22 +0200
committerMatthias Schiffer <matthias@gamezock.de>2010-04-14 10:55:22 +0200
commit5951108c0a47fed6d78e442ae4233d9d34eafe13 (patch)
tree44cbd83564c2529c3fc845ddabbacd27667a9c78 /src/HTanks.hs
parent08762ddc9ac9be5a4a63b1d15b3955ceb27f76b2 (diff)
downloadhtanks-5951108c0a47fed6d78e442ae4233d9d34eafe13.tar
htanks-5951108c0a47fed6d78e442ae4233d9d34eafe13.zip
Added tank textures
Diffstat (limited to 'src/HTanks.hs')
-rw-r--r--src/HTanks.hs6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/HTanks.hs b/src/HTanks.hs
index c9525b9..82338a4 100644
--- a/src/HTanks.hs
+++ b/src/HTanks.hs
@@ -27,7 +27,8 @@ import Data.Obj3D.GL
main :: IO ()
main = do
let theLevel = testLevel
- --hwiidPlayer <- newHWiidPlayer
+ --humanPlayer <- newHWiidPlayer
+ let humanPlayer = DefaultPlayer S.empty 0 0 False
gl <- initGL $ glxDriver (levelWidth theLevel) (levelHeight theLevel)
when (initialized gl) $ do
@@ -36,8 +37,7 @@ 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 humanPlayer
, SomePlayer $ CPUPlayer 0
], textures = M.empty, models = M.empty, gameState = gamestate}