Skip to content

Improved gentity struct. #172

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

Merged
Rackover merged 3 commits into from
Dec 23, 2024
Merged

Improved gentity struct. #172

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a22524b
Improved gentity struct.
Caball009 Dec 4, 2024
36ae429
Updated struct with missing enums.
Caball009 Dec 11, 2024
219c06b
Merge branch 'develop' into struct_update
Rackover Dec 20, 2024
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
126 changes: 125 additions & 1 deletion src/Game/Structs.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7463,6 +7463,129 @@ namespace Game
ENT_HANDLER_COUNT
};

struct item_ent_t
{
int ammoCount;
int clipAmmoCount;
int index;
char dualWieldItem;
char padding[3];
};

struct spawner_ent_t
{
int team;
Copy link
Contributor

@Rackover Rackover Dec 20, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

team_t here too I suppose?

Copy link
Contributor Author

@Caball009 Caball009 Dec 22, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I checked IW4, IW5 and T5 and none of them have this field as a team_t enum, but I still think it's quite likely to be a team_t.

Copy link
Member

@wroyca wroyca Dec 22, 2024 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can confirm, spawner_ent_t doesn't use team_t on T5; perhaps it's best to leave it as is (int) for now and see how the code references it.

Copy link
Contributor

@Rackover Rackover Dec 23, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

OK; feel free to open another PR if this turns out to be team_t. Even if that's not exactly what's in the symbols, if that's what the game does internally that it makes sense to have it be a team_t

int timestamp;
int index;
};

struct trigger_ent_t
{
int threshold;
int accumulate;
int timestamp;
int singleUserEntIndex;
char requireLookAt;
char padding[3];
};

struct mover_positions_t
{
float decelTime;
float speed;
float midTime;
vec3_t pos1;
vec3_t pos2;
vec3_t pos3;
};

struct mover_slidedata_t
{
Bounds bounds;
vec3_t velocity;
};

union mover_data_t
{
mover_positions_t pos;
mover_slidedata_t slide;
};

struct mover_ent_t
{
mover_data_t moverData;
mover_positions_t angle;
};

struct corpse_ent_t
{
int deathAnimStartTime;
};

struct missile_fields_grenade
{
float wobbleCycle;
float curve;
};

enum MissileStage
{
MISSILESTAGE_SOFTLAUNCH = 0x0,
MISSILESTAGE_ASCENT = 0x1,
MISSILESTAGE_DESCENT = 0x2,
};

struct missile_fields_nonGrenade
{
vec3_t curvature;
vec3_t targetEntOffset;
vec3_t targetPos;
vec3_t launchOrigin;
MissileStage stage;
};

union missile_data_t
{
missile_fields_grenade grenade;
missile_fields_nonGrenade nonGrenade;
};

struct missile_ent_t
{
int time;
int timeOfBirth;
int travelDist;
vec3_t surfaceNormal;
team_t team;
int flags;
int antilagTimeOffset;
missile_data_t missileData;
};

struct blend_ent_t
{
vec3_t pos;
vec3_t vel;
vec4_t viewQuat;
char changed;
char padding[3];
float accelTime;
float decelTime;
float startTime;
float totalTime;
};

union entity_data_t
{
item_ent_t item[2];
spawner_ent_t spawner;
trigger_ent_t trigger;
mover_ent_t mover;
corpse_ent_t corpse;
missile_ent_t missile;
blend_ent_t blend;
};

struct gentity_s
{
entityState_s s;
Expand Down Expand Up @@ -7496,15 +7619,16 @@ namespace Game
int maxHealth;
int damage;
int count;
entity_data_t entData;
EntHandle missileTargetEnt;
EntHandle remoteControlledOwner;
int tagInfo;
gentity_s* tagChildren;
unsigned __int16 attachModelNames[19];
unsigned __int16 attachTagNames[19];
int useCount;
gentity_s* nextFree;
int birthTime;
char pad[100];
};

static_assert(sizeof(gentity_s) == 0x274);
Expand Down