Fixed bug with blitting transparent textures

Also moved player in front of checkpoint

2 files changed, 4 insertions, 2 deletions

@@ -9,5 +9,6 @@ uniform float alpha;
 
 void main()
 {
-  color = vec4(texture(srctex, UV).rgb, alpha);
+  vec4 texmex = texture(srctex, UV);
+  color = vec4(texmex.rgb, alpha * texmex.a);
 }
@@ -118,7 +118,6 @@ void Game::loadMap(const Map& map)
   
   nextEntities.clear();
   nextEntities.push_back(mapEn);
-  nextEntities.push_back(player);
   
   // this is cheating but is just for testing
   if (&map == &m2)
@@ -143,6 +142,8 @@ void Game::loadMap(const Map& map)
     nextEntities.push_back(saveEn);
   }
   
+  nextEntities.push_back(player);
+  
   newWorld = true;
 }