teambeef/raze
0
0
Fork 0
mirror of https://github.com/DrBeef/Raze.git synced 2025-01-31 21:20:39 +00:00
Code Issues Projects Releases Packages Wiki Activity

- manual repeats in Duke.

Browse source
This commit is contained in:
Christoph Oelckers 2022-10-06 00:08:51 +02:00
parent adb3cb888e
commit cf5d787f40
3 changed files with 18 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -248,7 +248,6 @@ void insertspriteq(DDukeActor* const actor)
if (spriteq[spriteqloc] != nullptr)
{
// todo: Make list size a CVAR.
spriteq[spriteqloc]->spr.xrepeat = 0;
deletesprite(spriteq[spriteqloc]);
}
spriteq[spriteqloc] = actor;
@ -1064,9 +1063,8 @@ void movewaterdrip(DDukeActor *actor, int drip)
void movedoorshock(DDukeActor* actor)
{
auto sectp = actor->sector();
int j = int(abs(sectp->ceilingz - sectp->floorz) * 0.5);
actor->spr.yrepeat = j + 4;
actor->spr.xrepeat = 16;
double j = abs(sectp->ceilingz - sectp->floorz) / 128.;
actor->spr.SetScale(0.25, 0.0625 + j);
actor->spr.pos.Z = sectp->floorz;
}
@ -1355,8 +1353,7 @@ void rpgexplode(DDukeActor *actor, int hit, const DVector3 &pos, int EXPLOSION2,
if (actor->spr.xrepeat < 10)
{
explosion->spr.xrepeat = 6;
explosion->spr.yrepeat = 6;
explosion->spr.SetScale(0.09375, 0.09375);
}
else if (hit == kHitSector)
{
@ -1787,15 +1784,10 @@ void ooz(DDukeActor *actor)
{
getglobalz(actor);
int j = int(actor->floorz - actor->ceilingz) >> 1;
if (j > 255) j = 255;
double y = min((actor->floorz - actor->ceilingz) / 128, 4.);
double x = clamp(0.390625 - y * 0.5, 0.125, 0.75);
int x = 25 - (j >> 1);
if (x < 8) x = 8;
else if (x > 48) x = 48;
actor->spr.yrepeat = j;
actor->spr.xrepeat = x;
actor->spr.SetScale(x, y);
actor->spr.pos.Z = actor->floorz;
}
@ -2013,11 +2005,9 @@ void forcesphereexplode(DDukeActor *actor)
actor->spr.pos = Owner->spr.pos;;
actor->spr.angle += mapangle(Owner->temp_data[0]);
if (l > 64) l = 64;
else if (l < 1) l = 1;
double s = clamp(l, 1, 64) * REPEAT_SCALE;
actor->spr.xrepeat = l;
actor->spr.yrepeat = l;
actor->spr.SetScale(s, s);
actor->spr.shade = (l >> 1) - 48;
for (int j = actor->temp_data[0]; j > 0; j--)
@ -4603,7 +4593,8 @@ void handle_se130(DDukeActor *actor, int countmax, int EXPLOSION2)
auto k = spawn(actor, EXPLOSION2);
if (k)
{
k->spr.xrepeat = k->spr.yrepeat = 2 + (krand() & 7);
double s = 0.03125 + (krand() & 7) * REPEAT_SCALE;
k->spr.SetScale(s, s);
k->spr.pos.Z = sc->floorz + krandf(x);
k->spr.angle += DAngle45 - randomAngle(90);
k->vel.X = krandf(8);

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

@ -2024,8 +2024,7 @@ static void underwater(int snum, ESyncBits actions, double floorz, double ceilin
if (j)
{
j->spr.pos += (p->angle.ang.ToVector() + DVector2(4 - (global_random & 8), 4 - (global_random & 8))) * 16;
j->spr.xrepeat = 3;
j->spr.yrepeat = 2;
j->spr.SetScale(0.046875, 0.3125);
j->spr.pos.Z = p->pos.Z + 8;
}
}

9
source/games/duke/src/spawn_d.cpp
View file

@ -144,9 +144,14 @@ DDukeActor* spawninit_d(DDukeActor* actj, DDukeActor* act, TArray<DDukeActor*>*
if (actj)
{
SetActor(act, actj->spr.pos);
act->spr.xrepeat = act->spr.yrepeat = 8 + (krand() & 7);
double s = 0.125 + (krand() & 7) * REPEAT_SCALE;
act->spr.SetScale(s, s);
}
else
{
double s = 0.25 + (krand() & 15) * REPEAT_SCALE;
act->spr.SetScale(s, s);
}
else act->spr.xrepeat = act->spr.yrepeat = 16 + (krand() & 15);
act->spr.shade = -16;
act->spr.cstat |= CSTAT_SPRITE_YCENTER;