reenable minimap

git-svn-id: http://svn.net-core.org/repos/t-engine4@872 51575b47-30f0-44d4-a5cc-537603b46e54

game/modules/tome/class/Game.lua

@@ -218,8 +218,8 @@ function _M:setupDisplayMode()
 	self:saveSettings("tome.gfxmode", ("tome.gfxmode = %d\n"):format(self.gfxmode))
 
 	-- Create the framebuffer
-	self.fbo = core.display.newFBO(Map.viewport.width, Map.viewport.height)
-	if self.fbo then self.fbo_shader = Shader.new("main_fbo") end
+--	self.fbo = core.display.newFBO(Map.viewport.width, Map.viewport.height)
+--	if self.fbo then self.fbo_shader = Shader.new("main_fbo") end
 end
 
 function _M:setupMiniMap()

game/modules/tome/data/gfx/shaders/main_fbo.frag

@@ -38,7 +38,7 @@ void main(void)
 
 	if (hp_warning > 0.0)
 	{
-		vec4 hp_warning_color = vec4(hp_warning / 1.5, 0.0, 0.0, hp_warning / 1.5);
+		vec4 hp_warning_color = vec4(hp_warning / 1.9, 0.0, 0.0, hp_warning / 1.5);
 		float dist = length(gl_TexCoord[0].xy - vec2(0.5)) / 2.0;
 		gl_FragColor = mix(gl_FragColor, hp_warning_color, dist);
 	}

src/map.c

@@ -482,8 +482,6 @@ static int map_to_screen(lua_State *L)
 
 static int minimap_to_screen(lua_State *L)
 {
-	return 0;
-#if 0
 	map_type *map = (map_type*)auxiliar_checkclass(L, "core{map}", 1);
 	int x = luaL_checknumber(L, 2);
 	int y = luaL_checknumber(L, 3);
@@ -630,7 +628,6 @@ static int minimap_to_screen(lua_State *L)
 	// Restore normal display
 	glColor4f(1, 1, 1, 1);
 	return 0;
-#endif
 }
 
 static const struct luaL_reg maplib[] =