Compare commits
No commits in common. "34039547f942ca93ec7003bfccc3ad4c8ac1ca18" and "a963437069112e0ebf9d8ddd64e76b06ed930365" have entirely different histories.
34039547f9
...
a963437069
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
@ -24,7 +24,7 @@ void UContainerInfo::InitContainerByShape(UShapeAsset* InContainerShape)
|
|||||||
|
|
||||||
bool UContainerInfo::AddContainerItem(FContainerItem Item, int32& ItemID)
|
bool UContainerInfo::AddContainerItem(FContainerItem Item, int32& ItemID)
|
||||||
{
|
{
|
||||||
if (!IsItemInContainerShape(Item))
|
if (IsItemInContainerShape(Item))
|
||||||
{
|
{
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
@ -98,8 +98,8 @@ bool UContainerInfo::IsItemInContainerShape(FContainerItem NewItem)
|
|||||||
{
|
{
|
||||||
for (int y = 0; y < NewItem.GetItemHeight(); y++)
|
for (int y = 0; y < NewItem.GetItemHeight(); y++)
|
||||||
{
|
{
|
||||||
if ( (x + NewItem.ContainerStartPos.X) >= 0 && (x + NewItem.ContainerStartPos.X) < ContainerShape->GetShapeWidth() &&
|
if ( (x + NewItem.ContainerStartPos.X) > 0 && (x + NewItem.ContainerStartPos.X) < ContainerShape->GetShapeWidth() &&
|
||||||
(y + NewItem.ContainerStartPos.Y) >= 0 && (y + NewItem.ContainerStartPos.Y) < ContainerShape->GetShapeHeight()
|
(y + NewItem.ContainerStartPos.Y) > 0 && (y + NewItem.ContainerStartPos.Y) < ContainerShape->GetShapeHeight()
|
||||||
)
|
)
|
||||||
{
|
{
|
||||||
if (!ContainerShape->IsSlotActive(NewItem.ContainerStartPos.X + x, NewItem.ContainerStartPos.Y + y))
|
if (!ContainerShape->IsSlotActive(NewItem.ContainerStartPos.X + x, NewItem.ContainerStartPos.Y + y))
|
||||||
|
|||||||
@ -86,8 +86,8 @@ public:
|
|||||||
break;
|
break;
|
||||||
case EItemDegreeType::TwentySeven:
|
case EItemDegreeType::TwentySeven:
|
||||||
{
|
{
|
||||||
BeforeRotationPos.X= GetItemHeight() - Position.Y - 1;
|
BeforeRotationPos.X = Position.X;
|
||||||
BeforeRotationPos.Y= Position.X;
|
BeforeRotationPos.Y = GetItemHeight() - Position.Y- 1;
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user