teambeef/raze
0
0
Fork 0
mirror of https://github.com/DrBeef/Raze.git synced 2024-11-15 08:52:00 +00:00
Code Issues Projects Releases Packages Wiki Activity

- Duke: fixed issues with CON-based movement.

Browse source 
Bad integer divisions and one incorrect check for X instead of Z.
This commit is contained in:
Christoph Oelckers 2022-11-14 18:48:31 +01:00
parent 5aac77784a
commit e867c4603f
2 changed files with 10 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -3523,10 +3523,15 @@ void move_d(DDukeActor *actor, int playernum, int xvel)
return; return;
} }
if (actor->spr.picnum == WATERBUBBLE)
{
int a = 0;
}
auto moveptr = &ScriptCode[actor->temp_data[1]]; auto moveptr = &ScriptCode[actor->temp_data[1]];
if (a & geth) actor->vel.X += (moveptr[0] / 16 - actor->vel.X) * 0.5; if (a & geth) actor->vel.X += (moveptr[0] / 16. - actor->vel.X) * 0.5;
if (a & getv) actor->vel.Z += (moveptr[1] / 16 - actor->vel.Z) * 0.5; if (a & getv) actor->vel.Z += (moveptr[1] / 16. - actor->vel.Z) * 0.5;
if (a & dodgebullet) if (a & dodgebullet)
dodge(actor); dodge(actor);
@ -3538,7 +3543,7 @@ void move_d(DDukeActor *actor, int playernum, int xvel)
a = badguy(actor); a = badguy(actor);
if (actor->vel.X != 0 || actor->vel.X != 0) if (actor->vel.X != 0 || actor->vel.Z != 0)
{ {
if (a && actor->spr.picnum != ROTATEGUN) if (a && actor->spr.picnum != ROTATEGUN)
{ {

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

@ -3547,8 +3547,8 @@ void move_r(DDukeActor *actor, int pnum, int xvel)
auto moveptr = &ScriptCode[actor->temp_data[1]]; auto moveptr = &ScriptCode[actor->temp_data[1]];
if (a & geth) actor->vel.X += (moveptr[0] / 16 - actor->vel.X) * 0.5; if (a & geth) actor->vel.X += (moveptr[0] / 16. - actor->vel.X) * 0.5;
if (a & getv) actor->vel.Z += (moveptr[1] / 16 - actor->vel.Z) * 0.5; if (a & getv) actor->vel.Z += (moveptr[1] / 16. - actor->vel.Z) * 0.5;
if (a & dodgebullet) if (a & dodgebullet)
dodge(actor); dodge(actor);