teambeef/raze
0
0
Fork 0
mirror of https://github.com/DrBeef/Raze.git synced 2025-04-02 22:20:50 +00:00
Code Issues Projects Releases Packages Wiki Activity

- made Collision derive from a common base class and refactored clipmove to a single engine-side entry point.

Browse source 
Done for Doom so far.
This commit is contained in:
Christoph Oelckers 2021-11-26 13:41:15 +01:00
parent 96b9572905
commit 4788c7ba5e
16 changed files with 159 additions and 208 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
source/build/include/clip.h
View file

@ -30,7 +30,7 @@ inline int clipinsidebox(int x, int y, int wall, int dist)
int clipinsideboxline(int x, int y, int x1, int y1, int x2, int y2, int walldist);
int32_t clipmove(vec3_t *const pos, int *const sectnum, int32_t xvect, int32_t yvect, int32_t const walldist, int32_t const ceildist,
int32_t clipmove_(vec3_t *const pos, int *const sectnum, int32_t xvect, int32_t yvect, int32_t const walldist, int32_t const ceildist,
int32_t const flordist, uint32_t const cliptype, int clipmoveboxtracenum = 3) ATTRIBUTE((nonnull(1, 2)));
int pushmove(vec3_t *const vect, int *const sectnum, int32_t const walldist, int32_t const ceildist, int32_t const flordist,

2
source/build/src/clip.cpp
View file

@ -442,7 +442,7 @@ static void clipupdatesector(vec2_t const pos, int * const sectnum, int walldist
//
// clipmove
//
int32_t clipmove(vec3_t * const pos, int * const sectnum, int32_t xvect, int32_t yvect,
int32_t clipmove_(vec3_t * const pos, int * const sectnum, int32_t xvect, int32_t yvect,
int32_t const walldist, int32_t const ceildist, int32_t const flordist, uint32_t const cliptype, int clipmoveboxtracenum)
{
if ((xvect|yvect) == 0 || *sectnum < 0)

83
source/core/coreactor.h
View file

@ -76,20 +76,41 @@ inline FSerializer& Serialize(FSerializer& arc, const char* keyname, DCoreActor*
// Not all utilities use all variables.
struct HitInfoBase
{
//int type;
vec3_t hitpos;
sectortype* hitSector;
walltype* hitWall;
DCoreActor* hitActor;
//HitInfoBase() = default;
//explicit HitInfoBase(int legacyval) { setFromEngine(legacyval); }
void clearObj()
{
hitSector = nullptr;
hitWall = nullptr;
hitActor = nullptr;
}
};
template<class T>
struct THitInfo : public HitInfoBase
{
T* actor() const { return static_cast<T*>(hitActor); }
};
struct CollisionBase
{
int type;
union
{
// can only have one at a time
sectortype* hitSector;
walltype* hitWall;
DCoreActor* hitActor;
};
#if 0
void invalidate()
{
*this = {};
type = -1; // something invalid that's not a valid hit type.
hitSector = nullptr;
}
int setNone()
@ -146,39 +167,33 @@ struct HitInfoBase
return kHitSprite;
}
int setVoid()
{
*this = {};
int setVoid()
{
hitSector = nullptr;
type = kHitVoid;
return kHitVoid;
return kHitVoid;
}
// this hack job needs to go. We still need it for the time being.
int setFromEngine(int value)
{
type = value & kHitTypeMaskSW;
int type = value & kHitTypeMaskSW;
if (type == kHitSector) setSector(value & kHitIndexMask);
else if (type == kHitWall) setWall(value & kHitIndexMask);
else if (type == kHitSprite) setSprite(value & kHitIndexMask);
else setNone();
return type;
}
#endif
void clearObj()
{
hitSector = nullptr;
hitWall = nullptr;
hitActor = nullptr;
}
};
template<class T>
struct THitInfo : public HitInfoBase
struct TCollision : public CollisionBase
{
T* actor() { return static_cast<T*>(hitActor); }
T* actor() const { return static_cast<T*>(hitActor); }
};
// Iterator wrappers that return an actor pointer, not an index.
template<class TActor>
class TStatIterator : public StatIterator
@ -295,6 +310,25 @@ inline int hitscan(int x, int y, int z, int sectnum, int vx, int vy, int vz,
return res;
}
[[deprecated]]
inline int clipmove(vec3_t* const pos, int* const sectnum, int xvect, int yvect,
int const walldist, int const ceildist, int const flordist, uint32_t const cliptype, int clipmoveboxtracenum = 3)
{
return clipmove_(pos, sectnum, xvect, yvect, walldist, ceildist, flordist, cliptype, clipmoveboxtracenum);
}
[[deprecated]]
inline int32_t clipmove(vec3_t* const pos, sectortype** const sect, int32_t xvect, int32_t yvect,
int32_t const walldist, int32_t const ceildist, int32_t const flordist, uint32_t const cliptype, int clipmoveboxtracenum = 3)
{
int sectno = *sect ? sector.IndexOf(*sect) : -1;
int res = clipmove_(pos, &sectno, xvect, yvect, walldist, ceildist, flordist, cliptype, clipmoveboxtracenum);
*sect = sectno == -1 ? nullptr : &sector[sectno];
return res;
}
inline int hitscan(const vec3_t& start, const sectortype* startsect, const vec3_t& direction, HitInfoBase& hitinfo, unsigned cliptype)
{
hitdata_t hd{};
@ -306,3 +340,12 @@ inline int hitscan(const vec3_t& start, const sectortype* startsect, const vec3_
hitinfo.hitActor = hd.sprite == -1? nullptr : actorArray[hd.sprite];
return res;
}
inline int clipmove(vec3_t& pos, sectortype** const sect, int xvect, int yvect,
int const walldist, int const ceildist, int const flordist, unsigned const cliptype, CollisionBase& result, int clipmoveboxtracenum = 3)
{
int sectno = *sect ? sector.IndexOf(*sect) : -1;
int res = clipmove_(&pos, &sectno, xvect, yvect, walldist, ceildist, flordist, cliptype, clipmoveboxtracenum);
*sect = sectno == -1 ? nullptr : &sector[sectno];
return result.setFromEngine(res);
}

9
source/core/gamefuncs.h
View file

@ -323,15 +323,6 @@ inline void dragpoint(walltype* pointhighlight, int32_t dax, int32_t day)
dragpoint(wallnum(pointhighlight), dax, day);
}
inline int32_t clipmove(vec3_t* const pos, sectortype** const sect, int32_t xvect, int32_t yvect,
int32_t const walldist, int32_t const ceildist, int32_t const flordist, uint32_t const cliptype, int clipmoveboxtracenum = 3)
{
int sectno = *sect ? sector.IndexOf(*sect) : -1;
int res = clipmove(pos, &sectno, xvect, yvect, walldist, ceildist, flordist, cliptype, clipmoveboxtracenum);
*sect = sectno == -1 ? nullptr : &sector[sectno];
return res;
}
inline int pushmove(vec3_t *const vect, sectortype**const sect, int32_t const walldist, int32_t const ceildist, int32_t const flordist,
uint32_t const cliptype, bool clear = true)
{

14
source/core/savegamehelp.h
View file

@ -64,3 +64,17 @@ inline FSerializer& Serialize(FSerializer& arc, const char* keyname, THitInfo<T>
return arc;
}
template<class T>
inline FSerializer& Serialize(FSerializer& arc, const char* keyname, TCollision<T>& w, TCollision<T>* def)
{
if (arc.BeginObject(keyname))
{
arc("type", w.type);
if (w.type == kHitWall) arc("index", w.hitWall);
else if (w.type == kHitSprite) arc("index", w.hitActor);
else if (w.type == kHitSector) arc("index", w.hitSector);
else if (arc.isReading()) w.hitSector = nullptr;
arc.EndObject();
}
return arc;
}

14
source/games/duke/src/actors.cpp
View file

@ -1504,7 +1504,7 @@ bool queball(DDukeActor *actor, int pocket, int queball, int stripeball)
Collision coll;
auto sect = s->sector();
int j = clipmove_ex(&s->pos, &sect,
int j = clipmove(s->pos, &sect,
(MulScale(s->xvel, bcos(s->ang), 14) * TICSPERFRAME) << 11,
(MulScale(s->xvel, bsin(s->ang), 14) * TICSPERFRAME) << 11,
24L, (4 << 8), (4 << 8), CLIPMASK1, coll);
@ -1512,12 +1512,12 @@ bool queball(DDukeActor *actor, int pocket, int queball, int stripeball)
if (j == kHitWall)
{
int k = getangle(coll.wall()->delta());
int k = getangle(coll.hitWall->delta());
s->ang = ((k << 1) - s->ang) & 2047;
}
else if (j == kHitSprite)
{
fi.checkhitsprite(actor, coll.actor);
fi.checkhitsprite(actor, coll.actor());
}
s->xvel--;
@ -4939,9 +4939,9 @@ void getglobalz(DDukeActor* actor)
getzrange_ex(s->x, s->y, s->z - (FOURSLEIGHT), s->sector(), &actor->ceilingz, hz, &actor->floorz, lz, zr, CLIPMASK0);
s->cstat2 = cc;
if( lz.type == kHitSprite && (lz.actor->s->cstat&48) == 0 )
if( lz.type == kHitSprite && (lz.actor()->s->cstat&48) == 0 )
{
if( badguy(lz.actor) && lz.actor->s->pal != 1)
if( badguy(lz.actor()) && lz.actor()->s->pal != 1)
{
if( s->statnum != STAT_PROJECTILE)
{
@ -4951,14 +4951,14 @@ void getglobalz(DDukeActor* actor)
ssp(actor, CLIPMASK0);
}
}
else if(lz.actor->s->picnum == TILE_APLAYER && badguy(actor) )
else if(lz.actor()->s->picnum == TILE_APLAYER && badguy(actor) )
{
actor->aflags |= SFLAG_NOFLOORSHADOW;
//actor->dispicnum = -4; // No shadows on actors
s->xvel = -256;
ssp(actor, CLIPMASK0);
}
else if(s->statnum == STAT_PROJECTILE && lz.actor->s->picnum == TILE_APLAYER && actor->GetOwner() == actor)
else if(s->statnum == STAT_PROJECTILE && lz.actor()->s->picnum == TILE_APLAYER && actor->GetOwner() == actor)
{
actor->ceilingz = s->sector()->ceilingz;
actor->floorz = s->sector()->floorz;

24
source/games/duke/src/actors_d.cpp
View file

@ -547,7 +547,7 @@ int movesprite_ex_d(DDukeActor* actor, int xchange, int ychange, int zchange, un
if (bg)
{
if (spri->xrepeat > 60)
clipmove_ex(&pos, &dasectp, ((xchange * TICSPERFRAME) << 11), ((ychange * TICSPERFRAME) << 11), 1024, (4 << 8), (4 << 8), cliptype, result);
clipmove(pos, &dasectp, ((xchange * TICSPERFRAME) << 11), ((ychange * TICSPERFRAME) << 11), 1024, (4 << 8), (4 << 8), cliptype, result);
else
{
if (spri->picnum == LIZMAN)
@ -557,7 +557,7 @@ int movesprite_ex_d(DDukeActor* actor, int xchange, int ychange, int zchange, un
else
clipdist = 192;
clipmove_ex(&pos, &dasectp, ((xchange * TICSPERFRAME) << 11), ((ychange * TICSPERFRAME) << 11), clipdist, (4 << 8), (4 << 8), cliptype, result);
clipmove(pos, &dasectp, ((xchange * TICSPERFRAME) << 11), ((ychange * TICSPERFRAME) << 11), clipdist, (4 << 8), (4 << 8), cliptype, result);
}
// conditional code from hell...
@ -582,9 +582,9 @@ int movesprite_ex_d(DDukeActor* actor, int xchange, int ychange, int zchange, un
else
{
if (spri->statnum == STAT_PROJECTILE)
clipmove_ex(&pos, &dasectp, ((xchange * TICSPERFRAME) << 11), ((ychange * TICSPERFRAME) << 11), 8, (4 << 8), (4 << 8), cliptype, result);
clipmove(pos, &dasectp, ((xchange * TICSPERFRAME) << 11), ((ychange * TICSPERFRAME) << 11), 8, (4 << 8), (4 << 8), cliptype, result);
else
clipmove_ex(&pos, &dasectp, ((xchange * TICSPERFRAME) << 11), ((ychange * TICSPERFRAME) << 11), (int)(spri->clipdist << 2), (4 << 8), (4 << 8), cliptype, result);
clipmove(pos, &dasectp, ((xchange * TICSPERFRAME) << 11), ((ychange * TICSPERFRAME) << 11), (int)(spri->clipdist << 2), (4 << 8), (4 << 8), cliptype, result);
}
spri->x = pos.x;
spri->y = pos.y;
@ -1833,7 +1833,7 @@ static void weaponcommon_d(DDukeActor* proj)
{
if (s->picnum == COOLEXPLOSION1)
{
if (coll.type == kHitSprite && coll.actor->s->picnum != APLAYER)
if (coll.type == kHitSprite && coll.actor()->s->picnum != APLAYER)
{
return;
}
@ -1845,11 +1845,11 @@ static void weaponcommon_d(DDukeActor* proj)
if (coll.type == kHitSprite)
{
if (weaponhitsprite(proj, coll.actor, fireball)) return;
if (weaponhitsprite(proj, coll.actor(), fireball)) return;
}
else if (coll.type == kHitWall)
{
if (weaponhitwall(proj, coll.wall(), oldpos)) return;
if (weaponhitwall(proj, coll.hitWall, oldpos)) return;
}
else if (coll.type == kHitSector)
{
@ -2776,14 +2776,14 @@ static void flamethrowerflame(DDukeActor *actor)
s->xvel = s->yvel = s->zvel = 0;
if (coll.type == kHitSprite)
{
fi.checkhitsprite(coll.actor, actor);
if (coll.actor->s->picnum == APLAYER)
S_PlayActorSound(PISTOL_BODYHIT, coll.actor);
fi.checkhitsprite(coll.actor(), actor);
if (coll.actor()->s->picnum == APLAYER)
S_PlayActorSound(PISTOL_BODYHIT, coll.actor());
}
else if (coll.type == kHitWall)
{
setsprite(actor, dax, day, daz);
fi.checkhitwall(actor, coll.wall(), s->x, s->y, s->z, s->picnum);
fi.checkhitwall(actor, coll.hitWall, s->x, s->y, s->z, s->picnum);
}
else if (coll.type == kHitSector)
{
@ -2912,7 +2912,7 @@ static void heavyhbomb(DDukeActor *actor)
if (coll.type== kHitWall)
{
auto wal = coll.wall();
auto wal = coll.hitWall;
fi.checkhitwall(actor, wal, s->x, s->y, s->z, s->picnum);
int k = getangle(wal->delta());

18
source/games/duke/src/actors_r.cpp
View file

@ -391,11 +391,11 @@ int movesprite_ex_r(DDukeActor* actor, int xchange, int ychange, int zchange, un
if (bg)
{
if (spri->xrepeat > 60)
clipmove_ex(&pos, &dasectp, ((xchange * TICSPERFRAME) << 11), ((ychange * TICSPERFRAME) << 11), 1024, (4 << 8), (4 << 8), cliptype, result);
clipmove(pos, &dasectp, ((xchange * TICSPERFRAME) << 11), ((ychange * TICSPERFRAME) << 11), 1024, (4 << 8), (4 << 8), cliptype, result);
else
{
clipdist = 192;
clipmove_ex(&pos, &dasectp, ((xchange * TICSPERFRAME) << 11), ((ychange * TICSPERFRAME) << 11), clipdist, (4 << 8), (4 << 8), cliptype, result);
clipmove(pos, &dasectp, ((xchange * TICSPERFRAME) << 11), ((ychange * TICSPERFRAME) << 11), clipdist, (4 << 8), (4 << 8), cliptype, result);
}
if (dasectp == nullptr || (dasectp != nullptr && actor->actorstayput != nullptr && actor->actorstayput != dasectp))
@ -413,9 +413,9 @@ int movesprite_ex_r(DDukeActor* actor, int xchange, int ychange, int zchange, un
else
{
if (spri->statnum == STAT_PROJECTILE)
clipmove_ex(&pos, &dasectp, ((xchange * TICSPERFRAME) << 11), ((ychange * TICSPERFRAME) << 11), 8, (4 << 8), (4 << 8), cliptype, result);
clipmove(pos, &dasectp, ((xchange * TICSPERFRAME) << 11), ((ychange * TICSPERFRAME) << 11), 8, (4 << 8), (4 << 8), cliptype, result);
else
clipmove_ex(&pos, &dasectp, ((xchange * TICSPERFRAME) << 11), ((ychange * TICSPERFRAME) << 11), 128, (4 << 8), (4 << 8), cliptype, result);
clipmove(pos, &dasectp, ((xchange * TICSPERFRAME) << 11), ((ychange * TICSPERFRAME) << 11), 128, (4 << 8), (4 << 8), cliptype, result);
}
spri->x = pos.x;
spri->y = pos.y;
@ -1446,11 +1446,11 @@ static void weaponcommon_r(DDukeActor *proj)
{
if (coll.type == kHitSprite)
{
if (weaponhitsprite(proj, coll.actor, oldpos)) return;
if (weaponhitsprite(proj, coll.actor(), oldpos)) return;
}
else if (coll.type == kHitWall)
{
if (weaponhitwall(proj, coll.wall(), oldpos)) return;
if (weaponhitwall(proj, coll.hitWall, oldpos)) return;
}
else if (coll.type == kHitSector)
{
@ -2619,7 +2619,7 @@ static void heavyhbomb(DDukeActor *actor)
if (coll.type == kHitWall)
{
auto wal = coll.wall();
auto wal = coll.hitWall;
fi.checkhitwall(actor, wal, s->x, s->y, s->z, s->picnum);
int k = getangle(wal->delta());
@ -2764,12 +2764,12 @@ static int henstand(DDukeActor *actor)
{
if (coll.type == kHitWall)
{
int k = getangle(coll.wall()->delta());
int k = getangle(coll.hitWall->delta());
s->ang = ((k << 1) - s->ang) & 2047;
}
else if (coll.type == kHitSprite)
{
auto hitact = coll.actor;
auto hitact = coll.actor();
fi.checkhitsprite(actor, hitact);
if (hitact->s->picnum == HEN)
{

14
source/games/duke/src/dukeactor.h
View file

@ -181,20 +181,6 @@ inline int movesprite_ex(DDukeActor* actor, int xchange, int ychange, int zchang
return f(actor, xchange, ychange, zchange, cliptype, result);
}
inline int clipmove_ex(vec3_t* pos, int* sect, int xv, int yv, int wal, int ceil, int flor, int ct, Collision& result)
{
int res = clipmove(pos, sect, xv, yv, wal, ceil, flor, ct);
return result.setFromEngine(res);
}
inline int clipmove_ex(vec3_t* pos, sectortype** sect, int xv, int yv, int wal, int ceil, int flor, int ct, Collision& result)
{
int sectno = *sect? sectnum(*sect) : -1;
int res = clipmove(pos, &sectno, xv, yv, wal, ceil, flor, ct);
*sect = sectno == -1? nullptr : &sector[sectno];
return result.setFromEngine(res);
}
inline void getzrange_ex(int x, int y, int z, int sectnum, int32_t* ceilz, Collision& ceilhit, int32_t* florz, Collision& florhit, int32_t walldist, uint32_t cliptype)
{
int ch, fh;

2
source/games/duke/src/player.cpp
View file

@ -606,7 +606,7 @@ void playerisdead(int snum, int psectlotag, int fz, int cz)
}
Collision coll;
clipmove_ex(&p->pos, &p->cursector, 0, 0, 164, (4 << 8), (4 << 8), CLIPMASK0, coll);
clipmove(p->pos, &p->cursector, 0, 0, 164, (4 << 8), (4 << 8), CLIPMASK0, coll);
}
backupplayer(p);

15
source/games/duke/src/player_d.cpp
View file

@ -2781,25 +2781,24 @@ void processinput_d(int snum)
if (chz.type == kHitSprite)
{
if (chz.actor->s->statnum == 1 && chz.actor->s->extra >= 0)
if (chz.actor()->s->statnum == 1 && chz.actor()->s->extra >= 0)
{
chz.type = kHitNone;
chz.actor = nullptr;
chz.setNone();
cz = p->truecz;
}
}
if (clz.type == kHitSprite)
{
if ((clz.actor->s->cstat & 33) == 33)
if ((clz.actor()->s->cstat & 33) == 33)
{
psectlotag = 0;
p->footprintcount = 0;
p->spritebridge = 1;
}
else if (badguy(clz.actor) && clz.actor->s->xrepeat > 24 && abs(s->z - clz.actor->s->z) < (84 << 8))
else if (badguy(clz.actor()) && clz.actor()->s->xrepeat > 24 && abs(s->z - clz.actor()->s->z) < (84 << 8))
{
j = getangle(clz.actor->s->x - p->pos.x, clz.actor->s->y - p->pos.y);
j = getangle(clz.actor()->s->x - p->pos.x, clz.actor()->s->y - p->pos.y);
p->posxv -= bcos(j, 4);
p->posyv -= bsin(j, 4);
}
@ -2960,7 +2959,7 @@ void processinput_d(int snum)
case 0:
if (clz.type == kHitSprite)
j = clz.actor->s->picnum;
j = clz.actor()->s->picnum;
else
j = psectp->floorpicnum;
@ -3042,7 +3041,7 @@ HORIZONLY:
changeactorsect(pact, p->cursector);
}
else
clipmove_ex(&p->pos, &p->cursector, p->posxv, p->posyv, 164, (4 << 8), ii, CLIPMASK0, clip);
clipmove(p->pos, &p->cursector, p->posxv, p->posyv, 164, (4 << 8), ii, CLIPMASK0, clip);
if (p->jetpack_on == 0 && psectlotag != 2 && psectlotag != 1 && shrunk)
p->pos.z += 32 << 8;

73
source/games/duke/src/player_r.cpp
View file

@ -3440,21 +3440,19 @@ void processinput_r(int snum)
if (chz.type == kHitSprite)
{
if (chz.actor->s->statnum == 1 && chz.actor->s->extra >= 0)
if (chz.actor()->s->statnum == 1 && chz.actor()->s->extra >= 0)
{
chz.type = kHitNone;
chz.actor = nullptr;
chz.setNone();
cz = p->truecz;
}
else if (chz.actor->s->picnum == LADDER)
else if (chz.actor()->s->picnum == LADDER)
{
if (!p->stairs)
{
p->stairs = 10;
if ((actions & SB_JUMP) && !p->OnMotorcycle)
{
chz.type = kHitNone;
chz.actor = nullptr;
chz.setNone();
cz = p->truecz;
}
}
@ -3465,51 +3463,50 @@ void processinput_r(int snum)
if (clz.type == kHitSprite)
{
if ((clz.actor->s->cstat & 33) == 33)
if ((clz.actor()->s->cstat & 33) == 33)
{
psectlotag = 0;
p->footprintcount = 0;
p->spritebridge = 1;
}
if (p->OnMotorcycle)
if (badguy(clz.actor))
if (badguy(clz.actor()))
{
clz.actor->picnum = MOTOHIT;
clz.actor->extra = xs_CRoundToInt(2 + (p->MotoSpeed / 2.));
clz.actor()->picnum = MOTOHIT;
clz.actor()->extra = xs_CRoundToInt(2 + (p->MotoSpeed / 2.));
p->MotoSpeed -= p->MotoSpeed / 16.;
}
if (p->OnBoat)
{
if (badguy(clz.actor))
if (badguy(clz.actor()))
{
clz.actor->picnum = MOTOHIT;
clz.actor->extra = xs_CRoundToInt(2 + (p->MotoSpeed / 2.));
clz.actor()->picnum = MOTOHIT;
clz.actor()->extra = xs_CRoundToInt(2 + (p->MotoSpeed / 2.));
p->MotoSpeed -= p->MotoSpeed / 16.;
}
}
else if (badguy(clz.actor) && clz.actor->s->xrepeat > 24 && abs(s->z - clz.actor->s->z) < (84 << 8))
else if (badguy(clz.actor()) && clz.actor()->s->xrepeat > 24 && abs(s->z - clz.actor()->s->z) < (84 << 8))
{
int j = getangle(clz.actor->s->x - p->pos.x, clz.actor->s->y - p->pos.y);
int j = getangle(clz.actor()->s->x - p->pos.x, clz.actor()->s->y - p->pos.y);
p->posxv -= bcos(j, 4);
p->posyv -= bsin(j, 4);
}
if (clz.actor->s->picnum == LADDER)
if (clz.actor()->s->picnum == LADDER)
{
if (!p->stairs)
{
p->stairs = 10;
if ((actions & SB_CROUCH) && !p->OnMotorcycle)
{
cz = clz.actor->s->z;
chz.type = kHitNone;
chz.actor = nullptr;
fz = clz.actor->s->z + (4 << 8);
cz = clz.actor()->s->z;
chz.setNone();
fz = clz.actor()->s->z + (4 << 8);
}
}
else
p->stairs--;
}
else if (clz.actor->s->picnum == TOILET || clz.actor->s->picnum == RRTILE2121)
else if (clz.actor()->s->picnum == TOILET || clz.actor()->s->picnum == RRTILE2121)
{
if ((actions & SB_CROUCH) && !p->OnMotorcycle)
//if (Sound[436].num == 0)
@ -3689,7 +3686,7 @@ void processinput_r(int snum)
case 0:
if (clz.type == kHitSprite)
j = clz.actor->s->picnum;
j = clz.actor()->s->picnum;
else j = psectp->floorpicnum;
break;
case 1:
@ -3801,7 +3798,7 @@ HORIZONLY:
changeactorsect(pact, p->cursector);
}
else
clipmove_ex(&p->pos, &p->cursector, p->posxv, p->posyv, 164, (4 << 8), i, CLIPMASK0, clip);
clipmove(p->pos, &p->cursector, p->posxv, p->posyv, 164, (4 << 8), i, CLIPMASK0, clip);
if (p->jetpack_on == 0 && psectlotag != 2 && psectlotag != 1 && shrunk)
p->pos.z += 32 << 8;
@ -3814,7 +3811,7 @@ HORIZONLY:
if (clip.type == kHitWall)
{
auto wal = clip.wall();
auto wal = clip.hitWall;
if (p->OnMotorcycle)
{
onMotorcycleMove(snum, wal);
@ -3829,7 +3826,7 @@ HORIZONLY:
{
if (wal->lotag < 44)
{
dofurniture(clip.wall(), p->cursector, snum);
dofurniture(clip.hitWall, p->cursector, snum);
pushmove(&p->pos, &p->cursector, 172L, (4L << 8), (4L << 8), CLIPMASK0);
}
else
@ -3842,39 +3839,39 @@ HORIZONLY:
{
if (p->OnMotorcycle)
{
onMotorcycleHit(snum, clip.actor);
onMotorcycleHit(snum, clip.actor());
}
else if (p->OnBoat)
{
onBoatHit(snum, clip.actor);
onBoatHit(snum, clip.actor());
}
else if (badguy(clip.actor))
else if (badguy(clip.actor()))
{
if (clip.actor->s->statnum != 1)
if (clip.actor()->s->statnum != 1)
{
clip.actor->timetosleep = 0;
if (clip.actor->s->picnum == BILLYRAY)
S_PlayActorSound(404, clip.actor);
clip.actor()->timetosleep = 0;
if (clip.actor()->s->picnum == BILLYRAY)
S_PlayActorSound(404, clip.actor());
else
check_fta_sounds_r(clip.actor);
changeactorstat(clip.actor, 1);
check_fta_sounds_r(clip.actor());
changeactorstat(clip.actor(), 1);
}
}
else if (!isRRRA() && clip.actor->s->picnum == RRTILE3410)
else if (!isRRRA() && clip.actor()->s->picnum == RRTILE3410)
{
quickkill(p);
S_PlayActorSound(446, pact);
}
if (isRRRA())
{
if (clip.actor->s->picnum == RRTILE3410)
if (clip.actor()->s->picnum == RRTILE3410)
{
quickkill(p);
S_PlayActorSound(446, pact);
}
else if (clip.actor->s->picnum == RRTILE2443 && clip.actor->s->pal == 19)
else if (clip.actor()->s->picnum == RRTILE2443 && clip.actor()->s->pal == 19)
{
clip.actor->s->pal = 0;
clip.actor()->s->pal = 0;
p->DrugMode = 5;
ps[snum].GetActor()->s->extra = gs.max_player_health;
}

8
source/games/duke/src/prediction.cpp
View file

@ -165,7 +165,7 @@ void fakedomovethings(void)
if(chz.type == kHitSprite)
{
if (chz.actor->s.statnum == 1 && chz.actor->s.extra >= 0)
if (chz.actor()->s.statnum == 1 && chz.actor()->s.extra >= 0)
{
chz.type = kHitNone;
cz = getceilzofslope(psect,myx,myy);
@ -174,14 +174,14 @@ void fakedomovethings(void)
if (clz.type == kHitSprite)
{
if ((clz.actor->s.cstat&33) == 33)
if ((clz.actor()->s.cstat&33) == 33)
{
psectlotag = 0;
spritebridge = 1;
}
if(badguy(chz.actor) && chz.actor->s.xrepeat > 24 && abs(p->GetActor()->s.z- chz.actor->s.z) < (84<<8) )
if(badguy(chz.actor) && chz.actor()->s.xrepeat > 24 && abs(p->GetActor()->s.z- chz.actor()->s.z) < (84<<8) )
{
j = getangle(chz.actor->s.x-myx, chz.actor->s.y-myy);
j = getangle(chz.actor()->s.x-myx, chz.actor()->s.y-myy);
myxvel -= bcos(j, 4);
myyvel -= bsin(j, 4);
}

4
source/games/duke/src/sectors_d.cpp
View file

@ -899,7 +899,7 @@ void checkplayerhurt_d(struct player_struct* p, const Collision& coll)
{
if (coll.type == kHitSprite)
{
switch (coll.actor->s->picnum)
switch (coll.actor()->s->picnum)
{
case CACTUS:
if (p->hurt_delay < 8)
@ -915,7 +915,7 @@ void checkplayerhurt_d(struct player_struct* p, const Collision& coll)
}
if (coll.type != kHitWall) return;
auto wal = coll.wall();
auto wal = coll.hitWall;
if (p->hurt_delay > 0) p->hurt_delay--;
else if (wal->cstat & 85) switch (wal->overpicnum)

4
source/games/duke/src/sectors_r.cpp
View file

@ -1382,7 +1382,7 @@ void checkplayerhurt_r(struct player_struct* p, const Collision &coll)
{
if (coll.type == kHitSprite)
{
switch (coll.actor->s->picnum)
switch (coll.actor()->s->picnum)
{
case RRTILE2430:
case RRTILE2431:
@ -1413,7 +1413,7 @@ void checkplayerhurt_r(struct player_struct* p, const Collision &coll)
}
if (coll.type != kHitWall) return;
auto wal = coll.wall();
auto wal = coll.hitWall;
if (p->hurt_delay > 0) p->hurt_delay--;
else if (wal->cstat & 85) switch (wal->overpicnum)

81
source/games/duke/src/types.h
View file

@ -104,6 +104,7 @@ inline DDukeActor* DDukeActor::array() { return hittype; }
// subclassed to add a game specific actor() method
using HitInfo = THitInfo<DDukeActor>;
using Collision = TCollision<DDukeActor>;
struct animwalltype
{
@ -332,85 +333,5 @@ struct Cycler
bool state;
};
// Wrapper around the insane collision info mess from Build.
struct Collision
{
int type;
int index;
int legacyVal; // should be removed later, but needed for converting back for unadjusted code.
DDukeActor* actor;
Collision() = default;
explicit Collision(int v)
{
setFromEngine(v);
}
int setNone()
{
type = kHitNone;
index = -1;
legacyVal = 0;
actor = nullptr;
return kHitNone;
}
int setSector(int num)
{
type = kHitSector;
index = num;
legacyVal = type | index;
actor = nullptr;
return kHitSector;
}
int setSector(sectortype* sec)
{
type = kHitSector;
index = ::sector.IndexOf(sec);
legacyVal = type | index;
actor = nullptr;
return kHitSector;
}
int setWall(int num)
{
type = kHitWall;
index = num;
legacyVal = type | index;
actor = nullptr;
return kHitWall;
}
int setSprite(DDukeActor* num)
{
type = kHitSprite;
index = -1;
legacyVal = type | int(num - hittype);
actor = num;
return kHitSprite;
}
int setFromEngine(int value)
{
legacyVal = value;
type = value & kHitTypeMask;
if (type == 0) { index = -1; actor = nullptr; }
else if (type != kHitSprite) { index = value & kHitIndexMask; actor = nullptr; }
else { index = -1; actor = &hittype[value & kHitIndexMask]; }
return type;
}
walltype* wall() const
{
assert(type == kHitWall);
return &::wall[index];
}
sectortype* sector() const
{
assert(type == kHitSector);
return &::sector[index];
}
};
END_DUKE_NS