Compare commits

..

No commits in common. "34039547f942ca93ec7003bfccc3ad4c8ac1ca18" and "a963437069112e0ebf9d8ddd64e76b06ed930365" have entirely different histories.

8 changed files with 5 additions and 5 deletions

Binary file not shown.

View File

@ -24,7 +24,7 @@ void UContainerInfo::InitContainerByShape(UShapeAsset* InContainerShape)
bool UContainerInfo::AddContainerItem(FContainerItem Item, int32& ItemID)
{
if (!IsItemInContainerShape(Item))
if (IsItemInContainerShape(Item))
{
return false;
}
@ -98,8 +98,8 @@ bool UContainerInfo::IsItemInContainerShape(FContainerItem NewItem)
{
for (int y = 0; y < NewItem.GetItemHeight(); y++)
{
if ( (x + NewItem.ContainerStartPos.X) >= 0 && (x + NewItem.ContainerStartPos.X) < ContainerShape->GetShapeWidth() &&
(y + NewItem.ContainerStartPos.Y) >= 0 && (y + NewItem.ContainerStartPos.Y) < ContainerShape->GetShapeHeight()
if ( (x + NewItem.ContainerStartPos.X) > 0 && (x + NewItem.ContainerStartPos.X) < ContainerShape->GetShapeWidth() &&
(y + NewItem.ContainerStartPos.Y) > 0 && (y + NewItem.ContainerStartPos.Y) < ContainerShape->GetShapeHeight()
)
{
if (!ContainerShape->IsSlotActive(NewItem.ContainerStartPos.X + x, NewItem.ContainerStartPos.Y + y))

View File

@ -86,8 +86,8 @@ public:
break;
case EItemDegreeType::TwentySeven:
{
BeforeRotationPos.X= GetItemHeight() - Position.Y - 1;
BeforeRotationPos.Y= Position.X;
BeforeRotationPos.X = Position.X;
BeforeRotationPos.Y = GetItemHeight() - Position.Y- 1;
}
break;
}