- make all actor pointers in the player struct regular pointers.

This commit is contained in:
Christoph Oelckers 2021-12-26 08:52:05 +01:00
parent de3e66016c
commit e3ce0da111
3 changed files with 3 additions and 3 deletions

View file

@ -80,7 +80,7 @@ extern POSTURE gPostureDefaults[kModeMax][kPostureMax];
struct PLAYER struct PLAYER
{ {
TObjPtr<DBloodActor*> actor; DBloodActor* actor;
DUDEINFO* pDudeInfo; DUDEINFO* pDudeInfo;
InputPacket input; InputPacket input;
PlayerHorizon horizon; PlayerHorizon horizon;

View file

@ -204,7 +204,7 @@ void QAV::Draw(double x, double y, int ticks, int stat, int shade, int palnum, b
void QAV::Play(int start, int end, int nCallback, PLAYER *pData) void QAV::Play(int start, int end, int nCallback, PLAYER *pData)
{ {
auto pActor = pData ? pData->actor.Get() : nullptr; auto pActor = pData ? pData->actor : nullptr;
assert(ticksPerFrame > 0); assert(ticksPerFrame > 0);
int frame; int frame;
int ticks; int ticks;

View file

@ -227,7 +227,7 @@ struct player_struct
sectortype* cursector; sectortype* cursector;
sectortype* one_parallax_sectnum; // wall + sector references. Make them pointers later? sectortype* one_parallax_sectnum; // wall + sector references. Make them pointers later?
walltype* access_wall; walltype* access_wall;
TObjPtr<DDukeActor*> actor; DDukeActor* actor;
TObjPtr<DDukeActor*> actorsqu, wackedbyactor, on_crane, holoduke_on, somethingonplayer, access_spritenum, dummyplayersprite, newOwner; TObjPtr<DDukeActor*> actorsqu, wackedbyactor, on_crane, holoduke_on, somethingonplayer, access_spritenum, dummyplayersprite, newOwner;
short last_extra, subweapon; short last_extra, subweapon;