teambeef/raze
0
0
Fork 0
mirror of https://github.com/DrBeef/Raze.git synced 2025-04-05 15:30:49 +00:00
Code Issues Projects Releases Packages Wiki Activity

- add_int_zvel with -

Browse source
This commit is contained in:
Christoph Oelckers 2022-09-01 00:36:57 +02:00
parent 8bfedc327f
commit 588af5aa71
7 changed files with 17 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1004,7 +1004,7 @@ void movetrash(DDukeActor *actor)
if (ssp(actor, CLIPMASK0))
{
makeitfall(actor);
if (krand() & 1) actor->spr.zvel -= 256;
if (krand() & 1) actor->add_int_zvel(- 256);
if (abs(actor->spr.xvel) < 48)
actor->spr.xvel += (krand() & 3);
}
@ -2382,7 +2382,7 @@ void shell(DDukeActor* actor, bool morecheck)
actor->temp_data[0] &= 3;
}
if (actor->int_zvel() < 128) actor->add_int_zvel( (gs.gravity / 13)); // 8
else actor->spr.zvel -= 64;
else actor->add_int_zvel(- 64);
if (actor->spr.xvel > 0)
actor->spr.xvel -= 4;
else actor->spr.xvel = 0;

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

@ -2400,7 +2400,7 @@ static void greenslime(DDukeActor *actor)
if (actor->spr.yrepeat < 40) actor->spr.yrepeat += 8;
if (actor->spr.xrepeat > 8) actor->spr.xrepeat -= 4;
if (actor->int_zvel() > -(2048 + 1024))
actor->spr.zvel -= 348;
actor->add_int_zvel(- 348);
actor->add_int_z(actor->int_zvel());
if (actor->spr.pos.Z < actor->ceilingz + 16)
{
@ -3526,7 +3526,7 @@ void move_d(DDukeActor *actor, int playernum, int xvel)
if ((a & jumptoplayer) == jumptoplayer)
{
if (actor->temp_data[0] < 16)
actor->spr.zvel -= bcos(actor->temp_data[0] << 4, -5);
actor->add_int_zvel(- bcos(actor->temp_data[0] << 4, -5));
}
if (a & face_player_smart)

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

@ -3533,12 +3533,12 @@ void move_r(DDukeActor *actor, int pnum, int xvel)
if (actor->spr.picnum == CHEER)
{
if (actor->temp_data[0] < 16)
actor->spr.zvel -= bcos(actor->temp_data[0] << 4) / 40;
actor->add_int_zvel(- bcos(actor->temp_data[0] << 4) / 40);
}
else
{
if (actor->temp_data[0] < 16)
actor->spr.zvel -= bcos(actor->temp_data[0] << 4, -5);
actor->add_int_zvel(- bcos(actor->temp_data[0] << 4, -5));
}
}
if (a & justjump1)
@ -3546,12 +3546,12 @@ void move_r(DDukeActor *actor, int pnum, int xvel)
if (actor->spr.picnum == RABBIT)
{
if (actor->temp_data[0] < 8)
actor->spr.zvel -= bcos(actor->temp_data[0] << 4) / 30;
actor->add_int_zvel(- bcos(actor->temp_data[0] << 4) / 30);
}
else if (actor->spr.picnum == MAMA)
{
if (actor->temp_data[0] < 8)
actor->spr.zvel -= bcos(actor->temp_data[0] << 4) / 35;
actor->add_int_zvel(- bcos(actor->temp_data[0] << 4) / 35);
}
}
if (a & justjump2)
@ -3559,24 +3559,24 @@ void move_r(DDukeActor *actor, int pnum, int xvel)
if (actor->spr.picnum == RABBIT)
{
if (actor->temp_data[0] < 8)
actor->spr.zvel -= bcos(actor->temp_data[0] << 4) / 24;
actor->add_int_zvel(- bcos(actor->temp_data[0] << 4) / 24);
}
else if (actor->spr.picnum == MAMA)
{
if (actor->temp_data[0] < 8)
actor->spr.zvel -= bcos(actor->temp_data[0] << 4) / 28;
actor->add_int_zvel(- bcos(actor->temp_data[0] << 4) / 28);
}
}
if (a & windang)
{
if (actor->temp_data[0] < 8)
actor->spr.zvel -= bcos(actor->temp_data[0] << 4) / 24;
actor->add_int_zvel(- bcos(actor->temp_data[0] << 4) / 24);
}
}
else if ((a & jumptoplayer) == jumptoplayer)
{
if (actor->temp_data[0] < 16)
actor->spr.zvel -= bcos(actor->temp_data[0] << 4, -5);
actor->add_int_zvel(- bcos(actor->temp_data[0] << 4, -5));
}

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

@ -743,7 +743,7 @@ static void shootrpg(DDukeActor *actor, int p, int sx, int sy, int sz, int sa, i
spawned->spr.yvel = gs.numfreezebounces;
spawned->spr.xrepeat >>= 1;
spawned->spr.yrepeat >>= 1;
spawned->spr.zvel -= (2 << 4);
spawned->add_int_zvel(- (2 << 4));
}
if (p == -1)

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

@ -695,7 +695,7 @@ static void shootrpg(DDukeActor* actor, int p, int sx, int sy, int sz, int sa, i
spawned->spr.yvel = gs.numfreezebounces;
spawned->spr.xrepeat >>= 1;
spawned->spr.yrepeat >>= 1;
spawned->spr.zvel -= (2 << 4);
spawned->add_int_zvel(- (2 << 4));
}
if (p == -1)

4
source/games/exhumed/src/move.cpp
View file

@ -580,14 +580,14 @@ void Gravity(DExhumedActor* pActor)
}
else
{
pActor->spr.zvel -= 64;
pActor->add_int_zvel(- 64);
}
}
else
{
if (pActor->int_zvel() > 0)
{
pActor->spr.zvel -= 64;
pActor->add_int_zvel(- 64);
if (pActor->int_zvel() < 0) {
pActor->set_int_zvel(0);
}

2
source/games/exhumed/src/runlist.cpp
View file

@ -1657,7 +1657,7 @@ int runlist_CheckRadialDamage(DExhumedActor* pActor)
pActor->spr.xvel += (edi * bcos(nAngle)) >> 3;
pActor->spr.yvel += (edi * bsin(nAngle)) >> 3;
pActor->spr.zvel -= edi * 24;
pActor->add_int_zvel(- edi * 24);
if (pActor->int_zvel() < -3584) {
pActor->set_int_zvel(-3584);