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

- merged the TranslateSector wrapper into the main function.

Browse source 
No floatification yet.
This commit is contained in:
Christoph Oelckers 2022-09-29 13:28:17 +02:00
parent 3df5fb112e
commit c6e8f0bcdb
1 changed files with 10 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
source/games/blood/src/triggers.cpp
View file

@ -826,8 +826,17 @@ void PathSound(sectortype* pSector, int nSound)
//
//---------------------------------------------------------------------------
void TranslateSector(sectortype* pSector, double wave1, double wave2, int a4, int a5, int a6, int a7, int a8, int a9, int a10, int a11, bool bAllWalls)
void TranslateSector(sectortype* pSector, double wave1, double wave2, const DVector2& pivot, const DVector2& pt1, DAngle ang1, const DVector2& pt2, DAngle ang2, bool bAllWalls)
{
int a4 = int(pivot.X * worldtoint);
int a5 = int(pivot.Y * worldtoint);
int a6 = int(pt1.X * worldtoint);
int a7 = int(pt1.Y * worldtoint);
int a8 = ang1.Buildang();
int a9 = int(pt2.X * worldtoint);
int a10 = int(pt2.Y * worldtoint);
int a11 = ang2.Buildang();
XSECTOR* pXSector = &pSector->xs();
int v20 = interpolatedvalue(a6, a9, wave1);
int vc = interpolatedvalue(a6, a9, wave2);
@ -837,7 +846,6 @@ void TranslateSector(sectortype* pSector, double wave1, double wave2, int a4, in
int ang = interpolatedvalue(a8, a11, wave2);
int v14 = ang - v44;
DVector2 pivot = { a4 * inttoworld, a5 * inttoworld };
DVector2 offset = { (vc - a4) * inttoworld, (v8 - a5) * inttoworld };
DVector2 aoffset = { (vc) * inttoworld, (v8) * inttoworld };
DVector2 position = { (vc - v20) * inttoworld, (v8 - v24) * inttoworld };
@ -980,11 +988,6 @@ void TranslateSector(sectortype* pSector, double wave1, double wave2, int a4, in
}
void TranslateSector(sectortype* pSector, double wave1, double wave2, const DVector2& pivot, const DVector2& pt1, DAngle ang1,const DVector2& pt2, DAngle ang2, bool allWalls)
{
TranslateSector(pSector, wave1, wave2, int(pivot.X * worldtoint), int(pivot.Y * worldtoint), int(pt1.X * worldtoint), int(pt1.Y * worldtoint), ang1.Buildang(), int(pt2.X * worldtoint), int(pt2.Y * worldtoint), ang2.Buildang(), allWalls);
}
//---------------------------------------------------------------------------
//
//