diff --git a/ProjectFish/Binaries/Win64/UnrealEditor-ProjectFish-0001.dll b/ProjectFish/Binaries/Win64/UnrealEditor-ProjectFish-0001.dll new file mode 100644 index 0000000..a6136d0 Binary files /dev/null and b/ProjectFish/Binaries/Win64/UnrealEditor-ProjectFish-0001.dll differ diff --git a/ProjectFish/Binaries/Win64/UnrealEditor-ProjectFish-0002.dll b/ProjectFish/Binaries/Win64/UnrealEditor-ProjectFish-0002.dll new file mode 100644 index 0000000..ddb499e Binary files /dev/null and b/ProjectFish/Binaries/Win64/UnrealEditor-ProjectFish-0002.dll differ diff --git a/ProjectFish/Binaries/Win64/UnrealEditor-ProjectFish.dll b/ProjectFish/Binaries/Win64/UnrealEditor-ProjectFish.dll index e9c44c6..e67059f 100644 Binary files a/ProjectFish/Binaries/Win64/UnrealEditor-ProjectFish.dll and b/ProjectFish/Binaries/Win64/UnrealEditor-ProjectFish.dll differ diff --git a/ProjectFish/Binaries/Win64/UnrealEditor-ProjectFishEditor-0001.dll b/ProjectFish/Binaries/Win64/UnrealEditor-ProjectFishEditor-0001.dll new file mode 100644 index 0000000..d98c881 Binary files /dev/null and b/ProjectFish/Binaries/Win64/UnrealEditor-ProjectFishEditor-0001.dll differ diff --git a/ProjectFish/Binaries/Win64/UnrealEditor-ProjectFishEditor-0002.dll b/ProjectFish/Binaries/Win64/UnrealEditor-ProjectFishEditor-0002.dll new file mode 100644 index 0000000..76044c9 Binary files /dev/null and b/ProjectFish/Binaries/Win64/UnrealEditor-ProjectFishEditor-0002.dll differ diff --git a/ProjectFish/Binaries/Win64/UnrealEditor.modules b/ProjectFish/Binaries/Win64/UnrealEditor.modules index 22c08e6..5798bb2 100644 --- a/ProjectFish/Binaries/Win64/UnrealEditor.modules +++ b/ProjectFish/Binaries/Win64/UnrealEditor.modules @@ -2,7 +2,7 @@ "BuildId": "37670630", "Modules": { - "ProjectFish": "UnrealEditor-ProjectFish.dll", - "ProjectFishEditor": "UnrealEditor-ProjectFishEditor.dll" + "ProjectFish": "UnrealEditor-ProjectFish-0002.dll", + "ProjectFishEditor": "UnrealEditor-ProjectFishEditor-0002.dll" } } \ No newline at end of file diff --git a/ProjectFish/Plugins/DeskMode/Binaries/Win64/UnrealEditor-DeskMode-0001.dll b/ProjectFish/Plugins/DeskMode/Binaries/Win64/UnrealEditor-DeskMode-0001.dll new file mode 100644 index 0000000..7eb788b Binary files /dev/null and b/ProjectFish/Plugins/DeskMode/Binaries/Win64/UnrealEditor-DeskMode-0001.dll differ diff --git a/ProjectFish/Plugins/DeskMode/Binaries/Win64/UnrealEditor-DeskMode-0002.dll b/ProjectFish/Plugins/DeskMode/Binaries/Win64/UnrealEditor-DeskMode-0002.dll new file mode 100644 index 0000000..18a1317 Binary files /dev/null and b/ProjectFish/Plugins/DeskMode/Binaries/Win64/UnrealEditor-DeskMode-0002.dll differ diff --git a/ProjectFish/Plugins/DeskMode/Binaries/Win64/UnrealEditor.modules b/ProjectFish/Plugins/DeskMode/Binaries/Win64/UnrealEditor.modules index 437a3ab..4f308e8 100644 --- a/ProjectFish/Plugins/DeskMode/Binaries/Win64/UnrealEditor.modules +++ b/ProjectFish/Plugins/DeskMode/Binaries/Win64/UnrealEditor.modules @@ -2,6 +2,6 @@ "BuildId": "37670630", "Modules": { - "DeskMode": "UnrealEditor-DeskMode.dll" + "DeskMode": "UnrealEditor-DeskMode-0002.dll" } } \ No newline at end of file diff --git a/ProjectFish/Source/ProjectFish/Data/ContainerInfo.cpp b/ProjectFish/Source/ProjectFish/Data/ContainerInfo.cpp index f295979..c04fdc1 100644 --- a/ProjectFish/Source/ProjectFish/Data/ContainerInfo.cpp +++ b/ProjectFish/Source/ProjectFish/Data/ContainerInfo.cpp @@ -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))