Changeset 26 for trunk/Classes/unit.cpp

Timestamp:

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

Author:

kpoole

Message:

Episode 5

File:

• trunk/Classes/unit.cpp (modified) (5 diffs)

trunk/Classes/unit.cpp

@@ -42 +42 @@
 #define WRN_CONFIG LOG_STREAM(warn, config)
 #define ERR_CONFIG LOG_STREAM(err, config)
+
+extern bool gIsDragging;
 
 namespace {
@@ -1981 +1983 @@
         getUnitTextureAtlasInfo(buf, mods, ellipse_front);
     }
-    //if (ellipse_back != NULL) {
-    if (ellipse_back.mapId != 0) {
-        //disp.drawing_buffer_add(display::LAYER_UNIT_BG, loc,
-        disp.drawing_buffer_add(display::LAYER_UNIT_FIRST, loc,
-            display::tblit(xsrc, ysrc +adjusted_params.y-ellipse_floating, ellipse_back));
-    }
-
-    //if (ellipse_front != NULL) {
-    if (ellipse_front.mapId != 0) {
-        //disp.drawing_buffer_add(display::LAYER_UNIT_FG, loc,
-        disp.drawing_buffer_add(display::LAYER_UNIT_FIRST, loc,
-            display::tblit(xsrc, ysrc +adjusted_params.y-ellipse_floating, ellipse_front));
+    
+//  if (gIsDragging == false)
+    {
+        //if (ellipse_back != NULL) {
+        if (ellipse_back.mapId != 0) {
+            //disp.drawing_buffer_add(display::LAYER_UNIT_BG, loc,
+            disp.drawing_buffer_add(display::LAYER_UNIT_FIRST, loc,
+                                display::tblit(xsrc, ysrc +adjusted_params.y-ellipse_floating, ellipse_back));
+        }
+
+        //if (ellipse_front != NULL) {
+        if (ellipse_front.mapId != 0) {
+            //disp.drawing_buffer_add(display::LAYER_UNIT_FG, loc,
+            disp.drawing_buffer_add(display::LAYER_UNIT_FIRST, loc,
+                                display::tblit(xsrc, ysrc +adjusted_params.y-ellipse_floating, ellipse_front));
+        }
     }
 
@@ -2017 +2023 @@
         }
 
-        if (movement_file)
+        if (movement_file) //&& gIsDragging == false)
         {
             textureAtlasInfo tinfo;
@@ -2058 +2064 @@
                 
             textureAtlasInfo crown;
-            if (getTextureAtlasInfo("misc/leader-crown.png", crown)) 
+            if (/*gIsDragging==false &&*/ getTextureAtlasInfo("misc/leader-crown.png", crown)) 
             {
                 disp.drawing_buffer_add(display::LAYER_UNIT_BAR,
@@ -2065 +2071 @@
         }
 
-        for(std::vector<shared_string>::const_iterator ov = overlays().begin(); ov != overlays().end(); ++ov) {
-            const surface ov_img(image::get_image(*ov, image::SCALED_TO_ZOOM));
-            if(ov_img != NULL) {
-                disp.drawing_buffer_add(display::LAYER_UNIT_BAR,
-                    loc, display::tblit(xsrc, ysrc +adjusted_params.y, ov_img));
+        //if (gIsDragging == false)
+        {
+            for(std::vector<shared_string>::const_iterator ov = overlays().begin(); ov != overlays().end(); ++ov) {
+                const surface ov_img(image::get_image(*ov, image::SCALED_TO_ZOOM));
+                if(ov_img != NULL) {
+                    disp.drawing_buffer_add(display::LAYER_UNIT_BAR,
+                                            loc, display::tblit(xsrc, ysrc +adjusted_params.y, ov_img));
+                }
             }
         }