zdoom/raze
0
0
Fork 0
mirror of https://github.com/ZDoom/Raze.git synced 2024-12-03 01:22:19 +00:00
Code Issues Projects Releases Packages Wiki Activity

- added 'dophysics'.

Browse source
This commit is contained in:
Christoph Oelckers 2020-10-30 06:55:27 +01:00
parent 434e4479a1
commit 9952e6d2b0
2 changed files with 72 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
source/games/whaven/src/wh.h
View file

@ -232,6 +232,7 @@ void goesupalevel(PLAYER& plr);
void lockon(PLAYER& plr, int numshots, int shootguntype);
void goesupalevel1(PLAYER& plr);
void goesupalevel2(PLAYER& plr);
void dophysics(PLAYER& plr, int goalz, int flyupdn, int v);
inline int getPlayerHeight()
{

71
source/games/whaven/src/whplr.cpp
View file

@ -597,4 +597,75 @@ void lockon(PLAYER& plr, int numshots, int shootguntype) {
}
}
void dophysics(PLAYER& plr, int goalz, int flyupdn, int v) {
if (plr.orbactive[5] > 0) {
if (v > 0) {
if (plr.horiz > 125)
plr.hvel -= (TICSPERFRAME << 8);
else if (plr.horiz < 75)
plr.hvel += (TICSPERFRAME << 8);
}
if (flyupdn > 0) {
plr.hvel -= (TICSPERFRAME << 7);
}
if (flyupdn < 0) {
plr.hvel += (TICSPERFRAME << 7);
}
plr.hvel += (sintable[(lockclock << 4) & 2047] >> 6);
plr.fallz = 0;
}
else if (plr.z < goalz) {
if (isWh2())
plr.hvel += (TICSPERFRAME * WH2GRAVITYCONSTANT);
else
plr.hvel += GRAVITYCONSTANT;
plr.onsomething &= ~(GROUNDBIT | PLATFORMBIT);
plr.fallz += plr.hvel;
}
else if (plr.z > goalz) {
plr.hvel -= ((plr.z - goalz) >> 6);
plr.onsomething |= GROUNDBIT;
plr.fallz = 0;
}
else {
plr.fallz = 0;
}
plr.z += plr.hvel;
if (plr.hvel > 0 && plr.z > goalz) {
plr.hvel >>= 2;
}
else if (plr.onsomething != 0) {
if (plr.hvel < 0 && plr.z < goalz) {
plr.hvel = 0;
plr.z = goalz;
}
}
if (plr.sector != -1) {
if (plr.z - (plr.height >> 2) < getceilzofslope(plr.sector, plr.x, plr.y)) {
plr.z = getceilzofslope(plr.sector, plr.x, plr.y) + (plr.height >> 2);
plr.hvel = 0;
}
else {
if (plr.orbactive[5] > 0) {
if (plr.z + (plr.height << 7) > getflorzofslope(plr.sector, plr.x, plr.y)) {
plr.z = getflorzofslope(plr.sector, plr.x, plr.y) - (plr.height << 7);
plr.hvel = 0;
}
}
else {
if (plr.z + (plr.height >> 4) > getflorzofslope(plr.sector, plr.x, plr.y)) {
plr.z = getflorzofslope(plr.sector, plr.x, plr.y) - (plr.height >> 4);
plr.hvel = 0;
}
}
}
}
plr.jumphoriz = -(plr.hvel >> 8);
}
END_WH_NS