From 1f1bf20b8c6067eeeadc9c4354aee6a2bbafb1fe Mon Sep 17 00:00:00 2001 From: "DESKTOP-51ULEOV\\houal" Date: Wed, 27 Dec 2017 12:57:57 -0800 Subject: [PATCH] Updated code for UE 4.18 --- Config/DefaultEngine.ini | 41 +++++++++++++++++++ Defragr.uproject | 8 +++- Source/Defragr.Target.cs | 14 +------ Source/Defragr/Checkpoint.cpp | 6 +-- Source/Defragr/Checkpoint.h | 4 +- Source/Defragr/Defragr.Build.cs | 6 ++- Source/Defragr/Defragr.cpp | 1 + Source/Defragr/DefragrGameMode.cpp | 2 +- Source/Defragr/DefragrHUD.cpp | 2 +- Source/Defragr/DefragrPlayer.cpp | 8 ++-- Source/Defragr/DefragrPlayer.h | 4 ++ .../DefragrPlayerCollisionComponent.cpp | 5 +-- Source/Defragr/DefragrPlayerMoveComponent.cpp | 10 ++--- Source/Defragr/JumpPadVolume.cpp | 4 +- Source/Defragr/JumpPadVolume.h | 2 +- Source/Defragr/Pickup.cpp | 6 +-- Source/Defragr/Pickup.h | 4 +- Source/Defragr/Projectile.cpp | 2 +- Source/Defragr/TeleportTarget.cpp | 6 +-- Source/Defragr/TeleportTarget.h | 2 + Source/Defragr/TeleportVolume.cpp | 4 +- Source/Defragr/TeleportVolume.h | 2 +- Source/Defragr/Weapon.cpp | 6 +-- Source/Defragr/WeaponPickup.cpp | 2 +- Source/DefragrEditor.Target.cs | 14 +------ 25 files changed, 100 insertions(+), 65 deletions(-) diff --git a/Config/DefaultEngine.ini b/Config/DefaultEngine.ini index 3e30f9f..0c68ac6 100644 --- a/Config/DefaultEngine.ini +++ b/Config/DefaultEngine.ini @@ -77,4 +77,45 @@ ServerDefaultMap=/Engine/Maps/Entry GlobalDefaultGameMode=/Script/Defragr.DefragrGameMode GlobalDefaultServerGameMode=None +[/Script/Engine.PhysicsSettings] +DefaultGravityZ=-980.000000 +DefaultTerminalVelocity=4000.000000 +DefaultFluidFriction=0.300000 +SimulateScratchMemorySize=262144 +RagdollAggregateThreshold=4 +TriangleMeshTriangleMinAreaThreshold=5.000000 +bEnableAsyncScene=False +bEnableShapeSharing=False +bEnablePCM=True +bEnableStabilization=False +bWarnMissingLocks=True +bEnable2DPhysics=False +LockedAxis=Invalid +DefaultDegreesOfFreedom=Full3D +BounceThresholdVelocity=200.000000 +FrictionCombineMode=Average +RestitutionCombineMode=Average +MaxAngularVelocity=3600.000000 +MaxDepenetrationVelocity=0.000000 +ContactOffsetMultiplier=0.020000 +MinContactOffset=2.000000 +MaxContactOffset=8.000000 +bSimulateSkeletalMeshOnDedicatedServer=True +DefaultShapeComplexity=CTF_UseSimpleAndComplex +bDefaultHasComplexCollision=True +bSuppressFaceRemapTable=False +bSupportUVFromHitResults=False +bDisableActiveActors=False +bDisableCCD=False +bEnableEnhancedDeterminism=False +MaxPhysicsDeltaTime=0.033333 +bSubstepping=False +bSubsteppingAsync=False +MaxSubstepDeltaTime=0.016667 +MaxSubsteps=6 +SyncSceneSmoothingFactor=0.000000 +AsyncSceneSmoothingFactor=0.990000 +InitialAverageFrameRate=0.016667 +PhysXTreeRebuildRate=10 + diff --git a/Defragr.uproject b/Defragr.uproject index d993c76..c9aad58 100644 --- a/Defragr.uproject +++ b/Defragr.uproject @@ -1,6 +1,6 @@ { "FileVersion": 3, - "EngineAssociation": "4.8", + "EngineAssociation": "4.18", "Category": "", "Description": "", "Modules": [ @@ -12,5 +12,11 @@ "Engine" ] } + ], + "Plugins": [ + { + "Name": "HoudiniEngine", + "Enabled": true + } ] } \ No newline at end of file diff --git a/Source/Defragr.Target.cs b/Source/Defragr.Target.cs index 193cf45..2b31d20 100644 --- a/Source/Defragr.Target.cs +++ b/Source/Defragr.Target.cs @@ -8,18 +8,6 @@ public class DefragrTarget : TargetRules public DefragrTarget(TargetInfo Target) { Type = TargetType.Game; - } - - // - // TargetRules interface. - // - - public override void SetupBinaries( - TargetInfo Target, - ref List OutBuildBinaryConfigurations, - ref List OutExtraModuleNames - ) - { - OutExtraModuleNames.Add("Defragr"); + ExtraModuleNames.AddRange( new string[] { "Defragr" } ); } } diff --git a/Source/Defragr/Checkpoint.cpp b/Source/Defragr/Checkpoint.cpp index 4112d74..cfd0ee6 100644 --- a/Source/Defragr/Checkpoint.cpp +++ b/Source/Defragr/Checkpoint.cpp @@ -3,9 +3,9 @@ */ +#include "Checkpoint.h" #include "Defragr.h" #include "Components/BrushComponent.h" -#include "Checkpoint.h" #include "DefragrPlayer.h" @@ -30,7 +30,7 @@ ACheckpoint::ACheckpoint(const FObjectInitializer& ObjectInitializer) BrushColor.A = 255; } -void ACheckpoint::OnActorEnteredVolume(AActor* Actor) +void ACheckpoint::OnActorEnteredVolume(AActor* Actor, AActor* Actor2) { if(CheckpointType == ECheckpointType::End) { @@ -41,7 +41,7 @@ void ACheckpoint::OnActorEnteredVolume(AActor* Actor) } } -void ACheckpoint::OnActorExitedVolume(AActor* Actor) +void ACheckpoint::OnActorExitedVolume(AActor* Actor, AActor* Actor2) { // If the checkpoint is a starting checkpoint then start the // race timer for the player. diff --git a/Source/Defragr/Checkpoint.h b/Source/Defragr/Checkpoint.h index 66d286e..fecd4d6 100644 --- a/Source/Defragr/Checkpoint.h +++ b/Source/Defragr/Checkpoint.h @@ -32,8 +32,8 @@ class DEFRAGR_API ACheckpoint : public AVolume public: UFUNCTION() - virtual void OnActorEnteredVolume(class AActor* Actor); + virtual void OnActorEnteredVolume(class AActor* Actor, class AActor* Actor2); UFUNCTION() - virtual void OnActorExitedVolume(class AActor* Actor); + virtual void OnActorExitedVolume(class AActor* Actor, class AActor* Actor2); }; diff --git a/Source/Defragr/Defragr.Build.cs b/Source/Defragr/Defragr.Build.cs index 478ff59..845e0da 100644 --- a/Source/Defragr/Defragr.Build.cs +++ b/Source/Defragr/Defragr.Build.cs @@ -4,8 +4,12 @@ public class Defragr : ModuleRules { - public Defragr(TargetInfo Target) + public Defragr(ReadOnlyTargetRules Target): base(Target) { + PCHUsage = PCHUsageMode.UseExplicitOrSharedPCHs; + PublicDependencyModuleNames.AddRange(new string[] { "Core", "CoreUObject", "Engine", "InputCore" }); + + PrivateDependencyModuleNames.AddRange(new string[] { }); } } diff --git a/Source/Defragr/Defragr.cpp b/Source/Defragr/Defragr.cpp index 6ef8872..7c53290 100644 --- a/Source/Defragr/Defragr.cpp +++ b/Source/Defragr/Defragr.cpp @@ -1,6 +1,7 @@ // Copyright 1998-2015 Epic Games, Inc. All Rights Reserved. #include "Defragr.h" +#include "Modules/ModuleManager.h" IMPLEMENT_PRIMARY_GAME_MODULE( FDefaultGameModuleImpl, Defragr, "Defragr" ); diff --git a/Source/Defragr/DefragrGameMode.cpp b/Source/Defragr/DefragrGameMode.cpp index 05dc7c7..24fe868 100644 --- a/Source/Defragr/DefragrGameMode.cpp +++ b/Source/Defragr/DefragrGameMode.cpp @@ -1,7 +1,7 @@ // Copyright 1998-2015 Epic Games, Inc. All Rights Reserved. -#include "Defragr.h" #include "DefragrGameMode.h" +#include "Defragr.h" #include "DefragrHUD.h" #include "DefragrPlayer.h" diff --git a/Source/Defragr/DefragrHUD.cpp b/Source/Defragr/DefragrHUD.cpp index 8ffe094..36ea1e4 100644 --- a/Source/Defragr/DefragrHUD.cpp +++ b/Source/Defragr/DefragrHUD.cpp @@ -1,7 +1,7 @@ // Copyright 1998-2015 Epic Games, Inc. All Rights Reserved. -#include "Defragr.h" #include "DefragrHUD.h" +#include "Defragr.h" #include "Engine/Canvas.h" #include "TextureResource.h" #include "CanvasItem.h" diff --git a/Source/Defragr/DefragrPlayer.cpp b/Source/Defragr/DefragrPlayer.cpp index 2656d6e..bcdea84 100644 --- a/Source/Defragr/DefragrPlayer.cpp +++ b/Source/Defragr/DefragrPlayer.cpp @@ -2,8 +2,8 @@ * Written by Terence-Lee 'Zinglish' Davis */ -#include "Defragr.h" #include "DefragrPlayer.h" +#include "Defragr.h" #include "DefragrPlayerMoveComponent.h" #include "DefragrPlayerCollisionComponent.h" #include "Weapon.h" @@ -35,7 +35,7 @@ ADefragrPlayer::ADefragrPlayer() // Add physical reference to the player's forward vector PlayerForwardRefComponent = CreateDefaultSubobject(TEXT("Player Forward")); if(PlayerForwardRefComponent) - PlayerForwardRefComponent->AttachParent = Collider; + PlayerForwardRefComponent->SetupAttachment(Collider); // Add a helper #if WITH_EDITORONLY_DATA @@ -46,14 +46,14 @@ ADefragrPlayer::ADefragrPlayer() ArrowComponent->bTreatAsASprite = true; ArrowComponent->SpriteInfo.Category = ConstructorStatics.ID_Characters; ArrowComponent->SpriteInfo.DisplayName = ConstructorStatics.NAME_Characters; - ArrowComponent->AttachParent = PlayerForwardRefComponent; + ArrowComponent->SetupAttachment(PlayerForwardRefComponent); ArrowComponent->bIsScreenSizeScaled = true; } #endif // Initialize the camera FirstPersonCameraComponent = CreateDefaultSubobject(TEXT("First Person Camera")); - FirstPersonCameraComponent->AttachParent = PlayerForwardRefComponent; + FirstPersonCameraComponent->SetupAttachment(PlayerForwardRefComponent); FirstPersonCameraComponent->SetRelativeLocation(FVector(0.f, 0.f, 56.f - 4.f)); // Add the character collision and movement component diff --git a/Source/Defragr/DefragrPlayer.h b/Source/Defragr/DefragrPlayer.h index 82a5132..0213099 100644 --- a/Source/Defragr/DefragrPlayer.h +++ b/Source/Defragr/DefragrPlayer.h @@ -5,6 +5,10 @@ #pragma once #include "GameFramework/Pawn.h" +#include "Runtime/Engine/Classes/Sound/SoundCue.h" +#include "Runtime/Engine/Classes/Components/BoxComponent.h" +#include "Runtime/Engine/Classes/Camera/CameraComponent.h" +#include "Runtime/Engine/Classes/Components/ArrowComponent.h" #include "DefragrPlayer.generated.h" diff --git a/Source/Defragr/DefragrPlayerCollisionComponent.cpp b/Source/Defragr/DefragrPlayerCollisionComponent.cpp index 4e89b31..4f2aeab 100644 --- a/Source/Defragr/DefragrPlayerCollisionComponent.cpp +++ b/Source/Defragr/DefragrPlayerCollisionComponent.cpp @@ -2,9 +2,9 @@ * Written by Terence-Lee 'Zinglish' Davis */ +#include "DefragrPlayerCollisionComponent.h" #include "Defragr.h" #include "DefragrPlayer.h" -#include "DefragrPlayerCollisionComponent.h" #include "DefragrPlayerMoveComponent.h" #include "Engine.h" @@ -13,7 +13,6 @@ // Sets default values for this component's properties UDefragrPlayerCollisionComponent::UDefragrPlayerCollisionComponent() { - bWantsBeginPlay = true; PrimaryComponentTick.bCanEverTick = true; } @@ -299,7 +298,7 @@ bool UDefragrPlayerCollisionComponent::Trace(FHitResult& Result, FVector Start, FCollisionQueryParams QueryParams(TEXT(""), false); FCollisionObjectQueryParams ObjectQueryParams(ECC_WorldStatic); - bool Hit = GetWorld()->SweepSingle(Result, Start, End, FQuat::Identity, CollisionShape, QueryParams, ObjectQueryParams); + bool Hit = GetWorld()->SweepSingleByObjectType(Result, Start, End, FQuat::Identity, ObjectQueryParams, CollisionShape, QueryParams); return Hit; } diff --git a/Source/Defragr/DefragrPlayerMoveComponent.cpp b/Source/Defragr/DefragrPlayerMoveComponent.cpp index 1ac71bb..ac7a0f4 100644 --- a/Source/Defragr/DefragrPlayerMoveComponent.cpp +++ b/Source/Defragr/DefragrPlayerMoveComponent.cpp @@ -2,10 +2,11 @@ * Written by Terence-Lee 'Zinglish' Davis */ +#include "DefragrPlayerMoveComponent.h" #include "Defragr.h" #include "DefragrPlayer.h" -#include "DefragrPlayerMoveComponent.h" #include "DefragrPlayerCollisionComponent.h" +#include "Runtime/Core/Public/GenericPlatform/GenericPlatformMath.h" #include "Engine.h" @@ -16,7 +17,6 @@ UDefragrPlayerMoveComponent::UDefragrPlayerMoveComponent(const FObjectInitialize { // Set this component to be initialized when the game starts, and to be ticked every frame. You can turn these features // off to improve performance if you don't need them. - bWantsBeginPlay = true; PrimaryComponentTick.bCanEverTick = true; } @@ -318,9 +318,9 @@ float UDefragrPlayerMoveComponent::CmdScale() float total; float scale; - max = abs(WishMove.X); - if (abs(WishMove.Y) > max) { - max = abs(WishMove.Y); + max = FGenericPlatformMath::Abs(WishMove.X); + if (FGenericPlatformMath::Abs(WishMove.Y) > max) { + max = FGenericPlatformMath::Abs(WishMove.Y); } /*if (abs(cmd->upmove) > max) { max = abs(cmd->upmove); diff --git a/Source/Defragr/JumpPadVolume.cpp b/Source/Defragr/JumpPadVolume.cpp index 60f1baa..0243966 100644 --- a/Source/Defragr/JumpPadVolume.cpp +++ b/Source/Defragr/JumpPadVolume.cpp @@ -2,9 +2,9 @@ * Written by Terence-Lee 'Zinglish' Davis */ +#include "JumpPadVolume.h" #include "Defragr.h" #include "Components/BrushComponent.h" -#include "JumpPadVolume.h" #include "DefragrPlayer.h" @@ -26,7 +26,7 @@ AJumpPadVolume::AJumpPadVolume(const FObjectInitializer& ObjectInitializer) BrushColor.A = 255; } -void AJumpPadVolume::OnActorEnteredVolume(AActor* Actor) +void AJumpPadVolume::OnActorEnteredVolume(AActor * Actor, AActor * Actor2) { ADefragrPlayer* Player = Cast(Actor); diff --git a/Source/Defragr/JumpPadVolume.h b/Source/Defragr/JumpPadVolume.h index 179ba92..53909fd 100644 --- a/Source/Defragr/JumpPadVolume.h +++ b/Source/Defragr/JumpPadVolume.h @@ -24,5 +24,5 @@ class DEFRAGR_API AJumpPadVolume : public AVolume public: UFUNCTION() - virtual void OnActorEnteredVolume(class AActor* Actor); + void OnActorEnteredVolume(class AActor* Actor, class AActor* Actor2); }; diff --git a/Source/Defragr/Pickup.cpp b/Source/Defragr/Pickup.cpp index 93916ee..9641674 100644 --- a/Source/Defragr/Pickup.cpp +++ b/Source/Defragr/Pickup.cpp @@ -2,13 +2,13 @@ * Written by Terence-Lee 'Zinglish' Davis */ +#include "Pickup.h" #include "Defragr.h" #include "Engine.h" #include "DefragrPlayer.h" -#include "Pickup.h" // Sets default values @@ -32,7 +32,7 @@ APickup::APickup() // Create the pickup mesh PickupMesh = CreateDefaultSubobject(TEXT("PickupMesh")); - PickupMesh->AttachTo(RootComponent); + PickupMesh->SetupAttachment(RootComponent); } void APickup::BeginPlay() {Super::BeginPlay();} @@ -41,7 +41,7 @@ void APickup::Tick(float DeltaTime) {Super::Tick(DeltaTime);} void APickup::OnPlayerPickup(ADefragrPlayer* Player) {} void APickup::OnPickedUp_Implementation() {} -void APickup::OnActorOverlapPickup(class AActor* Actor, class UPrimitiveComponent* OtherComp, int32 OtherBodyIndex, bool bFromSweep, const FHitResult & SweepResult) +void APickup::OnActorOverlapPickup(class UPrimitiveComponent* Comp, class AActor* Actor, class UPrimitiveComponent* OtherComp, int32 OtherBodyIndex, bool bFromSweep, const FHitResult & SweepResult) { ADefragrPlayer* Player = Cast(Actor); diff --git a/Source/Defragr/Pickup.h b/Source/Defragr/Pickup.h index b218cd4..cb2a8c4 100644 --- a/Source/Defragr/Pickup.h +++ b/Source/Defragr/Pickup.h @@ -5,6 +5,8 @@ #pragma once #include "GameFramework/Actor.h" +#include "Runtime/Engine/Classes/Components/StaticMeshComponent.h" +#include "Runtime/Engine/Classes/Components/BoxComponent.h" #include "Pickup.generated.h" class ADefragrPlayer; @@ -48,5 +50,5 @@ class DEFRAGR_API APickup : public AActor private: UFUNCTION() - void OnActorOverlapPickup(class AActor* Actor, class UPrimitiveComponent* OtherComp, int32 OtherBodyIndex, bool bFromSweep, const FHitResult & SweepResult); + void OnActorOverlapPickup(class UPrimitiveComponent* Comp, class AActor* Actor, class UPrimitiveComponent* OtherComp, int32 OtherBodyIndex, bool bFromSweep, const FHitResult & SweepResult); }; diff --git a/Source/Defragr/Projectile.cpp b/Source/Defragr/Projectile.cpp index f204152..0de586c 100644 --- a/Source/Defragr/Projectile.cpp +++ b/Source/Defragr/Projectile.cpp @@ -2,12 +2,12 @@ * Written by Terence-Lee 'Zinglish' Davis */ +#include "Projectile.h" #include "Defragr.h" #include "Weapon.h" #include "DefragrPlayer.h" -#include "Projectile.h" AProjectile::AProjectile() diff --git a/Source/Defragr/TeleportTarget.cpp b/Source/Defragr/TeleportTarget.cpp index 4d3687d..e9abc78 100644 --- a/Source/Defragr/TeleportTarget.cpp +++ b/Source/Defragr/TeleportTarget.cpp @@ -2,8 +2,8 @@ * Written by Terence-Lee 'Zinglish' Davis */ -#include "Defragr.h" #include "TeleportTarget.h" +#include "Defragr.h" #include "Components/BillboardComponent.h" #include "Components/ArrowComponent.h" @@ -45,7 +45,7 @@ ATeleportTarget::ATeleportTarget(const FObjectInitializer& ObjectInitializer) SpriteComponent->Sprite = ConstructorStatics.TextureObject.Get(); // Get the sprite texture from helper class object SpriteComponent->SpriteInfo.Category = ConstructorStatics.ID_TeleportTarget; // Assign sprite category name SpriteComponent->SpriteInfo.DisplayName = ConstructorStatics.NAME_TeleportTarget; // Assign sprite display name - SpriteComponent->AttachParent = RootComponent; // Attach sprite to scene component + SpriteComponent->SetupAttachment(RootComponent); // Attach sprite to scene component SpriteComponent->Mobility = EComponentMobility::Static; SpriteComponent->bIsScreenSizeScaled = true; } @@ -57,7 +57,7 @@ ATeleportTarget::ATeleportTarget(const FObjectInitializer& ObjectInitializer) ArrowComponent->bTreatAsASprite = true; ArrowComponent->SpriteInfo.Category = ConstructorStatics.ID_TeleportTarget; ArrowComponent->SpriteInfo.DisplayName = ConstructorStatics.NAME_TeleportTarget; - ArrowComponent->AttachParent = RootComponent; + ArrowComponent->SetupAttachment(RootComponent); ArrowComponent->bIsScreenSizeScaled = true; } diff --git a/Source/Defragr/TeleportTarget.h b/Source/Defragr/TeleportTarget.h index 378259b..2d798fd 100644 --- a/Source/Defragr/TeleportTarget.h +++ b/Source/Defragr/TeleportTarget.h @@ -5,6 +5,8 @@ #pragma once #include "GameFramework/Actor.h" +#include "Runtime/Engine/Classes/Components/ArrowComponent.h" +#include "Runtime/Engine/Classes/Components/BoxComponent.h" #include "TeleportTarget.generated.h" UCLASS(hidecategories=(Input,Rendering,Actor)) diff --git a/Source/Defragr/TeleportVolume.cpp b/Source/Defragr/TeleportVolume.cpp index 80bfb16..438b364 100644 --- a/Source/Defragr/TeleportVolume.cpp +++ b/Source/Defragr/TeleportVolume.cpp @@ -2,9 +2,9 @@ * Written by Terence-Lee 'Zinglish' Davis */ +#include "TeleportVolume.h" #include "Defragr.h" #include "Components/BrushComponent.h" -#include "TeleportVolume.h" #include "DefragrPlayer.h" #include "DefragrPlayerMoveComponent.h" @@ -27,7 +27,7 @@ ATeleportVolume::ATeleportVolume(const FObjectInitializer& ObjectInitializer) BrushColor.A = 255; } -void ATeleportVolume::OnActorEnteredVolume(AActor* Actor) +void ATeleportVolume::OnActorEnteredVolume(AActor* Actor, AActor* Actor2) { ADefragrPlayer* Player = Cast(Actor); diff --git a/Source/Defragr/TeleportVolume.h b/Source/Defragr/TeleportVolume.h index 73a8904..3d473b7 100644 --- a/Source/Defragr/TeleportVolume.h +++ b/Source/Defragr/TeleportVolume.h @@ -26,5 +26,5 @@ class DEFRAGR_API ATeleportVolume : public AVolume public: UFUNCTION() - virtual void OnActorEnteredVolume(class AActor* Actor); + virtual void OnActorEnteredVolume(class AActor* Actor, class AActor* Actor2); }; diff --git a/Source/Defragr/Weapon.cpp b/Source/Defragr/Weapon.cpp index cd1cb43..50be85a 100644 --- a/Source/Defragr/Weapon.cpp +++ b/Source/Defragr/Weapon.cpp @@ -2,13 +2,13 @@ * Written by Terence-Lee 'Zinglish' Davis */ +#include "Weapon.h" #include "Defragr.h" #include "Engine.h" #include "Projectile.h" -#include "Weapon.h" AWeapon::AWeapon() @@ -16,10 +16,10 @@ AWeapon::AWeapon() RootSceneComponent = CreateDefaultSubobject(TEXT("Root")); FirstPersonMesh = CreateDefaultSubobject(TEXT("First Person Mesh")); - FirstPersonMesh->AttachParent = RootSceneComponent; + FirstPersonMesh->SetupAttachment(RootSceneComponent); ThirdPersonMesh = CreateDefaultSubobject(TEXT("Third Person Mesh")); - ThirdPersonMesh->AttachParent = RootSceneComponent; + ThirdPersonMesh->SetupAttachment(RootSceneComponent); } void AWeapon::BeginPlay() diff --git a/Source/Defragr/WeaponPickup.cpp b/Source/Defragr/WeaponPickup.cpp index f359325..8d894ee 100644 --- a/Source/Defragr/WeaponPickup.cpp +++ b/Source/Defragr/WeaponPickup.cpp @@ -2,13 +2,13 @@ * Written by Terence-Lee 'Zinglish' Davis */ +#include "WeaponPickup.h" #include "Defragr.h" #include "Engine.h" #include "DefragrPlayer.h" -#include "WeaponPickup.h" void AWeaponPickup::OnPlayerPickup(ADefragrPlayer* Player) diff --git a/Source/DefragrEditor.Target.cs b/Source/DefragrEditor.Target.cs index 35a5dab..652369b 100644 --- a/Source/DefragrEditor.Target.cs +++ b/Source/DefragrEditor.Target.cs @@ -8,18 +8,6 @@ public class DefragrEditorTarget : TargetRules public DefragrEditorTarget(TargetInfo Target) { Type = TargetType.Editor; - } - - // - // TargetRules interface. - // - - public override void SetupBinaries( - TargetInfo Target, - ref List OutBuildBinaryConfigurations, - ref List OutExtraModuleNames - ) - { - OutExtraModuleNames.Add("Defragr"); + ExtraModuleNames.AddRange( new string[] { "Defragr" } ); } }