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

- Blood: Eliminate VIEW::weaponZ.

Browse source
This commit is contained in:
Mitchell Richters 2022-09-10 22:20:04 +10:00 committed by Christoph Oelckers
parent fc71b39d22
commit 5b962e69ab
3 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
source/games/blood/src/player.h
View file

@ -107,6 +107,7 @@ struct PLAYER
int ozView;
int zViewVel;
int zWeapon;
int ozWeapon;
int zWeaponVel;
int slope;
bool isUnderwater;

4
source/games/blood/src/view.cpp
View file

@ -62,7 +62,7 @@ void viewBackupView(int nPlayer)
PLAYER* pPlayer = &gPlayer[nPlayer];
VIEW* pView = &gPrevView[nPlayer];
pPlayer->ozView = pPlayer->zView;
pView->weaponZ = pPlayer->zWeapon - pPlayer->zView - 0xc00;
pPlayer->ozWeapon = pPlayer->zWeapon - pPlayer->zView - 0xc00;
pView->horiz = pPlayer->horizon.horiz;
pView->horizoff = pPlayer->horizon.horizoff;
pView->slope = pPlayer->slope;
@ -502,7 +502,7 @@ static void SetupView(int& cX, int& cY, int& cZ, DAngle& cA, fixedhoriz& cH, sec
cX = interpolatedvalue(gView->actor->opos.X, gView->actor->spr.pos.X, smoothratio * (1. / MaxSmoothRatio)) * worldtoint;
cY = interpolatedvalue(gView->actor->opos.Y, gView->actor->spr.pos.Y, smoothratio * (1. / MaxSmoothRatio)) * worldtoint;
cZ = interpolatedvalue(gView->ozView, gView->zView, smoothratio * (1. / MaxSmoothRatio));
zDelta = interpolatedvalue<double>(pView->weaponZ, gView->zWeapon - gView->zView - (12 << 8), smoothratio * (1. / MaxSmoothRatio));
zDelta = interpolatedvalue<double>(gView->ozWeapon, gView->zWeapon - gView->zView - (12 << 8), smoothratio * (1. / MaxSmoothRatio));
bobWidth = interpolatedvalue(pView->bobWidth, gView->bobWidth, smoothratio * (1. / MaxSmoothRatio));
bobHeight = interpolatedvalue(pView->bobHeight, gView->bobHeight, smoothratio * (1. / MaxSmoothRatio));
shakeX = interpolatedvalue<double>(pView->shakeBobX, gView->swayWidth, smoothratio * (1. / MaxSmoothRatio));

1
source/games/blood/src/view.h
View file

@ -43,7 +43,6 @@ struct VIEW {
fixedhoriz horiz; // horiz
fixedhoriz horizoff; // horizoff
int slope;
int weaponZ; // weapon z
int zViewVel;
int zWeapon;
int zWeaponVel;