#1513: fixed tile cursor in the map editor

Author: nesbox

src/studio/editors/map.c

@@ -1051,35 +1051,34 @@ static void drawMapReg(Map* map)
     tic_mem* tic = map->tic;
     tic_rect rect = {MAP_X, MAP_Y, MAP_WIDTH, MAP_HEIGHT};
 
-    if(!sheetVisible(map) && checkMousePos(&rect))
-    {
-        if(tic_api_key(tic, tic_key_space))
-        {
-            processScrolling(map, checkMouseDown(&rect, tic_mouse_left) || checkMouseDown(&rect, tic_mouse_right));
-        }
-        else
-        {
-            static void(*const Handlers[])(Map*) = {processMouseDrawMode, processMouseDragMode, processMouseSelectMode, processMouseFillMode};
+    bool handle = !sheetVisible(map) && checkMousePos(&rect);
+    bool space = tic_api_key(tic, tic_key_space);
 
-            Handlers[map->mode](map);
+    if(handle)
+        processScrolling(map, 
+            ((space || map->mode == MAP_DRAG_MODE) && checkMouseDown(&rect, tic_mouse_left)) || 
+                checkMouseDown(&rect, tic_mouse_right));
 
-            if(map->mode != MAP_DRAG_MODE)
-                processScrolling(map, checkMouseDown(&rect, tic_mouse_right));
-        }
-    }
+    {
+        s32 scrollX = map->scroll.x % TIC_SPRITESIZE;
+        s32 scrollY = map->scroll.y % TIC_SPRITESIZE;
 
-    s32 scrollX = map->scroll.x % TIC_SPRITESIZE;
-    s32 scrollY = map->scroll.y % TIC_SPRITESIZE;
+        map2ram(&tic->ram, map->src);
 
-    map2ram(&tic->ram, map->src);
+        initBlitMode(map);
+        tic_api_map(tic, map->scroll.x / TIC_SPRITESIZE, map->scroll.y / TIC_SPRITESIZE,
+            TIC_MAP_SCREEN_WIDTH + 1, TIC_MAP_SCREEN_HEIGHT + 1, -scrollX, -scrollY, 0, 0, 1, NULL, NULL);
+        resetBlitMode(map->tic);
 
-    initBlitMode(map);
-    tic_api_map(tic, map->scroll.x / TIC_SPRITESIZE, map->scroll.y / TIC_SPRITESIZE,
-        TIC_MAP_SCREEN_WIDTH + 1, TIC_MAP_SCREEN_HEIGHT + 1, -scrollX, -scrollY, 0, 0, 1, NULL, NULL);
-    resetBlitMode(map->tic);
+        if (map->canvas.grid || map->scroll.active)
+            drawGrid(map);        
+    }
 
-    if(map->canvas.grid || map->scroll.active)
-        drawGrid(map);
+    if(handle && !space)
+    {
+        static void(*const Handlers[])(Map*) = {processMouseDrawMode, processMouseDragMode, processMouseSelectMode, processMouseFillMode};
+        Handlers[map->mode](map);
+    }
 }
 
 static void undo(Map* map)
@@ -1283,8 +1282,8 @@ static void overline(tic_mem* tic, void* data)
 
     {
         tic_rect rect = {MAP_X, MAP_Y, MAP_WIDTH, MAP_HEIGHT};
-        if(!sheetVisible(map) && checkMousePos(&rect))
-        {
+        if(!sheetVisible(map) && checkMousePos(&rect) && !tic_api_key(tic, tic_key_space))
+        {            
             switch(map->mode)
             {
             case MAP_DRAW_MODE: