Ok, no more white spaces under stuff.

src/main/scala/Game.scala

@@ -66,7 +66,7 @@ object Main {
   val finalShader = new Shader("minimal", "final")
 
   var curLevel : Level = null
-  var currentLevelNum = 1
+  var currentLevelNum = 2
 
   def main(args:Array[String]) = {
     var fullscreen = false

src/main/scala/Level.scala

@@ -36,11 +36,11 @@ class LevelModel(val name: String)
       0x00ff00->2,
       0x00ffff->3,
       0xff0000->4,
-      0xff00ff->5,
-      0xffff00->6,
+      //0xff00ff->5,
+      //0xffff00->6,
       0xffffff->7,
-      0x202020->8, //Crystal
-      0x000050->9  //Block
+      0x202020->5,//8, //Crystal
+      0x000050->6//9  //Block
     )
   )
 
@@ -60,9 +60,9 @@ class LevelModel(val name: String)
     // Special case colors. Create new entities and append to list.
     if (color == 0) {
 
-    } else if (color == 8) {
+    } else if (color == 5) {
       newEntities = (new Crystal(x, y, height)) :: newEntities
-    } else if (color == 9) {
+    } else if (color == 6) {
       newEntities = (new Block(x, y, height)) :: newEntities
     }
   }

src/main/scala/Protagonist.scala

@@ -18,7 +18,9 @@ class Ghost() extends VBOModelEntity {
   x = 1.0f
   y = 0.0f
   z = 0.0f
-  val model = new SquareModel(x, y, z)//, List(100, 0, 0))
+
+  //1.05f instead of 1.00f is an awesome hack that stops z-fighting when the ghost is in a wall.
+  val model = new SkyModel(x, y, z, 1.05f, "/textures/ghost.png", 1.0f)
 
   def setPosition(newx: Float, newy: Float, newz: Float) = {
     x = newx
@@ -103,7 +105,7 @@ class Protagonist(val ghost: Ghost) extends VBOModelEntity {
   def hasWon(m: EntityManager) = {
     val lv:Level = m.entities.filter(_.traits.contains("level")).head.asInstanceOf[Level]
 
-    lv.model.texMap.valueAt(x.asInstanceOf[Int], y.asInstanceOf[Int]) == 7
+    lv.model.texMap.valueAt(x.asInstanceOf[Int], y.asInstanceOf[Int]) == 7 && (z <= m.height(x, y, this))
   }
 
   def moveGhost(m: EntityManager, lv: Level) = {