From 517f2eb0b6190d30e4a29f666a6daea00613c39a Mon Sep 17 00:00:00 2001
From: Stefan Dresselhaus <sdressel@techfak.uni-bielefeld.de>
Date: Fri, 28 Feb 2014 14:44:58 +0100
Subject: [PATCH] removed SDL-ttf as it breaks for now

---
 Pioneers.cabal | 3 +--
 src/Main.hs    | 7 -------
 src/Types.hs   | 3 +--
 3 files changed, 2 insertions(+), 11 deletions(-)

diff --git a/Pioneers.cabal b/Pioneers.cabal
index f49b250..2a39666 100644
--- a/Pioneers.cabal
+++ b/Pioneers.cabal
@@ -31,6 +31,5 @@ executable Pioneers
                    linear >=1.3.1 && <1.4,
                    lens >=3.10.1 && <3.11,
                    SDL2 >= 0.1.0,
-                   time >=1.4.0 && <1.5,
-                   SDL2-ttf >=0.1.0 && <0.2
+                   time >=1.4.0 && <1.5
 
diff --git a/src/Main.hs b/src/Main.hs
index 3a26626..142b6cf 100644
--- a/src/Main.hs
+++ b/src/Main.hs
@@ -25,8 +25,6 @@ import           Linear                               as L
 
 -- GUI
 import           Graphics.UI.SDL                      as SDL
-import           Graphics.UI.SDL.TTF                  as TTF
-import           Graphics.UI.SDL.TTF.Types
 
 -- Render
 import qualified Graphics.Rendering.OpenGL.GL         as GL
@@ -58,7 +56,6 @@ main = do
                                                                              ,WindowInputGrabbed-- never let go of input (KB/Mouse)
                                                                              ] $ \window -> do
         withOpenGL window $ do
-        TTF.withInit $ do
         (Size fbWidth fbHeight) <- glGetDrawableSize window
         initRendering
         --generate map vertices
@@ -69,9 +66,6 @@ main = do
         putStrLn "foo"
         now <- getCurrentTime
         putStrLn "foo"
-        font <- TTF.openFont "fonts/ttf-04B_03B_/04B_03B_.TTF" 10
-        TTF.setFontStyle font TTFNormal
-        TTF.setFontHinting font TTFHNormal
 
         let zDistClosest  = 1
             zDistFarthest = zDistClosest + 30
@@ -92,7 +86,6 @@ main = do
               , envWindow        = window
               , envZDistClosest  = zDistClosest
               , envZDistFarthest = zDistFarthest
-              , envFont          = font
               }
             state = State
               { stateWindowWidth     = fbWidth
diff --git a/src/Types.hs b/src/Types.hs
index c896bba..f60cdda 100644
--- a/src/Types.hs
+++ b/src/Types.hs
@@ -7,7 +7,6 @@ import           Foreign.C                            (CFloat)
 import           Data.Time                            (UTCTime)
 import Linear.Matrix (M44)
 import Control.Monad.RWS.Strict (RWST)
-import Graphics.UI.SDL.TTF.Types as TTF
 
 
 
@@ -26,7 +25,7 @@ data Env = Env
     , envZDistClosest  :: !Double
     , envZDistFarthest :: !Double
     --, envGLContext     :: !GLContext
-    , envFont          :: TTF.TTFFont
+    --, envFont          :: TTF.TTFFont
     }
 
 --Mutable State