Changeset 26 for trunk/Classes/mouse_handler_base.cpp

Timestamp:

2010-05-28 07:39:52 (2 years ago)

Author:

kpoole

Message:

Episode 5

File:

• trunk/Classes/mouse_handler_base.cpp (modified) (6 diffs)

trunk/Classes/mouse_handler_base.cpp

@@ -19 +19 @@
 #include "log.hpp"
 #include "preferences.hpp"
+
+extern bool gMegamap;
+extern bool gRedraw;
+extern bool gIsDragging;
 
 
@@ -81 +85 @@
         return true;
     }
-
+/*
     if(minimap_scrolling_) {
         //if the game is run in a window, we could miss a LMB/MMB up event
@@ -101 +105 @@
         if(minimap_scrolling_) return true;
     }
+*/ 
 
     // Fire the drag & drop only after minimal drag distance
@@ -132 +137 @@
         dragged_y_ = dy;
         didDrag_ = true;
+        gIsDragging = true;
         // KP: fixes #5
         unsigned long curTime = SDL_GetTicks();
@@ -168 +174 @@
         if (event.state == SDL_PRESSED) {
             cancel_dragging();
-            init_dragging(dragging_left_);
+            if (event.x < gui().map_area().w)
+                init_dragging(dragging_left_);
             left_click(event.x, event.y, browse);
         } else if (event.state == SDL_RELEASED) {
@@ -261 +268 @@
 {
     // clicked on a hex on the minimap? then initiate minimap scrolling
-    const map_location& loc = gui().minimap_location_on(x, y);
-    minimap_scrolling_ = false;
-    if(loc.valid()) {
-        minimap_scrolling_ = true;
-        last_hex_ = loc;
-        gui().scroll_to_tile(loc,display::WARP, false);
-        return true;
-    }
-    return false;
+    if (gMegamap == true)
+    {
+        const map_location& loc = gui().megamap_location_on(x, y);
+        if(loc.valid()) {
+            minimap_scrolling_ = true;
+            last_hex_ = loc;
+            gui().scroll_to_tile(loc, display::WARP, false);
+            gMegamap = false;
+            gRedraw = true;
+            cancel_dragging();
+            dragged_x_ = 0;
+            dragged_y_ = 0;
+            didDrag_ = false;
+            gIsDragging = false;
+            drag_start_time_ = 0;
+            scroll_velocity_x_ = 0;
+            scroll_velocity_y_ = 0;
+            drag_last_xVelocity_ = 0;
+            drag_last_yVelocity_ = 0;
+            minimap_scrolling_ = false;
+            return true;
+        }       
+        return false;
+    }
+    else
+    {
+        const map_location& loc = gui().minimap_location_on(x, y);
+        minimap_scrolling_ = false;
+        if(loc.valid()) {
+#ifdef __IPAD__         
+            minimap_scrolling_ = true;
+            last_hex_ = loc;
+            gui().scroll_to_tile(loc,display::WARP, false);
+#else
+            // KP: now, a click on the minimap causes the megamap to popup
+            gMegamap = true;
+#endif
+            return true;
+        }
+                
+        return false;
+    }
 }