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

- Exhumed: Floatify eyelevel.

Browse source
This commit is contained in:
Mitchell Richters 2022-09-07 15:25:34 +10:00 committed by Christoph Oelckers
parent 45d4d3e41a
commit ee30e770f7
5 changed files with 20 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
source/games/exhumed/src/osdcmds.cpp
View file

@ -74,7 +74,7 @@ static int osdcmd_spawn(CCmdFuncPtr parm)
if (!stricmp(c, "anubis")) BuildAnubis(nullptr, initpos, sectp, inita, false);
else if (!stricmp(c, "spider")) BuildSpider(nullptr, initpos, sectp, inita);
else if (!stricmp(c, "mummy")) BuildMummy(nullptr, initpos, sectp, inita);
else if (!stricmp(c, "fish")) BuildFish(nullptr, initpos.plusZ(PlayerList[nLocalPlayer].eyelevel * zinttoworld), sectp, inita);
else if (!stricmp(c, "fish")) BuildFish(nullptr, initpos.plusZ(PlayerList[nLocalPlayer].eyelevel), sectp, inita);
else if (!stricmp(c, "lion")) BuildLion(nullptr, initpos, sectp, inita);
else if (!stricmp(c, "lava")) BuildLava(nullptr, initpos, sectp, inita, nNetPlayerCount);
else if (!stricmp(c, "rex")) BuildRex(nullptr, initpos, sectp, inita, nNetPlayerCount);

29
source/games/exhumed/src/player.cpp
View file

@ -56,10 +56,10 @@ static actionSeq PlayerSeq[] = {
static const uint8_t nHeightTemplate[] = { 0, 0, 0, 0, 0, 0, 7, 7, 7, 9, 9, 9, 9, 0, 0, 0, 0, 0, 0, 0, 0 };
static const int16_t nActionEyeLevel[] = {
-14080, -14080, -14080, -14080, -14080, -14080, -8320,
-8320, -8320, -8320, -8320, -8320, -8320, -14080,
-14080, -14080, -14080, -14080, -14080, -14080, -14080
static constexpr double nActionEyeLevel[] = {
-55.0, -55.0, -55.0, -55.0, -55.0, -55.0, -32.5,
-32.5, -32.5, -32.5, -32.5, -32.5, -32.5, -55.0,
-55.0, -55.0, -55.0, -55.0, -55.0, -55.0, -55.0
};
static const uint16_t nGunLotag[] = { 52, 53, 54, 55, 56, 57 };
@ -374,7 +374,7 @@ void RestartPlayer(int nPlayer)
}
plr->pPlayerGrenade = nullptr;
plr->oeyelevel = plr->eyelevel = -14080;
plr->oeyelevel = plr->eyelevel = -55.;
dVertPan[nPlayer] = 0;
nTemperature[nPlayer] = 0;
@ -467,7 +467,7 @@ void StartDeathSeq(int nPlayer, int nVal)
StopFiringWeapon(nPlayer);
PlayerList[nPlayer].horizon.ohoriz = PlayerList[nPlayer].horizon.horiz = q16horiz(0);
PlayerList[nPlayer].oeyelevel = PlayerList[nPlayer].eyelevel = -14080;
PlayerList[nPlayer].oeyelevel = PlayerList[nPlayer].eyelevel = -55;
PlayerList[nPlayer].nInvisible = 0;
dVertPan[nPlayer] = 15;
@ -1080,11 +1080,11 @@ sectdone:
auto pViewSect = pPlayerActor->sector();
int EyeZ = PlayerList[nPlayer].eyelevel + pPlayerActor->int_pos().Z + nQuake[nPlayer];
double EyeZ = PlayerList[nPlayer].eyelevel + pPlayerActor->spr.pos.Z + nQuake[nPlayer] * zinttoworld;
while (1)
{
int nCeilZ = pViewSect->int_ceilingz();
double nCeilZ = pViewSect->ceilingz;
if (EyeZ >= nCeilZ)
break;
@ -2274,8 +2274,8 @@ sectdone:
}
else
{
if (PlayerList[nPlayer].eyelevel < -8320) {
PlayerList[nPlayer].eyelevel += ((-8320 - PlayerList[nPlayer].eyelevel) >> 1);
if (PlayerList[nPlayer].eyelevel < -32.5) {
PlayerList[nPlayer].eyelevel += ((-32.5 - PlayerList[nPlayer].eyelevel) * 0.5);
}
loc_1BD2E:
@ -2293,8 +2293,7 @@ sectdone:
{
if (PlayerList[nPlayer].nHealth > 0)
{
int var_EC = nActionEyeLevel[nAction];
PlayerList[nPlayer].eyelevel += (var_EC - PlayerList[nPlayer].eyelevel) >> 1;
PlayerList[nPlayer].eyelevel += (nActionEyeLevel[nAction] - PlayerList[nPlayer].eyelevel) * 0.5;
if (bUnderwater)
{
@ -2524,9 +2523,9 @@ sectdone:
PlayerList[nPlayer].nDamage.Y = 0;
PlayerList[nPlayer].nDamage.X = 0;
if (PlayerList[nPlayer].eyelevel >= -2816)
if (PlayerList[nPlayer].eyelevel >= -11)
{
PlayerList[nPlayer].eyelevel = -2816;
PlayerList[nPlayer].eyelevel = -11;
dVertPan[nPlayer] = 0;
}
else
@ -2534,7 +2533,7 @@ sectdone:
if (PlayerList[nPlayer].horizon.horiz.asq16() < 0)
{
PlayerList[nPlayer].horizon.settarget(buildhoriz(0));
PlayerList[nPlayer].eyelevel -= (dVertPan[nPlayer] << 8);
PlayerList[nPlayer].eyelevel -= dVertPan[nPlayer];
}
else
{

2
source/games/exhumed/src/player.h
View file

@ -101,7 +101,7 @@ struct Player
PlayerSave sPlayerSave;
int ototalvel;
int totalvel;
int16_t eyelevel, oeyelevel;
double eyelevel, oeyelevel;
TObjPtr<DExhumedActor*> pPlayerGrenade;
TObjPtr<DExhumedActor*> pPlayerFloorSprite;
TObjPtr<DExhumedActor*> pDoppleSprite;

6
source/games/exhumed/src/sequence.cpp
View file

@ -617,16 +617,16 @@ int seq_PlotSequence(int nSprite, int16_t edx, int16_t nFrame, int16_t ecx)
else
{
auto pSector =pTSprite->sectp;
int nFloorZ = pSector->int_floorz();
double nFloorZ = pSector->floorz;
if (nFloorZ <= PlayerList[nLocalPlayer].eyelevel + int(initpos.Z * worldtoint)) {
if (nFloorZ <= PlayerList[nLocalPlayer].eyelevel + initpos.Z) {
pTSprite->ownerActor = nullptr;
}
else
{
pTSprite->picnum = nShadowPic;
edx = ((tileWidth(nPict) << 5) / nShadowWidth) - ((nFloorZ - pTSprite->int_pos().Z) >> 10);
edx = ((tileWidth(nPict) << 5) / nShadowWidth) - int16_t((nFloorZ - pTSprite->pos.Z) * 2.);
if (edx < 1) {
edx = 1;
}

2
source/games/exhumed/src/view.cpp
View file

@ -214,7 +214,7 @@ void DrawView(double interpfrac, bool sceneonly)
}
else
{
nCamerapos = pPlayerActor->interpolatedpos(interpfrac).plusZ(interpolatedvalue<double>(PlayerList[nLocalPlayer].oeyelevel, PlayerList[nLocalPlayer].eyelevel, interpfrac) * zinttoworld);
nCamerapos = pPlayerActor->interpolatedpos(interpfrac).plusZ(interpolatedvalue(PlayerList[nLocalPlayer].oeyelevel, PlayerList[nLocalPlayer].eyelevel, interpfrac));
pSector = PlayerList[nLocalPlayer].pPlayerViewSect;
updatesector(nCamerapos, &pSector);