zdoom/raze
0
0
Fork 0
mirror of https://github.com/ZDoom/Raze.git synced 2025-01-31 04:20:42 +00:00
Code Issues Projects Releases Packages Wiki Activity

- movesprite handled

Browse source
This commit is contained in:
Christoph Oelckers 2021-11-21 09:05:58 +01:00
parent 3bd1272e08
commit 714b5ac872
3 changed files with 25 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
source/core/automap.cpp
View file

@ -295,7 +295,7 @@ void ClearAutomap()
void MarkSectorSeen(int i) void MarkSectorSeen(int i)
{ {
if (i >= 0) if (validSectorIndex(i))
{ {
show2dsector.Set(i); show2dsector.Set(i);
auto wal = &wall[sector[i].wallptr]; auto wal = &wall[sector[i].wallptr];

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

@ -526,8 +526,6 @@ void hitradius_d(DDukeActor* actor, int r, int hp1, int hp2, int hp3, int h
int movesprite_ex_d(DDukeActor* actor, int xchange, int ychange, int zchange, unsigned int cliptype, Collision &result) int movesprite_ex_d(DDukeActor* actor, int xchange, int ychange, int zchange, unsigned int cliptype, Collision &result)
{ {
int clipdist; int clipdist;
int dasectnum;
auto spri = actor->s; auto spri = actor->s;
int bg = badguy(actor); int bg = badguy(actor);
@ -541,7 +539,6 @@ int movesprite_ex_d(DDukeActor* actor, int xchange, int ychange, int zchange, un
return result.setNone(); return result.setNone();
} }
dasectnum = spri->sectnum;
auto dasectp = spri->sector(); auto dasectp = spri->sector();
vec3_t pos = spri->pos; vec3_t pos = spri->pos;
@ -550,7 +547,7 @@ int movesprite_ex_d(DDukeActor* actor, int xchange, int ychange, int zchange, un
if (bg) if (bg)
{ {
if (spri->xrepeat > 60) if (spri->xrepeat > 60)
clipmove_ex(&pos, &dasectnum, ((xchange * TICSPERFRAME) << 11), ((ychange * TICSPERFRAME) << 11), 1024, (4 << 8), (4 << 8), cliptype, result); clipmove_ex(&pos, &dasectp, ((xchange * TICSPERFRAME) << 11), ((ychange * TICSPERFRAME) << 11), 1024, (4 << 8), (4 << 8), cliptype, result);
else else
{ {
if (spri->picnum == LIZMAN) if (spri->picnum == LIZMAN)
@ -560,11 +557,11 @@ int movesprite_ex_d(DDukeActor* actor, int xchange, int ychange, int zchange, un
else else
clipdist = 192; clipdist = 192;
clipmove_ex(&pos, &dasectnum, ((xchange * TICSPERFRAME) << 11), ((ychange * TICSPERFRAME) << 11), clipdist, (4 << 8), (4 << 8), cliptype, result); clipmove_ex(&pos, &dasectp, ((xchange * TICSPERFRAME) << 11), ((ychange * TICSPERFRAME) << 11), clipdist, (4 << 8), (4 << 8), cliptype, result);
} }
// conditional code from hell... // conditional code from hell...
if (dasectnum < 0 || (dasectnum >= 0 && if (dasectp == nullptr || (dasectp != nullptr &&
((actor->actorstayput != nullptr && actor->actorstayput != dasectp) || ((actor->actorstayput != nullptr && actor->actorstayput != dasectp) ||
((spri->picnum == BOSS2) && spri->pal == 0 && dasectp->lotag != 3) || ((spri->picnum == BOSS2) && spri->pal == 0 && dasectp->lotag != 3) ||
((spri->picnum == BOSS1 || spri->picnum == BOSS2) && dasectp->lotag == ST_1_ABOVE_WATER) || ((spri->picnum == BOSS1 || spri->picnum == BOSS2) && dasectp->lotag == ST_1_ABOVE_WATER) ||
@ -572,34 +569,34 @@ int movesprite_ex_d(DDukeActor* actor, int xchange, int ychange, int zchange, un
)) ))
) )
{ {
if (dasectp->lotag == ST_1_ABOVE_WATER && spri->picnum == LIZMAN) if (dasectp && dasectp->lotag == ST_1_ABOVE_WATER && spri->picnum == LIZMAN)
spri->ang = (krand()&2047); spri->ang = (krand()&2047);
else if ((actor->temp_data[0]&3) == 1 && spri->picnum != COMMANDER) else if ((actor->temp_data[0]&3) == 1 && spri->picnum != COMMANDER)
spri->ang = (krand()&2047); spri->ang = (krand()&2047);
setsprite(actor,spri->pos); setsprite(actor,spri->pos);
if (dasectnum < 0) dasectnum = 0; if (dasectp == nullptr) dasectp = &sector[0];
return result.setSector(dasectnum); return result.setSector(dasectp);
} }
if ((result.type == kHitWall || result.type == kHitSprite) && (actor->cgg == 0)) spri->ang += 768; if ((result.type == kHitWall || result.type == kHitSprite) && (actor->cgg == 0)) spri->ang += 768;
} }
else else
{ {
if (spri->statnum == STAT_PROJECTILE) if (spri->statnum == STAT_PROJECTILE)
clipmove_ex(&pos, &dasectnum, ((xchange * TICSPERFRAME) << 11), ((ychange * TICSPERFRAME) << 11), 8, (4 << 8), (4 << 8), cliptype, result); clipmove_ex(&pos, &dasectp, ((xchange * TICSPERFRAME) << 11), ((ychange * TICSPERFRAME) << 11), 8, (4 << 8), (4 << 8), cliptype, result);
else else
clipmove_ex(&pos, &dasectnum, ((xchange * TICSPERFRAME) << 11), ((ychange * TICSPERFRAME) << 11), (int)(spri->clipdist << 2), (4 << 8), (4 << 8), cliptype, result); clipmove_ex(&pos, &dasectp, ((xchange * TICSPERFRAME) << 11), ((ychange * TICSPERFRAME) << 11), (int)(spri->clipdist << 2), (4 << 8), (4 << 8), cliptype, result);
} }
spri->x = pos.x; spri->x = pos.x;
spri->y = pos.y; spri->y = pos.y;
if (dasectnum >= 0) if (dasectp != nullptr)
if ((dasectnum != spri->sectnum)) if (dasectp != spri->sector())
changeactorsect(actor, dasectnum); changeactorsect(actor, dasectp);
int daz = spri->z + ((zchange * TICSPERFRAME) >> 3); int daz = spri->z + ((zchange * TICSPERFRAME) >> 3);
if ((daz > actor->ceilingz) && (daz <= actor->floorz)) if ((daz > actor->ceilingz) && (daz <= actor->floorz))
spri->z = daz; spri->z = daz;
else if (result.type == kHitNone) else if (result.type == kHitNone)
return result.setSector(dasectnum); return result.setSector(dasectp);
return result.type; return result.type;
} }

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

@ -369,7 +369,6 @@ void hitradius_r(DDukeActor* actor, int r, int hp1, int hp2, int hp3, int h
int movesprite_ex_r(DDukeActor* actor, int xchange, int ychange, int zchange, unsigned int cliptype, Collision &result) int movesprite_ex_r(DDukeActor* actor, int xchange, int ychange, int zchange, unsigned int cliptype, Collision &result)
{ {
int dasectnum;
int clipdist; int clipdist;
auto spri = actor->s; auto spri = actor->s;
int bg = badguy(actor); int bg = badguy(actor);
@ -384,7 +383,6 @@ int movesprite_ex_r(DDukeActor* actor, int xchange, int ychange, int zchange, un
return result.setNone(); return result.setNone();
} }
dasectnum = spri->sectnum;
auto dasectp = spri->sector(); auto dasectp = spri->sector();
vec3_t pos = spri->pos; vec3_t pos = spri->pos;
@ -393,43 +391,43 @@ int movesprite_ex_r(DDukeActor* actor, int xchange, int ychange, int zchange, un
if (bg) if (bg)
{ {
if (spri->xrepeat > 60) if (spri->xrepeat > 60)
clipmove_ex(&pos, &dasectnum, ((xchange * TICSPERFRAME) << 11), ((ychange * TICSPERFRAME) << 11), 1024, (4 << 8), (4 << 8), cliptype, result); clipmove_ex(&pos, &dasectp, ((xchange * TICSPERFRAME) << 11), ((ychange * TICSPERFRAME) << 11), 1024, (4 << 8), (4 << 8), cliptype, result);
else else
{ {
clipdist = 192; clipdist = 192;
clipmove_ex(&pos, &dasectnum, ((xchange * TICSPERFRAME) << 11), ((ychange * TICSPERFRAME) << 11), clipdist, (4 << 8), (4 << 8), cliptype, result); clipmove_ex(&pos, &dasectp, ((xchange * TICSPERFRAME) << 11), ((ychange * TICSPERFRAME) << 11), clipdist, (4 << 8), (4 << 8), cliptype, result);
} }
if (dasectnum < 0 || (dasectnum >= 0 && actor->actorstayput != nullptr && actor->actorstayput != dasectp)) if (dasectp == nullptr || (dasectp != nullptr && actor->actorstayput != nullptr && actor->actorstayput != dasectp))
{ {
if (dasectp->lotag == ST_1_ABOVE_WATER) if (dasectp && dasectp->lotag == ST_1_ABOVE_WATER)
spri->ang = (krand() & 2047); spri->ang = (krand() & 2047);
else if ((actor->temp_data[0] & 3) == 1) else if ((actor->temp_data[0] & 3) == 1)
spri->ang = (krand() & 2047); spri->ang = (krand() & 2047);
setsprite(actor, spri->pos); setsprite(actor, spri->pos);
if (dasectnum < 0) dasectnum = 0; if (dasectp == nullptr) dasectp = &sector[0];
return result.setSector(dasectnum); return result.setSector(dasectp);
} }
if ((result.type == kHitSector || result.type == kHitSprite) && (actor->cgg == 0)) spri->ang += 768; if ((result.type == kHitSector || result.type == kHitSprite) && (actor->cgg == 0)) spri->ang += 768;
} }
else else
{ {
if (spri->statnum == STAT_PROJECTILE) if (spri->statnum == STAT_PROJECTILE)
clipmove_ex(&pos, &dasectnum, ((xchange * TICSPERFRAME) << 11), ((ychange * TICSPERFRAME) << 11), 8, (4 << 8), (4 << 8), cliptype, result); clipmove_ex(&pos, &dasectp, ((xchange * TICSPERFRAME) << 11), ((ychange * TICSPERFRAME) << 11), 8, (4 << 8), (4 << 8), cliptype, result);
else else
clipmove_ex(&pos, &dasectnum, ((xchange * TICSPERFRAME) << 11), ((ychange * TICSPERFRAME) << 11), 128, (4 << 8), (4 << 8), cliptype, result); clipmove_ex(&pos, &dasectp, ((xchange * TICSPERFRAME) << 11), ((ychange * TICSPERFRAME) << 11), 128, (4 << 8), (4 << 8), cliptype, result);
} }
spri->x = pos.x; spri->x = pos.x;
spri->y = pos.y; spri->y = pos.y;
if (dasectnum >= 0) if (dasectp)
if ((dasectnum != spri->sectnum)) if ((dasectp != spri->sector()))
changeactorsect(actor, dasectnum); changeactorsect(actor, dasectp);
int daz = spri->z + ((zchange * TICSPERFRAME) >> 3); int daz = spri->z + ((zchange * TICSPERFRAME) >> 3);
if ((daz > actor->ceilingz) && (daz <= actor->floorz)) if ((daz > actor->ceilingz) && (daz <= actor->floorz))
spri->z = daz; spri->z = daz;
else if (result.type == kHitNone) else if (result.type == kHitNone)
return result.setSector(dasectnum); return result.setSector(dasectp);
return result.type; return result.type;
} }