From ea0d5f3d81012e0345baf45bf9b590a760841bb7 Mon Sep 17 00:00:00 2001
From: Eduardo Bart <edub4rt@gmail.com>
Date: Thu, 7 Feb 2013 03:56:02 -0200
Subject: [PATCH] Fix compile error for OpenGL ES

---
 modules/game_minimap/minimap.lua    | 15 ++++++++++++---
 src/framework/graphics/graphics.cpp |  4 ++--
 src/framework/graphics/painter.cpp  |  9 +--------
 src/framework/graphics/painter.h    |  4 ++--
 4 files changed, 17 insertions(+), 15 deletions(-)

diff --git a/modules/game_minimap/minimap.lua b/modules/game_minimap/minimap.lua
index 4a32570f..6e61d68a 100644
--- a/modules/game_minimap/minimap.lua
+++ b/modules/game_minimap/minimap.lua
@@ -2,6 +2,7 @@ minimapWidget = nil
 minimapButton = nil
 minimapWindow = nil
 otmm = true
+preloaded = false
 
 function init()
   minimapButton = modules.client_topmenu.addRightGameToggleButton('minimapButton', tr('Minimap') .. ' (Ctrl+M)', '/images/topbuttons/minimap', toggle)
@@ -66,8 +67,13 @@ function onMiniWindowClose()
   minimapButton:setOn(false)
 end
 
+function preload()
+  loadMap(false)
+  preloaded = true
+end
+
 function online()
-  loadMap()
+  loadMap(not preloaded)
   minimapWidget:followLocalPlayer()
 end
 
@@ -75,9 +81,12 @@ function offline()
   saveMap()
 end
 
-function loadMap()
+function loadMap(clean)
   local protocolVersion = g_game.getProtocolVersion()
-  g_minimap.clean()
+
+  if clean then
+    g_minimap.clean()
+  end
 
   if otmm then
     local minimapFile = '/minimap.otmm'
diff --git a/src/framework/graphics/graphics.cpp b/src/framework/graphics/graphics.cpp
index 260cab17..1d98c616 100644
--- a/src/framework/graphics/graphics.cpp
+++ b/src/framework/graphics/graphics.cpp
@@ -360,9 +360,9 @@ bool Graphics::canUseBlendFuncSeparate()
 bool Graphics::canUseBlendEquation()
 {
 #if OPENGL_ES==2
-    return true;
+    return false;
 #elif OPENGL_ES==1
-    return true;
+    return false;
 #else
     if(!GLEW_VERSION_1_4)
         return false;
diff --git a/src/framework/graphics/painter.cpp b/src/framework/graphics/painter.cpp
index 2b62ff31..91a7f211 100644
--- a/src/framework/graphics/painter.cpp
+++ b/src/framework/graphics/painter.cpp
@@ -289,14 +289,7 @@ void Painter::updateGlBlendEquation()
 {
     if(!g_graphics.canUseBlendEquation())
         return;
-    switch(m_blendEquation) {
-        case BlendEquation_Max:
-            glBlendEquation(GL_MAX);
-            break;
-        case BlendEquation_Add:
-            glBlendEquation(GL_FUNC_ADD);
-            break;
-    }
+    glBlendEquation(m_blendEquation);
 }
 
 void Painter::updateGlClipRect()
diff --git a/src/framework/graphics/painter.h b/src/framework/graphics/painter.h
index cd48c40c..37fcd006 100644
--- a/src/framework/graphics/painter.h
+++ b/src/framework/graphics/painter.h
@@ -44,8 +44,8 @@ public:
         TriangleStrip = GL_TRIANGLE_STRIP
     };
     enum BlendEquation {
-        BlendEquation_Add,
-        BlendEquation_Max,
+        BlendEquation_Add = 0x8006, // GL_FUNC_ADD
+        BlendEquation_Max = 0x8008, // GL_MAX
     };
 
     struct PainterState {