Skip to content

Removing workarounds for driving methods #8

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
RattleSN4K3 wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Removing workarounds for driving methods #8

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 2 additions & 9 deletions Source/Classes/AAAUTCharacter.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,15 +21,8 @@ class AAAAUTCharacter : public AUTCharacter
UPROPERTY(EditAnywhere)
float VehicleCheckRadius;

// TODO: Implement once methods are virtual
//void StartDriving(APawn* Vehicle) override;
//void StopDriving(APawn* Vehicle) override;

// TODO: Remove once StartDriving and StopDriving are virtual
void StartDriving_WORKAROUND(APawn* Vehicle);
void StopDriving_WORKAROUND(APawn* Vehicle);
APawn* OldDrivenVehicle;
bool bDrivenVehicleStored;
virtual void StartDriving(APawn* Vehicle) override;
virtual void StopDriving(APawn* Vehicle) override;

// Note: Insert after ServerUseCarriedObject()
// ...
Expand Down
40 changes: 1 addition & 39 deletions Source/Private/AAAUTCharacter.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,8 +61,7 @@ bool AUTCharacter::CanUseInternal_Implementation() const
return bCanUse;
}

// TODO: Implement once methods are virtual
/*void AUTCharacter::StartDriving(APawn* Vehicle)
void AUTCharacter::StartDriving(APawn* Vehicle)
{
Super::StartDriving(Vehicle);

Expand All @@ -81,43 +80,6 @@ void AUTCharacter::StopDriving(APawn* Vehicle)
V->StopFiring();
V->DetachDriver(this);
}
}*/

// Note: Workaround for StartDriving being non-virtual
void AUTCharacter::StartDriving_WORKAROUND(APawn* Vehicle)
{
if (AVehicle* V = Cast<AVehicle>(Vehicle))
{
V->AttachDriver(this);
}
}

// Note: Workaround for StopDriving being non-virtual
void AUTCharacter::StopDriving_WORKAROUND(APawn* Vehicle)
{
if (AVehicle* V = Cast<AVehicle>(Vehicle))
{
V->StopFiring();
V->DetachDriver(this);
}
}

void AUTCharacter::Tick(float DeltaSeconds)
{
Super::Tick(DeltaSeconds);

if (!bDrivenVehicleStored && DrivenVehicle != NULL && OldDrivenVehicle == NULL)
{
OldDrivenVehicle = DrivenVehicle;
bDrivenVehicleStored = true;
StartDriving_WORKAROUND(DrivenVehicle);
}
else if (bDrivenVehicleStored && DrivenVehicle == NULL && OldDrivenVehicle != NULL)
{
StopDriving_WORKAROUND(OldDrivenVehicle);
bDrivenVehicleStored = false;
OldDrivenVehicle = NULL;
}
}

#undef AUTCharacter