games/vcmi
1
0 Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2026-06-19 22:57:37 +02:00
Code Issues Releases Activity

Merge pull request #1277 from Nordsoft91/editor-cutcopypaste

Browse Source
This commit is contained in:
Nordsoft91 authored and GitHub committed 2022-12-27 17:28:39 +04:00
2 parents 37003cd0e6 e6f459cbe4
commit 37d1e1e748
9 files changed
+105 -13
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

mapeditor/scenelayer.cpp
+4 -4
View File
@@ -410,7 +410,7 @@ void SelectionObjectsLayer::draw()
redraw();
}
CGObjectInstance * SelectionObjectsLayer::selectObjectAt(int x, int y) const
CGObjectInstance * SelectionObjectsLayer::selectObjectAt(int x, int y, const CGObjectInstance * ignore) const
{
if(!map || !map->isInTheMap(int3(x, y, scene->level)))
return nullptr;
@@ -420,7 +420,7 @@ CGObjectInstance * SelectionObjectsLayer::selectObjectAt(int x, int y) const
//visitable is most important
for(auto & object : objects)
{
if(!object.obj)
if(!object.obj || object.obj == ignore)
continue;
if(object.obj->visitableAt(x, y))
@@ -432,7 +432,7 @@ CGObjectInstance * SelectionObjectsLayer::selectObjectAt(int x, int y) const
//if not visitable tile - try to get blocked
for(auto & object : objects)
{
if(!object.obj)
if(!object.obj || object.obj == ignore)
continue;
if(object.obj->blockingAt(x, y))
@@ -444,7 +444,7 @@ CGObjectInstance * SelectionObjectsLayer::selectObjectAt(int x, int y) const
//finally, we can take any object
for(auto & object : objects)
{
if(!object.obj)
if(!object.obj || object.obj == ignore)
continue;
if(object.obj->coveringAt(x, y))