- [FIX] Encara que es tinga un item seleccionat, es pot treballar amb els items en pantalla
This commit is contained in:
@@ -105,7 +105,7 @@ editor = {
|
|||||||
editor.modified = true
|
editor.modified = true
|
||||||
end
|
end
|
||||||
if mouse.press(mouse.LEFT) then
|
if mouse.press(mouse.LEFT) then
|
||||||
if editor.item_selected then
|
if not editor.item_hovered and not editor.item_dragged and editor.item_selected then
|
||||||
map.surf(rooms.surf_items)
|
map.surf(rooms.surf_items)
|
||||||
--print(editor.item_selected)
|
--print(editor.item_selected)
|
||||||
map.tile(tx,ty,editor.item_selected)
|
map.tile(tx,ty,editor.item_selected)
|
||||||
@@ -118,7 +118,7 @@ editor = {
|
|||||||
if mouse.press(mouse.RIGHT) then
|
if mouse.press(mouse.RIGHT) then
|
||||||
editor.item_selected = nil
|
editor.item_selected = nil
|
||||||
end
|
end
|
||||||
if editor.item_selected then
|
if not editor.item_hovered and not editor.item_dragged and editor.item_selected then
|
||||||
local k = items[editor.item_selected]
|
local k = items[editor.item_selected]
|
||||||
surf.source(surf_sprites)
|
surf.source(surf_sprites)
|
||||||
draw.surf(k.visual.x, k.visual.y, k.visual.w, k.visual.h, mx, my, k.visual.w, k.visual.h, editor.flip)
|
draw.surf(k.visual.x, k.visual.y, k.visual.w, k.visual.h, mx, my, k.visual.w, k.visual.h, editor.flip)
|
||||||
@@ -161,7 +161,7 @@ editor = {
|
|||||||
|
|
||||||
if editor.layer==LAYER_ITEMS then
|
if editor.layer==LAYER_ITEMS then
|
||||||
if key.press(key.F) then
|
if key.press(key.F) then
|
||||||
if editor.item_selected then
|
if not editor.item_hovered and editor.item_selected then
|
||||||
editor.flip = not editor.flip
|
editor.flip = not editor.flip
|
||||||
elseif editor.item_hovered then
|
elseif editor.item_hovered then
|
||||||
local sprite = sprites.list[editor.item_hovered]
|
local sprite = sprites.list[editor.item_hovered]
|
||||||
|
|||||||
@@ -573,7 +573,7 @@ sprites = {
|
|||||||
|
|
||||||
editor.item_hovered = nil
|
editor.item_hovered = nil
|
||||||
local mx,my = mouse.pos()
|
local mx,my = mouse.pos()
|
||||||
if (app.update == editor.update) and (editor.item_selected or editor.layer~=LAYER_ITEMS) then ignore_selected = true end
|
if (app.update == editor.update) and (editor.layer~=LAYER_ITEMS) then ignore_selected = true end
|
||||||
for i,v in ipairs(sprites.list) do
|
for i,v in ipairs(sprites.list) do
|
||||||
if not ignore_selected and app.update == editor.update and mx>=v.pos.x and mx<=v.pos.x+v.size.w and my>=v.pos.y and my<=v.pos.y+v.size.h then
|
if not ignore_selected and app.update == editor.update and mx>=v.pos.x and mx<=v.pos.x+v.size.w and my>=v.pos.y and my<=v.pos.y+v.size.h then
|
||||||
editor.item_hovered = i
|
editor.item_hovered = i
|
||||||
|
|||||||
Reference in New Issue
Block a user