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

- right shifts

Browse source
This commit is contained in:
Christoph Oelckers 2022-09-01 17:00:11 +02:00
parent ec88d1ea6c
commit 33eeb8d9c2
11 changed files with 21 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1511,7 +1511,7 @@ static void weaponcommon_d(DDukeActor* proj)
if (proj->spr.picnum == RPG && proj->sector()->lotag == 2)
{
k = proj->spr.xvel >> 1;
k = proj->int_xvel() >> 1;
ll = proj->int_zvel() >> 1;
}
else
@ -1980,7 +1980,7 @@ void movetransports_d(void)
auto k = spawn(act2, WATERSPLASH2);
if (k && sectlotag == 1 && act2->spr.statnum == 4)
{
k->set_int_xvel(act2->spr.xvel >> 1);
k->set_int_xvel(act2->int_xvel() >> 1);
k->spr.angle = act2->spr.angle;
ssp(k, CLIPMASK0);
}

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

@ -1177,12 +1177,12 @@ static void weaponcommon_r(DDukeActor *proj)
if (proj->spr.picnum == RPG && proj->sector()->lotag == 2)
{
k = proj->spr.xvel >> 1;
k = proj->int_xvel() >> 1;
ll = proj->int_zvel() >> 1;
}
else if (isRRRA() && proj->spr.picnum == RPG2 && proj->sector()->lotag == 2)
{
k = proj->spr.xvel >> 1;
k = proj->int_xvel() >> 1;
ll = proj->int_zvel() >> 1;
}
else
@ -1657,7 +1657,7 @@ void movetransports_r(void)
auto spawned = spawn(act2, WATERSPLASH2);
if (spawned && sectlotag == 1 && act2->spr.statnum == 4)
{
spawned->set_int_xvel(act2->spr.xvel >> 1);
spawned->set_int_xvel(act2->int_xvel() >> 1);
spawned->spr.angle = act2->spr.angle;
ssp(spawned, CLIPMASK0);
}

2
source/games/duke/src/inlines.h
View file

@ -226,7 +226,7 @@ inline void hud_draw(double x, double y, int tilenum, int shade, int orientation
inline void animateshrunken(player_struct* p, double weapon_xoffset, double looking_arc, double look_anghalf, int tilenum, int8_t shade, int o, double smoothratio)
{
const double fistsign = bsinf(interpolatedvaluef(p->ofistsign, p->fistsign, smoothratio), -10);
if (p->jetpack_on == 0) looking_arc += 32 - (p->GetActor()->spr.xvel >> 1);
if (p->jetpack_on == 0) looking_arc += 32 - (p->GetActor()->int_xvel() >> 1);
hud_draw(weapon_xoffset + fistsign + 250 - look_anghalf, looking_arc + 258 - fabs(fistsign * 4), tilenum, shade, o);
hud_draw(weapon_xoffset - fistsign + 40 - look_anghalf, looking_arc + 200 + fabs(fistsign * 4), tilenum, shade, o | 4);
}

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

@ -2863,7 +2863,7 @@ void processinput_d(int snum)
p->playerweaponsway(pact->spr.xvel);
pact->set_int_xvel(int(clamp((p->pos.XY() - p->bobpos).Length(), 0., 32.) * worldtoint));
if (p->on_ground) p->bobcounter += p->GetActor()->spr.xvel >> 1;
if (p->on_ground) p->bobcounter += p->GetActor()->int_xvel() >> 1;
p->backuppos(ud.clipping == 0 && ((p->insector() && p->cursector->floorpicnum == MIRROR) || !p->insector()));

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

@ -3582,7 +3582,7 @@ void processinput_r(int snum)
p->playerweaponsway(pact->spr.xvel);
pact->set_int_xvel(int(clamp((p->pos.XY() - p->bobpos).Length(), 0., 32.) * worldtoint));
if (p->on_ground) p->bobcounter += p->GetActor()->spr.xvel >> 1;
if (p->on_ground) p->bobcounter += p->GetActor()->int_xvel() >> 1;
p->backuppos(ud.clipping == 0 && ((p->insector() && p->cursector->floorpicnum == MIRROR) || !p->insector()));

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

@ -1040,7 +1040,7 @@ void checkhitsprite_d(DDukeActor* targ, DDukeActor* proj)
case STRIPEBALL:
if (proj->spr.picnum == QUEBALL || proj->spr.picnum == STRIPEBALL)
{
proj->set_int_xvel((targ->spr.xvel >> 1) + (targ->spr.xvel >> 2));
proj->set_int_xvel((targ->int_xvel() >> 1) + (targ->int_xvel() >> 2));
proj->add_int_ang(-((targ->int_ang() << 1) + 1024));
targ->set_int_ang(getangle(targ->int_pos().X - proj->int_pos().X, targ->int_pos().Y - proj->int_pos().Y) - 512);
if (S_CheckSoundPlaying(POOLBALLHIT) < 2)

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

@ -2063,7 +2063,7 @@ void checkhitsprite_r(DDukeActor* targ, DDukeActor* proj)
EGS(targ->sector(), targ->int_pos().X, targ->int_pos().Y, targ->int_pos().Z - (8 << 8), SCRAP6 + (krand() & 15), -8, 48, 48, krand() & 2047, (krand() & 63) + 64, -(krand() & 4095) - (targ->int_zvel() >> 2), targ, 5);
break;
case BOWLINGBALL:
proj->set_int_xvel((targ->spr.xvel >> 1) + (targ->spr.xvel >> 2));
proj->set_int_xvel((targ->int_xvel() >> 1) + (targ->int_xvel() >> 2));
proj->add_int_ang(-(krand() & 16));
S_PlayActorSound(355, targ);
break;
@ -2076,7 +2076,7 @@ void checkhitsprite_r(DDukeActor* targ, DDukeActor* proj)
case HENSTAND + 1:
if (proj->spr.picnum == QUEBALL || proj->spr.picnum == STRIPEBALL)
{
proj->set_int_xvel((targ->spr.xvel >> 1) + (targ->spr.xvel >> 2));
proj->set_int_xvel((targ->int_xvel() >> 1) + (targ->int_xvel() >> 2));
proj->add_int_ang(-((targ->int_ang() << 1) + 1024));
targ->set_int_ang(getangle(targ->int_pos().X - proj->int_pos().X, targ->int_pos().Y - proj->int_pos().Y) - 512);
if (S_CheckSoundPlaying(POOLBALLHIT) < 2)
@ -2084,14 +2084,14 @@ void checkhitsprite_r(DDukeActor* targ, DDukeActor* proj)
}
else if (proj->spr.picnum == BOWLINGPIN || proj->spr.picnum == BOWLINGPIN + 1)
{
proj->set_int_xvel((targ->spr.xvel >> 1) + (targ->spr.xvel >> 2));
proj->set_int_xvel((targ->int_xvel() >> 1) + (targ->int_xvel() >> 2));
proj->add_int_ang(-(((targ->int_ang() << 1) + krand()) & 64));
targ->set_int_ang((targ->int_ang() + krand()) & 16);
S_PlayActorSound(355, targ);
}
else if (proj->spr.picnum == HENSTAND || proj->spr.picnum == HENSTAND + 1)
{
proj->set_int_xvel((targ->spr.xvel >> 1) + (targ->spr.xvel >> 2));
proj->set_int_xvel((targ->int_xvel() >> 1) + (targ->int_xvel() >> 2));
proj->add_int_ang(-(((targ->int_ang() << 1) + krand()) & 16));
targ->set_int_ang((targ->int_ang() + krand()) & 16);
S_PlayActorSound(355, targ);

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

@ -1399,7 +1399,7 @@ void AICreatureChunk::Tick(RunListEvent* ev)
// loc_16E0C
int nSqrt = lsqrt(((pActor->spr.yvel >> 10) * (pActor->spr.yvel >> 10)
+ (pActor->spr.xvel >> 10) * (pActor->spr.xvel >> 10)) >> 8);
+ (pActor->int_xvel() >> 10) * (pActor->int_xvel() >> 10)) >> 8);
pActor->set_int_xvel(bcos(nAngle) * (nSqrt >> 1));
pActor->spr.yvel = bsin(nAngle) * (nSqrt >> 1);

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

@ -1896,7 +1896,7 @@ void AIObject::Tick(RunListEvent* ev)
if (nMov.exbits & kHitAux2)
{
pActor->spr.xvel -= pActor->spr.xvel >> 3;
pActor->spr.xvel -= pActor->int_xvel() >> 3;
pActor->spr.yvel -= pActor->spr.yvel >> 3;
}

6
source/games/sw/src/jweapon.cpp
View file

@ -1172,7 +1172,7 @@ int SpawnRadiationCloud(DSWActor* actor)
if (actor->user.ID == MUSHROOM_CLOUD || actor->user.ID == 3121)
{
actorNew->user.Radius = 2000;
actorNew->user.change.XY() = MOVExy(actorNew->spr.xvel >> 2, actorNew->spr.angle);
actorNew->user.change.XY() = MOVExy(actorNew->int_xvel() >> 2, actorNew->spr.angle);
actorNew->set_int_zvel(Z(1) + RANDOM_P2(Z(2)));
}
else
@ -1227,7 +1227,7 @@ int PlayerInitChemBomb(PLAYER* pp)
// don't throw it as far if crawling
if (pp->Flags & (PF_CRAWLING))
{
actorNew->spr.xvel -= (actorNew->spr.xvel >> 2);
actorNew->spr.xvel -= (actorNew->int_xvel() >> 2);
}
// actorNew->user.RotNum = 5;
@ -1578,7 +1578,7 @@ int PlayerInitCaltrops(PLAYER* pp)
// don't throw it as far if crawling
if (pp->Flags & (PF_CRAWLING))
{
actorNew->spr.xvel -= (actorNew->spr.xvel >> 2);
actorNew->spr.xvel -= (actorNew->int_xvel() >> 2);
}
actorNew->user.Flags |= (SPR_XFLIP_TOGGLE);

6
source/games/sw/src/weapon.cpp
View file

@ -9365,7 +9365,7 @@ int DoUziBullet(DSWActor* actor)
// otherwize the moves are in too big an increment
for (i = 0; i < 2; i++)
{
auto vec = MOVExy((actor->spr.xvel >> 1), actor->spr.angle);
auto vec = MOVExy((actor->int_xvel() >> 1), actor->spr.angle);
double daz = (actor->int_zvel() >> 1) * zinttoworld;
sx = actor->int_pos().X;
@ -11171,7 +11171,7 @@ int DoSerpRing(DSWActor* actor)
actor->user.ID = SKULL_R0;
actor->spr.angle = VecToAngle(actor->user.targetActor->spr.pos.XY() - actor->spr.pos.XY());
actor->set_int_xvel(dist>>5);
actor->spr.xvel += (actor->spr.xvel >> 1);
actor->spr.xvel += (actor->int_xvel() >> 1);
actor->spr.xvel += (RANDOM_P2(128<<8)>>8);
actor->user.jump_speed = -800;
change_actor_stat(actor, STAT_ENEMY);
@ -15865,7 +15865,7 @@ int InitGrenade(PLAYER* pp)
// don't throw it as far if crawling
if (pp->Flags & (PF_CRAWLING))
{
actorNew->spr.xvel -= (actorNew->spr.xvel >> 2);
actorNew->spr.xvel -= (actorNew->int_xvel() >> 2);
}
actorNew->user.RotNum = 5;