Skip to content
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.

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

Fix inheritance #79

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
6 changes: 3 additions & 3 deletions code/client/src/sdk/entities/c_actor.h
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
#pragma once

#include "../ue/sys/core/c_frame.h"
#include "../ue/sys/math/c_matrix.h"
#include "../ue/sys/math/c_quat.h"
#include "../ue/sys/core/c_frame.h"
#include "c_entity.h"
#include "c_entity_pos.h"

#include <cstdint>

namespace SDK {
class C_Actor: public C_Entity {
class C_Actor: public C_EntityPos {
public:
virtual void SetPos(ue::sys::math::C_Vector const &) = 0;
virtual void SetDir(ue::sys::math::C_Vector const &) = 0;
Expand Down
8 changes: 3 additions & 5 deletions code/client/src/sdk/entities/c_actor_deform.h
Original file line number Diff line number Diff line change
@@ -1,9 +1,7 @@
#pragma once

#include "c_entity_pos.h"
#include "c_actor.h"

namespace SDK {
class C_ActorDeform : public C_EntityPos {

};
}
class C_ActorDeform: public C_Actor {};
} // namespace SDK
6 changes: 3 additions & 3 deletions code/client/src/sdk/entities/c_car.h
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
#pragma once

#include "c_actor.h"
#include "c_actor_vehicle.h"
#include "c_vehicle.h"

namespace SDK {
class C_Vehicle;
class I_Human2;

struct S_BaseSeat {
Expand All @@ -13,7 +13,7 @@ namespace SDK {
};
};

class C_Car: public C_Actor {
class C_Car: public C_ActorVehicle {
public:
void Lock();
void Unlock();
Expand Down
8 changes: 3 additions & 5 deletions code/client/src/sdk/entities/c_crash_obj.h
Original file line number Diff line number Diff line change
@@ -1,9 +1,7 @@
#pragma once

#include "c_actor.h"
#include "c_actor_deform.h"

namespace SDK {
class C_CrashObj : public C_Actor {

};
}
class C_CrashObj: public C_ActorDeform {};
} // namespace SDK
6 changes: 2 additions & 4 deletions code/client/src/sdk/entities/c_entity_pos.h
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,5 @@
#include "c_entity.h"

namespace SDK {
class C_EntityPos : public C_Entity {

};
}
class C_EntityPos: public C_Entity {};
} // namespace SDK