36_Urho2DTileMap: Fix invisible cursor - Revert https://github.com/urho3d/Urho3D/commit/ef6284c9387d000b695080a5dc86f32586e0031b (#2749)

Source/Samples/36_Urho2DTileMap/Urho2DTileMap.cpp

@@ -68,7 +68,7 @@ void Urho2DTileMap::Start()
     SubscribeToEvents();
 
     // Set the mouse mode to use in the sample
-    Sample::InitMouseMode(MM_RELATIVE);
+    Sample::InitMouseMode(MM_FREE);
 }
 
 void Urho2DTileMap::CreateScene()
@@ -213,9 +213,13 @@ void Urho2DTileMap::HandleMouseButtonDown(StringHash eventType, VariantMap& even
             // Swap grass and water
             if (layer->GetTile(x, y)->GetGid() < 9) // First 8 sprites in the "isometric_grass_and_water.png" tileset are mostly grass and from 9 to 24 they are mostly water
                 sprite->SetSprite(layer->GetTile(0, 0)->GetSprite()); // Replace grass by water sprite used in top tile
-            else sprite->SetSprite(layer->GetTile(24, 24)->GetSprite()); // Replace water by grass sprite used in bottom tile
+            else
+                sprite->SetSprite(layer->GetTile(24, 24)->GetSprite()); // Replace water by grass sprite used in bottom tile
+        }
+        else
+        {
+            sprite->SetSprite(nullptr); // 'Remove' sprite
         }
-        else sprite->SetSprite(nullptr); // 'Remove' sprite
     }
 }
 

bin/Data/LuaScripts/36_Urho2DTileMap.lua

@@ -24,7 +24,7 @@ function Start()
     SetupViewport()
 
     -- Set the mouse mode to use in the sample
-    SampleInitMouseMode(MM_RELATIVE)
+    SampleInitMouseMode(MM_FREE)
 
     -- Hook up to the frame update events
     SubscribeToEvents()
@@ -159,8 +159,12 @@ function HandleMouseButtonDown(eventType, eventData)
             -- Swap grass and water
             if layer:GetTile(x, y).gid < 9 then -- First 8 sprites in the "isometric_grass_and_water.png" tileset are mostly grass and from 9 to 24 they are mostly water
                 sprite.sprite = layer:GetTile(0, 0).sprite -- Replace grass by water sprite used in top tile
-            else sprite.sprite = layer:GetTile(24, 24).sprite end -- Replace water by grass sprite used in bottom tile
-        else sprite.sprite = nil end -- 'Remove' sprite
+            else
+                sprite.sprite = layer:GetTile(24, 24).sprite -- Replace water by grass sprite used in bottom tile
+            end
+        else
+            sprite.sprite = nil -- 'Remove' sprite
+        end
     end
 end
 

bin/Data/Scripts/36_Urho2DTileMap.as

@@ -25,7 +25,7 @@ void Start()
     SetupViewport();
 
     // Set the mouse mode to use in the sample
-    SampleInitMouseMode(MM_RELATIVE);
+    SampleInitMouseMode(MM_FREE);
 
     // Hook up to the frame update events
     SubscribeToEvents();
@@ -166,9 +166,13 @@ void HandleMouseButtonDown(StringHash eventType, VariantMap& eventData)
             // Swap grass and water
             if (layer.GetTile(x, y).gid < 9) // First 8 sprites in the "isometric_grass_and_water.png" tileset are mostly grass and from 9 to 24 they are mostly water
                 sprite.sprite = layer.GetTile(0, 0).sprite; // Replace grass by water sprite used in top tile
-            else sprite.sprite = layer.GetTile(24, 24).sprite; // Replace water by grass sprite used in bottom tile
+            else
+                sprite.sprite = layer.GetTile(24, 24).sprite; // Replace water by grass sprite used in bottom tile
+        }
+        else
+        {
+            sprite.sprite = null; // 'Remove' sprite
         }
-        else sprite.sprite = null; // 'Remove' sprite
     }
 }