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

- Duke: Wrap calls that subtract from player_struct::PlayerNowPosition.Z.

Browse source
This commit is contained in:
Mitchell Richters 2022-11-15 17:50:32 +11:00 committed by Christoph Oelckers
parent 44166ae9e6
commit adc78c81c6
3 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -3160,7 +3160,7 @@ void handle_se18(DDukeActor *actor, bool morecheck)
{ {
if (a2->isPlayer() && a2->GetOwner()) if (a2->isPlayer() && a2->GetOwner())
{ {
if (ps[a2->PlayerIndex()].on_ground == 1) ps[a2->PlayerIndex()].PlayerNowPosition.Z -= extra; if (ps[a2->PlayerIndex()].on_ground == 1) ps[a2->PlayerIndex()].posZadd(-extra);
} }
if (a2->vel.Z == 0 && a2->spr.statnum != STAT_EFFECTOR && a2->spr.statnum != STAT_PROJECTILE) if (a2->vel.Z == 0 && a2->spr.statnum != STAT_EFFECTOR && a2->spr.statnum != STAT_PROJECTILE)
{ {
@ -3957,7 +3957,7 @@ void handle_se31(DDukeActor* actor, bool choosedir)
{ {
if (a2->isPlayer() && a2->GetOwner()) if (a2->isPlayer() && a2->GetOwner())
if (ps[a2->PlayerIndex()].on_ground == 1) if (ps[a2->PlayerIndex()].on_ground == 1)
ps[a2->PlayerIndex()].PlayerNowPosition.Z -= l; ps[a2->PlayerIndex()].posZadd(-l);
if (a2->vel.Z == 0 && a2->spr.statnum != STAT_EFFECTOR && (!choosedir || a2->spr.statnum != STAT_PROJECTILE)) if (a2->vel.Z == 0 && a2->spr.statnum != STAT_EFFECTOR && (!choosedir || a2->spr.statnum != STAT_PROJECTILE))
{ {
a2->spr.pos.Z -= l; a2->spr.pos.Z -= l;

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

@ -560,7 +560,7 @@ void playerisdead(int snum, int psectlotag, double floorz, double ceilingz)
if (actor->spr.pal != 1) if (actor->spr.pal != 1)
{ {
SetPlayerPal(p, PalEntry(63, 63, 0, 0)); SetPlayerPal(p, PalEntry(63, 63, 0, 0));
p->PlayerNowPosition.Z -= 16; p->posZadd(-16);
actor->spr.pos.Z -= 16; actor->spr.pos.Z -= 16;
} }
#if 0 #if 0

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

@ -1689,7 +1689,7 @@ static void operateJetpack(int snum, ESyncBits actions, int psectlotag, double f
if (p->jetpack_on < 11) if (p->jetpack_on < 11)
{ {
p->jetpack_on++; p->jetpack_on++;
p->PlayerNowPosition.Z -= (p->jetpack_on * 0.5); //Goin up p->posZadd(-(p->jetpack_on * 0.5)); //Goin up
} }
else if (p->jetpack_on == 11 && !S_CheckActorSoundPlaying(pact, DUKE_JETPACK_IDLE)) else if (p->jetpack_on == 11 && !S_CheckActorSoundPlaying(pact, DUKE_JETPACK_IDLE))
S_PlayActorSound(DUKE_JETPACK_IDLE, pact); S_PlayActorSound(DUKE_JETPACK_IDLE, pact);
@ -1705,7 +1705,7 @@ static void operateJetpack(int snum, ESyncBits actions, int psectlotag, double f
OnEvent(EVENT_SOARUP, snum, p->GetActor(), -1); OnEvent(EVENT_SOARUP, snum, p->GetActor(), -1);
if (GetGameVarID(g_iReturnVarID, p->GetActor(), snum).value() == 0) if (GetGameVarID(g_iReturnVarID, p->GetActor(), snum).value() == 0)
{ {
p->PlayerNowPosition.Z -= dist; p->posZadd(-dist);
p->crack_time = CRACK_TIME; p->crack_time = CRACK_TIME;
} }
} }