zdoom/raze
0
0
Fork 0
mirror of https://github.com/ZDoom/Raze.git synced 2024-12-13 22:21:14 +00:00
Code Issues Projects Releases Packages Wiki Activity
raze/source/games/blood/src/prediction.cpp

667 lines
22 KiB
C++
Raw Normal View History

- split Blood prediction code into its own file.
2020-08-02 17:43:45 +00:00
//-------------------------------------------------------------------------
/*
Copyright (C) 2010-2019 EDuke32 developers and contributors
Copyright (C) 2019 Nuke.YKT
This file is part of NBlood.
NBlood is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License version 2
as published by the Free Software Foundation.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
See the GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
//-------------------------------------------------------------------------
#include "ns.h" // Must come before everything else!
#include <stdlib.h>
#include <string.h>
#include "compat.h"
#include "build.h"
#include "mmulti.h"
#include "v_font.h"
- Blood: header dependency cleanup. These are extremely ordering dependent so now blood.h serves as an umbrella header for most.
2020-12-09 14:56:32 +00:00
#include "blood.h"
- split Blood prediction code into its own file.
2020-08-02 17:43:45 +00:00
#include "choke.h"
#include "zstring.h"
- it compiles again (with lots of code commented out.)
2020-10-04 16:31:48 +00:00
#include "razemenu.h"
- split Blood prediction code into its own file.
2020-08-02 17:43:45 +00:00
#include "gstrings.h"
#include "v_2ddrawer.h"
#include "v_video.h"
#include "v_font.h"
#include "glbackend/glbackend.h"
BEGIN_BLD_NS
- unified the packet structures of all games. Currently the bit fields are still separate and they have to be merged, but for now the added memory does not matter. Having this structure in the common parts will allow work on consolidating the input code, though.
2020-08-26 15:12:48 +00:00
void fakePlayerProcess(PLAYER* pPlayer, InputPacket* pInput);
- split Blood prediction code into its own file.
2020-08-02 17:43:45 +00:00
void fakeActProcessSprites(void);
bool gPrediction = true;
VIEW predict, predictOld;
static VIEW predictFifo[256];
void viewInitializePrediction(void)
{
- Blood: cleanup of render code. Renaming of disassembly variables and moving of disabled Crystal Ball renderer to a separate function.
2021-03-20 18:20:42 +00:00
predict.angle = gMe->angle.ang;
predict.horiz = gMe->horizon.horiz;
predict.horizoff = gMe->horizon.horizoff;
- split Blood prediction code into its own file.
2020-08-02 17:43:45 +00:00
predict.at2c = gMe->slope;
predict.at6f = gMe->cantJump;
predict.at70 = gMe->isRunning;
predict.at72 = gMe->isUnderwater;
Merge remote-tracking branch 'remotes/Github_private/back_to_basics2' into Packet # Conflicts: # source/core/inputstate.cpp # source/exhumed/src/exhumed.h
2020-08-28 23:19:48 +00:00
predict.at71 = !!(gMe->input.actions & SB_JUMP);
- Blood: cleanup of render code. Renaming of disassembly variables and moving of disabled Crystal Ball renderer to a separate function.
2021-03-20 18:20:42 +00:00
predict.x = gMe->pSprite->x;
predict.y = gMe->pSprite->y;
predict.z = gMe->pSprite->z;
predict.sectnum = gMe->pSprite->sectnum;
- split Blood prediction code into its own file.
2020-08-02 17:43:45 +00:00
predict.at73 = gMe->pSprite->flags;
- Blood: cleanup of render code. Renaming of disassembly variables and moving of disabled Crystal Ball renderer to a separate function.
2021-03-20 18:20:42 +00:00
predict.xvel = xvel[gMe->pSprite->index];
predict.yvel = yvel[gMe->pSprite->index];
predict.zvel = zvel[gMe->pSprite->index];
predict.floordist = gMe->pXSprite->height;
- split Blood prediction code into its own file.
2020-08-02 17:43:45 +00:00
predict.at48 = gMe->posture;
- Blood: cleanup of render code. Renaming of disassembly variables and moving of disabled Crystal Ball renderer to a separate function.
2021-03-20 18:20:42 +00:00
predict.spin = gMe->angle.spin;
Merge remote-tracking branch 'remotes/Github_private/back_to_basics2' into Packet # Conflicts: # source/core/inputstate.cpp # source/exhumed/src/exhumed.h
2020-08-28 23:19:48 +00:00
predict.at6e = !!(gMe->input.actions & SB_CENTERVIEW);
- split Blood prediction code into its own file.
2020-08-02 17:43:45 +00:00
memcpy(&predict.at75,&gSpriteHit[gMe->pSprite->extra],sizeof(SPRITEHIT));
- more renames.
2020-11-21 22:40:08 +00:00
predict.bobPhase = gMe->bobPhase;
- rewrote the EndMgr in Blood to work as a screen job. This removes the special handling for it in the main loop. Some functions and variables in the kill and secret managers were also given more meaningful names. Fixes #313
2020-09-01 19:27:32 +00:00
predict.Kills = gMe->bobAmp;
- Blood: cleanup of render code. Renaming of disassembly variables and moving of disabled Crystal Ball renderer to a separate function.
2021-03-20 18:20:42 +00:00
predict.bobHeight = gMe->bobHeight;
predict.bobWidth = gMe->bobWidth;
- split Blood prediction code into its own file.
2020-08-02 17:43:45 +00:00
predict.at10 = gMe->swayPhase;
predict.at14 = gMe->swayAmp;
- Blood: cleanup of render code. Renaming of disassembly variables and moving of disabled Crystal Ball renderer to a separate function.
2021-03-20 18:20:42 +00:00
predict.shakeBobY = gMe->swayHeight;
predict.shakeBobX = gMe->swayWidth;
predict.weaponZ = gMe->zWeapon-gMe->zView-(12<<8);
predict.viewz = gMe->zView;
- split Blood prediction code into its own file.
2020-08-02 17:43:45 +00:00
predict.at3c = gMe->zViewVel;
predict.at40 = gMe->zWeapon;
predict.at44 = gMe->zWeaponVel;
predictOld = predict;
}
- unified the packet structures of all games. Currently the bit fields are still separate and they have to be merged, but for now the added memory does not matter. Having this structure in the common parts will allow work on consolidating the input code, though.
2020-08-26 15:12:48 +00:00
void viewUpdatePrediction(InputPacket *pInput)
- split Blood prediction code into its own file.
2020-08-02 17:43:45 +00:00
{
predictOld = predict;
short bakCstat = gMe->pSprite->cstat;
gMe->pSprite->cstat = 0;
fakePlayerProcess(gMe, pInput);
fakeActProcessSprites();
gMe->pSprite->cstat = bakCstat;
- transitioned Blood to the new main loop. Mostly working but interpolation is not correct yet and for some strange reason the numbers on the HUD are gone.
2020-09-01 21:34:04 +00:00
//predictFifo[gPredictTail&255] = predict;
//gPredictTail++;
- split Blood prediction code into its own file.
2020-08-02 17:43:45 +00:00
}
static void sub_158B4(PLAYER *pPlayer)
{
- Blood: cleanup of render code. Renaming of disassembly variables and moving of disabled Crystal Ball renderer to a separate function.
2021-03-20 18:20:42 +00:00
predict.viewz = predict.z - pPlayer->pPosture[pPlayer->lifeMode][predict.at48].eyeAboveZ;
predict.at40 = predict.z - pPlayer->pPosture[pPlayer->lifeMode][predict.at48].weaponAboveZ;
- split Blood prediction code into its own file.
2020-08-02 17:43:45 +00:00
}
- unified the packet structures of all games. Currently the bit fields are still separate and they have to be merged, but for now the added memory does not matter. Having this structure in the common parts will allow work on consolidating the input code, though.
2020-08-26 15:12:48 +00:00
static void fakeProcessInput(PLAYER *pPlayer, InputPacket *pInput)
- split Blood prediction code into its own file.
2020-08-02 17:43:45 +00:00
{
POSTURE *pPosture = &pPlayer->pPosture[pPlayer->lifeMode][predict.at48];
Merge remote-tracking branch 'remotes/Github_private/back_to_basics2' into Packet # Conflicts: # source/core/inputstate.cpp # source/exhumed/src/exhumed.h
2020-08-28 23:19:48 +00:00
predict.at70 = !!(gMe->input.actions & SB_RUN);
predict.at71 = !!(gMe->input.actions & SB_JUMP);
- split Blood prediction code into its own file.
2020-08-02 17:43:45 +00:00
if (predict.at48 == 1)
{
- Blood: cleanup of render code. Renaming of disassembly variables and moving of disabled Crystal Ball renderer to a separate function.
2021-03-20 18:20:42 +00:00
int x = Cos(predict.angle.asbuild());
int y = Sin(predict.angle.asbuild());
- renamed the fields in Blood's packet structure to match Duke's.
2020-08-26 14:54:13 +00:00
if (pInput->fvel)
- split Blood prediction code into its own file.
2020-08-02 17:43:45 +00:00
{
- renamed the fields in Blood's packet structure to match Duke's.
2020-08-26 14:54:13 +00:00
int forward = pInput->fvel;
- split Blood prediction code into its own file.
2020-08-02 17:43:45 +00:00
if (forward > 0)
- Replace `mulscale##()` calls with `MulScale()` from common. * Regex for reference: mulscale([0-9]+)\((.+)(\)+)
2021-01-04 11:36:54 +00:00
forward = MulScale(pPosture->frontAccel, forward, 8);
- split Blood prediction code into its own file.
2020-08-02 17:43:45 +00:00
else
- Replace `mulscale##()` calls with `MulScale()` from common. * Regex for reference: mulscale([0-9]+)\((.+)(\)+)
2021-01-04 11:36:54 +00:00
forward = MulScale(pPosture->backAccel, forward, 8);
- Blood: cleanup of render code. Renaming of disassembly variables and moving of disabled Crystal Ball renderer to a separate function.
2021-03-20 18:20:42 +00:00
predict.xvel += MulScale(forward, x, 30);
predict.yvel += MulScale(forward, y, 30);
- split Blood prediction code into its own file.
2020-08-02 17:43:45 +00:00
}
- renamed the fields in Blood's packet structure to match Duke's.
2020-08-26 14:54:13 +00:00
if (pInput->svel)
- split Blood prediction code into its own file.
2020-08-02 17:43:45 +00:00
{
- renamed the fields in Blood's packet structure to match Duke's.
2020-08-26 14:54:13 +00:00
int strafe = pInput->svel;
- Replace `mulscale##()` calls with `MulScale()` from common. * Regex for reference: mulscale([0-9]+)\((.+)(\)+)
2021-01-04 11:36:54 +00:00
strafe = MulScale(pPosture->sideAccel, strafe, 8);
- Blood: cleanup of render code. Renaming of disassembly variables and moving of disabled Crystal Ball renderer to a separate function.
2021-03-20 18:20:42 +00:00
predict.xvel += MulScale(strafe, y, 30);
predict.yvel -= MulScale(strafe, x, 30);
- split Blood prediction code into its own file.
2020-08-02 17:43:45 +00:00
}
}
- Blood: cleanup of render code. Renaming of disassembly variables and moving of disabled Crystal Ball renderer to a separate function.
2021-03-20 18:20:42 +00:00
else if (predict.floordist < 0x100)
- split Blood prediction code into its own file.
2020-08-02 17:43:45 +00:00
{
int speed = 0x10000;
- Blood: cleanup of render code. Renaming of disassembly variables and moving of disabled Crystal Ball renderer to a separate function.
2021-03-20 18:20:42 +00:00
if (predict.floordist > 0)
speed -= DivScale(predict.floordist, 0x100, 16);
int x = Cos(predict.angle.asbuild());
int y = Sin(predict.angle.asbuild());
- renamed the fields in Blood's packet structure to match Duke's.
2020-08-26 14:54:13 +00:00
if (pInput->fvel)
- split Blood prediction code into its own file.
2020-08-02 17:43:45 +00:00
{
- renamed the fields in Blood's packet structure to match Duke's.
2020-08-26 14:54:13 +00:00
int forward = pInput->fvel;
- split Blood prediction code into its own file.
2020-08-02 17:43:45 +00:00
if (forward > 0)
- Replace `mulscale##()` calls with `MulScale()` from common. * Regex for reference: mulscale([0-9]+)\((.+)(\)+)
2021-01-04 11:36:54 +00:00
forward = MulScale(pPosture->frontAccel, forward, 8);
- split Blood prediction code into its own file.
2020-08-02 17:43:45 +00:00
else
- Replace `mulscale##()` calls with `MulScale()` from common. * Regex for reference: mulscale([0-9]+)\((.+)(\)+)
2021-01-04 11:36:54 +00:00
forward = MulScale(pPosture->backAccel, forward, 8);
- Blood: cleanup of render code. Renaming of disassembly variables and moving of disabled Crystal Ball renderer to a separate function.
2021-03-20 18:20:42 +00:00
if (predict.floordist)
- Replace `mulscale##()` calls with `MulScale()` from common. * Regex for reference: mulscale([0-9]+)\((.+)(\)+)
2021-01-04 11:36:54 +00:00
forward = MulScale(forward, speed, 16);
- Blood: cleanup of render code. Renaming of disassembly variables and moving of disabled Crystal Ball renderer to a separate function.
2021-03-20 18:20:42 +00:00
predict.xvel += MulScale(forward, x, 30);
predict.yvel += MulScale(forward, y, 30);
- split Blood prediction code into its own file.
2020-08-02 17:43:45 +00:00
}
- renamed the fields in Blood's packet structure to match Duke's.
2020-08-26 14:54:13 +00:00
if (pInput->svel)
- split Blood prediction code into its own file.
2020-08-02 17:43:45 +00:00
{
- renamed the fields in Blood's packet structure to match Duke's.
2020-08-26 14:54:13 +00:00
int strafe = pInput->svel;
- Replace `mulscale##()` calls with `MulScale()` from common. * Regex for reference: mulscale([0-9]+)\((.+)(\)+)
2021-01-04 11:36:54 +00:00
strafe = MulScale(pPosture->sideAccel, strafe, 8);
- Blood: cleanup of render code. Renaming of disassembly variables and moving of disabled Crystal Ball renderer to a separate function.
2021-03-20 18:20:42 +00:00
if (predict.floordist)
- Replace `mulscale##()` calls with `MulScale()` from common. * Regex for reference: mulscale([0-9]+)\((.+)(\)+)
2021-01-04 11:36:54 +00:00
strafe = MulScale(strafe, speed, 16);
- Blood: cleanup of render code. Renaming of disassembly variables and moving of disabled Crystal Ball renderer to a separate function.
2021-03-20 18:20:42 +00:00
predict.xvel += MulScale(strafe, y, 30);
predict.yvel -= MulScale(strafe, x, 30);
- split Blood prediction code into its own file.
2020-08-02 17:43:45 +00:00
}
}
- InputPacket: Change `q16avel` to `avel`, changing type from fixed_t to float.
2020-10-08 03:47:30 +00:00
if (pInput->avel)
- Blood: cleanup of render code. Renaming of disassembly variables and moving of disabled Crystal Ball renderer to a separate function.
2021-03-20 18:20:42 +00:00
predict.angle = degang(pInput->avel);
Merge remote-tracking branch 'remotes/Github_private/back_to_basics2' into Packet # Conflicts: # source/core/inputstate.cpp # source/exhumed/src/exhumed.h
2020-08-28 23:19:48 +00:00
if (pInput->actions & SB_TURNAROUND)
- Blood: cleanup of render code. Renaming of disassembly variables and moving of disabled Crystal Ball renderer to a separate function.
2021-03-20 18:20:42 +00:00
if (!predict.spin.asbuild())
predict.spin = buildlook(-1024);
if (predict.spin.asbuild() < 0)
- split Blood prediction code into its own file.
2020-08-02 17:43:45 +00:00
{
int speed;
if (predict.at48 == 1)
speed = 64;
else
speed = 128;
- Blood: cleanup of render code. Renaming of disassembly variables and moving of disabled Crystal Ball renderer to a separate function.
2021-03-20 18:20:42 +00:00
predict.spin = buildlook(min(predict.spin.asbuild()+speed, 0));
predict.angle += buildang(speed);
- split Blood prediction code into its own file.
2020-08-02 17:43:45 +00:00
}
if (!predict.at71)
predict.at6f = 0;
switch (predict.at48)
{
case 1:
if (predict.at71)
- Blood: cleanup of render code. Renaming of disassembly variables and moving of disabled Crystal Ball renderer to a separate function.
2021-03-20 18:20:42 +00:00
predict.zvel -= pPosture->normalJumpZ;//0x5b05;
Merge remote-tracking branch 'remotes/Github_private/back_to_basics2' into Packet # Conflicts: # source/core/inputstate.cpp # source/exhumed/src/exhumed.h
2020-08-28 23:19:48 +00:00
if (pInput->actions & SB_CROUCH)
- Blood: cleanup of render code. Renaming of disassembly variables and moving of disabled Crystal Ball renderer to a separate function.
2021-03-20 18:20:42 +00:00
predict.zvel += pPosture->normalJumpZ;//0x5b05;
- split Blood prediction code into its own file.
2020-08-02 17:43:45 +00:00
break;
case 2:
Merge remote-tracking branch 'remotes/Github_private/back_to_basics2' into Packet # Conflicts: # source/core/inputstate.cpp # source/exhumed/src/exhumed.h
2020-08-28 23:19:48 +00:00
if (!(pInput->actions & SB_CROUCH))
- split Blood prediction code into its own file.
2020-08-02 17:43:45 +00:00
predict.at48 = 0;
break;
default:
- Blood: cleanup of render code. Renaming of disassembly variables and moving of disabled Crystal Ball renderer to a separate function.
2021-03-20 18:20:42 +00:00
if (!predict.at6f && predict.at71 && predict.floordist == 0) {
if (packItemActive(pPlayer, 4)) predict.zvel = pPosture->pwupJumpZ;//-0x175555;
else predict.zvel = pPosture->normalJumpZ;//-0xbaaaa;
- split Blood prediction code into its own file.
2020-08-02 17:43:45 +00:00
predict.at6f = 1;
}
Merge remote-tracking branch 'remotes/Github_private/back_to_basics2' into Packet # Conflicts: # source/core/inputstate.cpp # source/exhumed/src/exhumed.h
2020-08-28 23:19:48 +00:00
if (pInput->actions & SB_CROUCH)
- split Blood prediction code into its own file.
2020-08-02 17:43:45 +00:00
predict.at48 = 2;
break;
}
- Blood: Revert upstream unsynchronised input implementation.
2020-09-16 00:06:50 +00:00
- Blood: Cut `q16horiz`/`q16slopehoriz` over to PlayerHorizon struct.
2020-10-07 06:16:58 +00:00
#if 0
- Blood: Revert upstream unsynchronised input implementation.
2020-09-16 00:06:50 +00:00
if (predict.at6e && !(pInput->actions & (SB_LOOK_UP | SB_LOOK_DOWN)))
- split Blood prediction code into its own file.
2020-08-02 17:43:45 +00:00
{
if (predict.at20 < 0)
- Major cleanup of Q16.16 utilisation within games and engine. * Remove fix16.h/cpp and utilise library from m_fixed.h. * Extend m_fixed.h with two inline functions for int to/from float operations. * Replace fix16_floor operations with those from xs_Float.h * Replace multiple Q16.16 conversions from 0 to just be 0. * Replaced all found in-game bit-shifts and multiplications/divisions with inline functions from m_fixed.h * Replaced many casts of FRACUNIT as double in SW's panel.cpp as it is converted to double by way of type promotion. * Fixed missed precision fixes in SW's panel.cpp where some types weren't declared correctly. * Replaced 100+ `Cos()/Sin() >> 16` operations for Blood with inline functions `CosScale16()/SinScale16()`.
2020-09-01 13:00:35 +00:00
predict.at20 = min(predict.at20+IntToFixed(4), 0);
- split Blood prediction code into its own file.
2020-08-02 17:43:45 +00:00
if (predict.at20 > 0)
- Major cleanup of Q16.16 utilisation within games and engine. * Remove fix16.h/cpp and utilise library from m_fixed.h. * Extend m_fixed.h with two inline functions for int to/from float operations. * Replace fix16_floor operations with those from xs_Float.h * Replace multiple Q16.16 conversions from 0 to just be 0. * Replaced all found in-game bit-shifts and multiplications/divisions with inline functions from m_fixed.h * Replaced many casts of FRACUNIT as double in SW's panel.cpp as it is converted to double by way of type promotion. * Fixed missed precision fixes in SW's panel.cpp where some types weren't declared correctly. * Replaced 100+ `Cos()/Sin() >> 16` operations for Blood with inline functions `CosScale16()/SinScale16()`.
2020-09-01 13:00:35 +00:00
predict.at20 = max(predict.at20-IntToFixed(4), 0);
- split Blood prediction code into its own file.
2020-08-02 17:43:45 +00:00
if (predict.at20 == 0)
predict.at6e = 0;
}
else
{
- Blood: Revert upstream unsynchronised input implementation.
2020-09-16 00:06:50 +00:00
if (pInput->actions & SB_LOOK_UP)
- Major cleanup of Q16.16 utilisation within games and engine. * Remove fix16.h/cpp and utilise library from m_fixed.h. * Extend m_fixed.h with two inline functions for int to/from float operations. * Replace fix16_floor operations with those from xs_Float.h * Replace multiple Q16.16 conversions from 0 to just be 0. * Replaced all found in-game bit-shifts and multiplications/divisions with inline functions from m_fixed.h * Replaced many casts of FRACUNIT as double in SW's panel.cpp as it is converted to double by way of type promotion. * Fixed missed precision fixes in SW's panel.cpp where some types weren't declared correctly. * Replaced 100+ `Cos()/Sin() >> 16` operations for Blood with inline functions `CosScale16()/SinScale16()`.
2020-09-01 13:00:35 +00:00
predict.at20 = min(predict.at20+IntToFixed(4), IntToFixed(60));
- Blood: Revert upstream unsynchronised input implementation.
2020-09-16 00:06:50 +00:00
if (pInput->actions & SB_LOOK_DOWN)
- Major cleanup of Q16.16 utilisation within games and engine. * Remove fix16.h/cpp and utilise library from m_fixed.h. * Extend m_fixed.h with two inline functions for int to/from float operations. * Replace fix16_floor operations with those from xs_Float.h * Replace multiple Q16.16 conversions from 0 to just be 0. * Replaced all found in-game bit-shifts and multiplications/divisions with inline functions from m_fixed.h * Replaced many casts of FRACUNIT as double in SW's panel.cpp as it is converted to double by way of type promotion. * Fixed missed precision fixes in SW's panel.cpp where some types weren't declared correctly. * Replaced 100+ `Cos()/Sin() >> 16` operations for Blood with inline functions `CosScale16()/SinScale16()`.
2020-09-01 13:00:35 +00:00
predict.at20 = max(predict.at20-IntToFixed(4), IntToFixed(-60));
- split Blood prediction code into its own file.
2020-08-02 17:43:45 +00:00
}
- InputPacket: Change `q16horz` to `horz`, changing type from fixed_t to float.
2020-10-07 07:22:07 +00:00
predict.at20 = clamp(predict.at20+pInput->horz, IntToFixed(-60), IntToFixed(60));
- split Blood prediction code into its own file.
2020-08-02 17:43:45 +00:00
if (predict.at20 > 0)
- Replace `fmulscale##()` calls with `MulScaleF()` from common. * Regex for reference: fmulscale([0-9]+)\((.+)(\)+)
2021-01-04 11:16:09 +00:00
predict.at24 = FloatToFixed(MulScaleF(120., bsinf(FixedToFloat(predict.at20) * 8., 16)), 30);
- split Blood prediction code into its own file.
2020-08-02 17:43:45 +00:00
else if (predict.at20 < 0)
- Replace `fmulscale##()` calls with `MulScaleF()` from common. * Regex for reference: fmulscale([0-9]+)\((.+)(\)+)
2021-01-04 11:16:09 +00:00
predict.at24 = FloatToFixed(MulScaleF(180., bsinf(FixedToFloat(predict.at20) * 8., 16)), 30);
- split Blood prediction code into its own file.
2020-08-02 17:43:45 +00:00
else
predict.at24 = 0;
- Blood: Cut `q16horiz`/`q16slopehoriz` over to PlayerHorizon struct.
2020-10-07 06:16:58 +00:00
#endif
- split Blood prediction code into its own file.
2020-08-02 17:43:45 +00:00
- Blood: cleanup of render code. Renaming of disassembly variables and moving of disabled Crystal Ball renderer to a separate function.
2021-03-20 18:20:42 +00:00
int nSector = predict.sectnum;
- split Blood prediction code into its own file.
2020-08-02 17:43:45 +00:00
int florhit = predict.at75.florhit & 0xc000;
char va;
- Blood: cleanup of render code. Renaming of disassembly variables and moving of disabled Crystal Ball renderer to a separate function.
2021-03-20 18:20:42 +00:00
if (predict.floordist < 16 && (florhit == 0x4000 || florhit == 0))
- split Blood prediction code into its own file.
2020-08-02 17:43:45 +00:00
va = 1;
else
va = 0;
if (va && (sector[nSector].floorstat&2) != 0)
{
- Blood: cleanup of render code. Renaming of disassembly variables and moving of disabled Crystal Ball renderer to a separate function.
2021-03-20 18:20:42 +00:00
int z1 = getflorzofslope(nSector, predict.x, predict.y);
int x2 = predict.x+MulScale(64, Cos(predict.angle.asbuild()), 30);
int y2 = predict.y+MulScale(64, Sin(predict.angle.asbuild()), 30);
- split Blood prediction code into its own file.
2020-08-02 17:43:45 +00:00
short nSector2 = nSector;
updatesector(x2, y2, &nSector2);
if (nSector2 == nSector)
{
int z2 = getflorzofslope(nSector2, x2, y2);
- Blood: cleanup of render code. Renaming of disassembly variables and moving of disabled Crystal Ball renderer to a separate function.
2021-03-20 18:20:42 +00:00
predict.horizoff = q16horiz(interpolate(predict.horizoff.asq16(), IntToFixed(z1 - z2) >> 3, 0x4000));
- split Blood prediction code into its own file.
2020-08-02 17:43:45 +00:00
}
}
else
{
- Blood: cleanup of render code. Renaming of disassembly variables and moving of disabled Crystal Ball renderer to a separate function.
2021-03-20 18:20:42 +00:00
predict.horizoff = q16horiz(interpolate(predict.horizoff.asq16(), 0, 0x4000));
if (abs(predict.horizoff.asq16()) < 4)
predict.horizoff = q16horiz(0);
- split Blood prediction code into its own file.
2020-08-02 17:43:45 +00:00
}
- Blood: cleanup of render code. Renaming of disassembly variables and moving of disabled Crystal Ball renderer to a separate function.
2021-03-20 18:20:42 +00:00
predict.at2c = -predict.horiz.asq16() >> 9;
- split Blood prediction code into its own file.
2020-08-02 17:43:45 +00:00
}
- unified the packet structures of all games. Currently the bit fields are still separate and they have to be merged, but for now the added memory does not matter. Having this structure in the common parts will allow work on consolidating the input code, though.
2020-08-26 15:12:48 +00:00
void fakePlayerProcess(PLAYER *pPlayer, InputPacket *pInput)
- split Blood prediction code into its own file.
2020-08-02 17:43:45 +00:00
{
spritetype *pSprite = pPlayer->pSprite;
XSPRITE *pXSprite = pPlayer->pXSprite;
POSTURE* pPosture = &pPlayer->pPosture[pPlayer->lifeMode][predict.at48];
int top, bottom;
GetSpriteExtents(pSprite, &top, &bottom);
- Blood: cleanup of render code. Renaming of disassembly variables and moving of disabled Crystal Ball renderer to a separate function.
2021-03-20 18:20:42 +00:00
top += predict.z-pSprite->z;
bottom += predict.z-pSprite->z;
- split Blood prediction code into its own file.
2020-08-02 17:43:45 +00:00
- Blood: cleanup of render code. Renaming of disassembly variables and moving of disabled Crystal Ball renderer to a separate function.
2021-03-20 18:20:42 +00:00
int dzb = (bottom-predict.z)/4;
int dzt = (predict.z-top)/4;
- split Blood prediction code into its own file.
2020-08-02 17:43:45 +00:00
int dw = pSprite->clipdist<<2;
- Blood: cleanup of render code. Renaming of disassembly variables and moving of disabled Crystal Ball renderer to a separate function.
2021-03-20 18:20:42 +00:00
short nSector = predict.sectnum;
- split Blood prediction code into its own file.
2020-08-02 17:43:45 +00:00
if (!gNoClip)
{
- Blood: cleanup of render code. Renaming of disassembly variables and moving of disabled Crystal Ball renderer to a separate function.
2021-03-20 18:20:42 +00:00
pushmove_old((int32_t*)&predict.x, (int32_t*)&predict.y, (int32_t*)&predict.z, &predict.sectnum, dw, dzt, dzb, CLIPMASK0);
if (predict.sectnum == -1)
predict.sectnum = nSector;
- split Blood prediction code into its own file.
2020-08-02 17:43:45 +00:00
}
fakeProcessInput(pPlayer, pInput);
- Blood: cleanup of render code. Renaming of disassembly variables and moving of disabled Crystal Ball renderer to a separate function.
2021-03-20 18:20:42 +00:00
int nSpeed = approxDist(predict.xvel, predict.yvel);
- split Blood prediction code into its own file.
2020-08-02 17:43:45 +00:00
- Blood: cleanup of render code. Renaming of disassembly variables and moving of disabled Crystal Ball renderer to a separate function.
2021-03-20 18:20:42 +00:00
predict.at3c = interpolate(predict.at3c, predict.zvel, 0x7000);
int dz = predict.z-pPosture->eyeAboveZ-predict.viewz;
- split Blood prediction code into its own file.
2020-08-02 17:43:45 +00:00
if (dz > 0)
- Replace `mulscale##()` calls with `MulScale()` from common. * Regex for reference: mulscale([0-9]+)\((.+)(\)+)
2021-01-04 11:36:54 +00:00
predict.at3c += MulScale(dz<<8, 0xa000, 16);
- split Blood prediction code into its own file.
2020-08-02 17:43:45 +00:00
else
- Replace `mulscale##()` calls with `MulScale()` from common. * Regex for reference: mulscale([0-9]+)\((.+)(\)+)
2021-01-04 11:36:54 +00:00
predict.at3c += MulScale(dz<<8, 0x1800, 16);
- Blood: cleanup of render code. Renaming of disassembly variables and moving of disabled Crystal Ball renderer to a separate function.
2021-03-20 18:20:42 +00:00
predict.viewz += predict.at3c>>8;
- split Blood prediction code into its own file.
2020-08-02 17:43:45 +00:00
- Blood: cleanup of render code. Renaming of disassembly variables and moving of disabled Crystal Ball renderer to a separate function.
2021-03-20 18:20:42 +00:00
predict.at44 = interpolate(predict.at44, predict.zvel, 0x5000);
dz = predict.z-pPosture->weaponAboveZ-predict.at40;
- split Blood prediction code into its own file.
2020-08-02 17:43:45 +00:00
if (dz > 0)
- Replace `mulscale##()` calls with `MulScale()` from common. * Regex for reference: mulscale([0-9]+)\((.+)(\)+)
2021-01-04 11:36:54 +00:00
predict.at44 += MulScale(dz<<8, 0x8000, 16);
- split Blood prediction code into its own file.
2020-08-02 17:43:45 +00:00
else
- Replace `mulscale##()` calls with `MulScale()` from common. * Regex for reference: mulscale([0-9]+)\((.+)(\)+)
2021-01-04 11:36:54 +00:00
predict.at44 += MulScale(dz<<8, 0xc00, 16);
- split Blood prediction code into its own file.
2020-08-02 17:43:45 +00:00
predict.at40 += predict.at44>>8;
- Blood: cleanup of render code. Renaming of disassembly variables and moving of disabled Crystal Ball renderer to a separate function.
2021-03-20 18:20:42 +00:00
predict.weaponZ = predict.at40 - predict.viewz - (12<<8);
- split Blood prediction code into its own file.
2020-08-02 17:43:45 +00:00
- more renames.
2020-11-21 22:40:08 +00:00
predict.bobPhase = ClipLow(predict.bobPhase-4, 0);
- split Blood prediction code into its own file.
2020-08-02 17:43:45 +00:00
- Major cleanup of Q16.16 utilisation within games and engine. * Remove fix16.h/cpp and utilise library from m_fixed.h. * Extend m_fixed.h with two inline functions for int to/from float operations. * Replace fix16_floor operations with those from xs_Float.h * Replace multiple Q16.16 conversions from 0 to just be 0. * Replaced all found in-game bit-shifts and multiplications/divisions with inline functions from m_fixed.h * Replaced many casts of FRACUNIT as double in SW's panel.cpp as it is converted to double by way of type promotion. * Fixed missed precision fixes in SW's panel.cpp where some types weren't declared correctly. * Replaced 100+ `Cos()/Sin() >> 16` operations for Blood with inline functions `CosScale16()/SinScale16()`.
2020-09-01 13:00:35 +00:00
nSpeed >>= FRACBITS;
- split Blood prediction code into its own file.
2020-08-02 17:43:45 +00:00
if (predict.at48 == 1)
{
- rewrote the EndMgr in Blood to work as a screen job. This removes the special handling for it in the main loop. Some functions and variables in the kill and secret managers were also given more meaningful names. Fixes #313
2020-09-01 19:27:32 +00:00
predict.Kills = (predict.Kills+17)&2047;
- split Blood prediction code into its own file.
2020-08-02 17:43:45 +00:00
predict.at14 = (predict.at14+17)&2047;
- Blood: cleanup of render code. Renaming of disassembly variables and moving of disabled Crystal Ball renderer to a separate function.
2021-03-20 18:20:42 +00:00
predict.bobHeight = MulScale(10*pPosture->bobV,Sin(predict.Kills*2), 30);
predict.bobWidth = MulScale(predict.bobPhase*pPosture->bobH,Sin(predict.Kills-256), 30);
predict.shakeBobY = MulScale(predict.bobPhase*pPosture->swayV,Sin(predict.at14*2), 30);
predict.shakeBobX = MulScale(predict.bobPhase*pPosture->swayH,Sin(predict.at14-0x155), 30);
- split Blood prediction code into its own file.
2020-08-02 17:43:45 +00:00
}
else
{
if (pXSprite->height < 256)
{
- rewrote the EndMgr in Blood to work as a screen job. This removes the special handling for it in the main loop. Some functions and variables in the kill and secret managers were also given more meaningful names. Fixes #313
2020-09-01 19:27:32 +00:00
predict.Kills = (predict.Kills+(pPosture->pace[predict.at70]*4))&2047;
- split Blood prediction code into its own file.
2020-08-02 17:43:45 +00:00
predict.at14 = (predict.at14+(pPosture->pace[predict.at70]*4)/2)&2047;
if (predict.at70)
{
- more renames.
2020-11-21 22:40:08 +00:00
if (predict.bobPhase < 60)
predict.bobPhase = ClipHigh(predict.bobPhase + nSpeed, 60);
- split Blood prediction code into its own file.
2020-08-02 17:43:45 +00:00
}
else
{
- more renames.
2020-11-21 22:40:08 +00:00
if (predict.bobPhase < 30)
predict.bobPhase = ClipHigh(predict.bobPhase + nSpeed, 30);
- split Blood prediction code into its own file.
2020-08-02 17:43:45 +00:00
}
}
- Blood: cleanup of render code. Renaming of disassembly variables and moving of disabled Crystal Ball renderer to a separate function.
2021-03-20 18:20:42 +00:00
predict.bobHeight = MulScale(predict.bobPhase*pPosture->bobV,Sin(predict.Kills*2), 30);
predict.bobWidth = MulScale(predict.bobPhase*pPosture->bobH,Sin(predict.Kills-256), 30);
predict.shakeBobY = MulScale(predict.bobPhase*pPosture->swayV,Sin(predict.at14*2), 30);
predict.shakeBobX = MulScale(predict.bobPhase*pPosture->swayH,Sin(predict.at14-0x155), 30);
- split Blood prediction code into its own file.
2020-08-02 17:43:45 +00:00
}
if (!pXSprite->health)
return;
predict.at72 = 0;
if (predict.at48 == 1)
{
predict.at72 = 1;
- Blood: cleanup of render code. Renaming of disassembly variables and moving of disabled Crystal Ball renderer to a separate function.
2021-03-20 18:20:42 +00:00
int nSector = predict.sectnum;
- split Blood prediction code into its own file.
2020-08-02 17:43:45 +00:00
int nLink = gLowerLink[nSector];
if (nLink > 0 && (sprite[nLink].type == kMarkerLowGoo || sprite[nLink].type == kMarkerLowWater))
{
- Blood: cleanup of render code. Renaming of disassembly variables and moving of disabled Crystal Ball renderer to a separate function.
2021-03-20 18:20:42 +00:00
if (getceilzofslope(nSector, predict.x, predict.y) > predict.viewz)
- split Blood prediction code into its own file.
2020-08-02 17:43:45 +00:00
predict.at72 = 0;
}
}
}
static void fakeMoveDude(spritetype *pSprite)
{
PLAYER *pPlayer = NULL;
int bottom, top;
if (IsPlayerSprite(pSprite))
pPlayer = &gPlayer[pSprite->type-kDudePlayer1];
- cleanup of the remaining homegrown Blood wrappers. consoleSysMsg and dassert are gone now, all places now call the system implementation directly.
2020-10-11 10:38:17 +00:00
assert(pSprite->type >= kDudeBase && pSprite->type < kDudeMax);
- split Blood prediction code into its own file.
2020-08-02 17:43:45 +00:00
GetSpriteExtents(pSprite, &top, &bottom);
- Blood: cleanup of render code. Renaming of disassembly variables and moving of disabled Crystal Ball renderer to a separate function.
2021-03-20 18:20:42 +00:00
top += predict.z - pSprite->z;
bottom += predict.z - pSprite->z;
int bz = (bottom-predict.z)/4;
int tz = (predict.z-top)/4;
- split Blood prediction code into its own file.
2020-08-02 17:43:45 +00:00
int wd = pSprite->clipdist*4;
- Blood: cleanup of render code. Renaming of disassembly variables and moving of disabled Crystal Ball renderer to a separate function.
2021-03-20 18:20:42 +00:00
int nSector = predict.sectnum;
- cleanup of the remaining homegrown Blood wrappers. consoleSysMsg and dassert are gone now, all places now call the system implementation directly.
2020-10-11 10:38:17 +00:00
assert(nSector >= 0 && nSector < kMaxSectors);
- Blood: cleanup of render code. Renaming of disassembly variables and moving of disabled Crystal Ball renderer to a separate function.
2021-03-20 18:20:42 +00:00
if (predict.xvel || predict.yvel)
- split Blood prediction code into its own file.
2020-08-02 17:43:45 +00:00
{
if (pPlayer && gNoClip)
{
- Blood: cleanup of render code. Renaming of disassembly variables and moving of disabled Crystal Ball renderer to a separate function.
2021-03-20 18:20:42 +00:00
predict.x += predict.xvel>>12;
predict.y += predict.yvel>>12;
if (!FindSector(predict.x, predict.y, &nSector))
nSector = predict.sectnum;
- split Blood prediction code into its own file.
2020-08-02 17:43:45 +00:00
}
else
{
short bakCstat = pSprite->cstat;
pSprite->cstat &= ~257;
- Blood: cleanup of render code. Renaming of disassembly variables and moving of disabled Crystal Ball renderer to a separate function.
2021-03-20 18:20:42 +00:00
predict.at75.hit = ClipMove(&predict.x, &predict.y, &predict.z, &nSector, predict.xvel >> 12, predict.yvel >> 12, wd, tz, bz, CLIPMASK0);
- split Blood prediction code into its own file.
2020-08-02 17:43:45 +00:00
if (nSector == -1)
- Blood: cleanup of render code. Renaming of disassembly variables and moving of disabled Crystal Ball renderer to a separate function.
2021-03-20 18:20:42 +00:00
nSector = predict.sectnum;
- split Blood prediction code into its own file.
2020-08-02 17:43:45 +00:00
if (sector[nSector].type >= kSectorPath && sector[nSector].type <= kSectorRotate)
{
short nSector2 = nSector;
- Blood: cleanup of render code. Renaming of disassembly variables and moving of disabled Crystal Ball renderer to a separate function.
2021-03-20 18:20:42 +00:00
pushmove_old((int32_t*)&predict.x, (int32_t*)&predict.y, (int32_t*)&predict.z, &nSector2, wd, tz, bz, CLIPMASK0);
- split Blood prediction code into its own file.
2020-08-02 17:43:45 +00:00
if (nSector2 != -1)
nSector = nSector2;
}
- cleanup of the remaining homegrown Blood wrappers. consoleSysMsg and dassert are gone now, all places now call the system implementation directly.
2020-10-11 10:38:17 +00:00
assert(nSector >= 0);
- split Blood prediction code into its own file.
2020-08-02 17:43:45 +00:00
pSprite->cstat = bakCstat;
}
switch (predict.at75.hit&0xc000)
{
case 0x8000:
{
int nHitWall = predict.at75.hit&0x3fff;
walltype *pHitWall = &wall[nHitWall];
if (pHitWall->nextsector != -1)
{
sectortype *pHitSector = &sector[pHitWall->nextsector];
if (top < pHitSector->ceilingz || bottom > pHitSector->floorz)
{
// ???
}
}
- Blood: cleanup of render code. Renaming of disassembly variables and moving of disabled Crystal Ball renderer to a separate function.
2021-03-20 18:20:42 +00:00
actWallBounceVector(&predict.xvel, &predict.yvel, nHitWall, 0);
- split Blood prediction code into its own file.
2020-08-02 17:43:45 +00:00
break;
}
}
}
- Blood: cleanup of render code. Renaming of disassembly variables and moving of disabled Crystal Ball renderer to a separate function.
2021-03-20 18:20:42 +00:00
if (predict.sectnum != nSector)
- split Blood prediction code into its own file.
2020-08-02 17:43:45 +00:00
{
- cleanup of the remaining homegrown Blood wrappers. consoleSysMsg and dassert are gone now, all places now call the system implementation directly.
2020-10-11 10:38:17 +00:00
assert(nSector >= 0 && nSector < kMaxSectors);
- Blood: cleanup of render code. Renaming of disassembly variables and moving of disabled Crystal Ball renderer to a separate function.
2021-03-20 18:20:42 +00:00
predict.sectnum = nSector;
- split Blood prediction code into its own file.
2020-08-02 17:43:45 +00:00
}
char bUnderwater = 0;
char bDepth = 0;
int nXSector = sector[nSector].extra;
if (nXSector > 0)
{
XSECTOR *pXSector = &xsector[nXSector];
if (pXSector->Underwater)
bUnderwater = 1;
if (pXSector->Depth)
bDepth = 1;
}
int nUpperLink = gUpperLink[nSector];
int nLowerLink = gLowerLink[nSector];
if (nUpperLink >= 0 && (sprite[nUpperLink].type == kMarkerUpWater || sprite[nUpperLink].type == kMarkerUpGoo))
bDepth = 1;
if (nLowerLink >= 0 && (sprite[nLowerLink].type == kMarkerLowWater || sprite[nLowerLink].type == kMarkerLowGoo))
bDepth = 1;
if (pPlayer)
wd += 16;
- Blood: cleanup of render code. Renaming of disassembly variables and moving of disabled Crystal Ball renderer to a separate function.
2021-03-20 18:20:42 +00:00
if (predict.zvel)
predict.z += predict.zvel >> 8;
- split Blood prediction code into its own file.
2020-08-02 17:43:45 +00:00
- added back the hijacked 'detail' member to spritetype. This changes the Blood map loader to not use the in-game sprite structure for loading a level and moves the qsprite_filler array back into the sprite.
2020-10-02 20:14:01 +00:00
static_assert(sizeof(tspritetype) == sizeof(spritetype));
tspritetype pSpriteBak; memcpy(&pSpriteBak, pSprite, sizeof(pSpriteBak)); // how dare you??? (Use a tspritetype here so that if the sprite storage gets refactored, this line gets flagged.)
- split Blood prediction code into its own file.
2020-08-02 17:43:45 +00:00
spritetype *pTempSprite = pSprite;
- Blood: cleanup of render code. Renaming of disassembly variables and moving of disabled Crystal Ball renderer to a separate function.
2021-03-20 18:20:42 +00:00
pTempSprite->x = predict.x;
pTempSprite->y = predict.y;
pTempSprite->z = predict.z;
pTempSprite->sectnum = predict.sectnum;
- split Blood prediction code into its own file.
2020-08-02 17:43:45 +00:00
int ceilZ, ceilHit, floorZ, floorHit;
GetZRange(pTempSprite, &ceilZ, &ceilHit, &floorZ, &floorHit, wd, CLIPMASK0);
GetSpriteExtents(pTempSprite, &top, &bottom);
if (predict.at73 & 2)
{
int vc = 58254;
if (bDepth)
{
if (bUnderwater)
{
- Blood: cleanup of render code. Renaming of disassembly variables and moving of disabled Crystal Ball renderer to a separate function.
2021-03-20 18:20:42 +00:00
int cz = getceilzofslope(nSector, predict.x, predict.y);
- split Blood prediction code into its own file.
2020-08-02 17:43:45 +00:00
if (cz > top)
vc += ((bottom-cz)*-80099) / (bottom-top);
else
vc = 0;
}
else
{
- Blood: cleanup of render code. Renaming of disassembly variables and moving of disabled Crystal Ball renderer to a separate function.
2021-03-20 18:20:42 +00:00
int fz = getflorzofslope(nSector, predict.x, predict.y);
- split Blood prediction code into its own file.
2020-08-02 17:43:45 +00:00
if (fz < bottom)
vc += ((bottom-fz)*-80099) / (bottom-top);
}
}
else
{
if (bUnderwater)
vc = 0;
else if (bottom >= floorZ)
vc = 0;
}
if (vc)
{
- Blood: cleanup of render code. Renaming of disassembly variables and moving of disabled Crystal Ball renderer to a separate function.
2021-03-20 18:20:42 +00:00
predict.z += ((vc*4)/2)>>8;
predict.zvel += vc;
- split Blood prediction code into its own file.
2020-08-02 17:43:45 +00:00
}
}
GetSpriteExtents(pTempSprite, &top, &bottom);
if (bottom >= floorZ)
{
int floorZ2 = floorZ;
int floorHit2 = floorHit;
GetZRange(pTempSprite, &ceilZ, &ceilHit, &floorZ, &floorHit, pSprite->clipdist<<2, CLIPMASK0, PARALLAXCLIP_CEILING|PARALLAXCLIP_FLOOR);
- Blood: cleanup of render code. Renaming of disassembly variables and moving of disabled Crystal Ball renderer to a separate function.
2021-03-20 18:20:42 +00:00
if (bottom <= floorZ && predict.z-floorZ2 < bz)
- split Blood prediction code into its own file.
2020-08-02 17:43:45 +00:00
{
floorZ = floorZ2;
floorHit = floorHit2;
}
}
if (floorZ <= bottom)
{
predict.at75.florhit = floorHit;
- Blood: cleanup of render code. Renaming of disassembly variables and moving of disabled Crystal Ball renderer to a separate function.
2021-03-20 18:20:42 +00:00
predict.z += floorZ-bottom;
int var44 = predict.zvel-velFloor[predict.sectnum];
- split Blood prediction code into its own file.
2020-08-02 17:43:45 +00:00
if (var44 > 0)
{
- Blood: cleanup of render code. Renaming of disassembly variables and moving of disabled Crystal Ball renderer to a separate function.
2021-03-20 18:20:42 +00:00
actFloorBounceVector(&predict.xvel, &predict.yvel, &var44, predict.sectnum, 0);
predict.zvel = var44;
if (abs(predict.zvel) < 0x10000)
- split Blood prediction code into its own file.
2020-08-02 17:43:45 +00:00
{
- Blood: cleanup of render code. Renaming of disassembly variables and moving of disabled Crystal Ball renderer to a separate function.
2021-03-20 18:20:42 +00:00
predict.zvel = velFloor[predict.sectnum];
- split Blood prediction code into its own file.
2020-08-02 17:43:45 +00:00
predict.at73 &= ~4;
}
else
predict.at73 |= 4;
}
- Blood: cleanup of render code. Renaming of disassembly variables and moving of disabled Crystal Ball renderer to a separate function.
2021-03-20 18:20:42 +00:00
else if (predict.zvel == 0)
- split Blood prediction code into its own file.
2020-08-02 17:43:45 +00:00
predict.at73 &= ~4;
}
else
{
predict.at75.florhit = 0;
if (predict.at73 & 2)
predict.at73 |= 4;
}
if (top <= ceilZ)
{
predict.at75.ceilhit = ceilHit;
- Blood: cleanup of render code. Renaming of disassembly variables and moving of disabled Crystal Ball renderer to a separate function.
2021-03-20 18:20:42 +00:00
predict.z += ClipLow(ceilZ-top, 0);
if (predict.zvel <= 0 && (predict.at73&4))
predict.zvel = MulScale(-predict.zvel, 0x2000, 16);
- split Blood prediction code into its own file.
2020-08-02 17:43:45 +00:00
}
else
predict.at75.ceilhit = 0;
GetSpriteExtents(pTempSprite, &top, &bottom);
- added back the hijacked 'detail' member to spritetype. This changes the Blood map loader to not use the in-game sprite structure for loading a level and moves the qsprite_filler array back into the sprite.
2020-10-02 20:14:01 +00:00
memcpy(pSprite, &pSpriteBak, sizeof(pSpriteBak));
- Blood: cleanup of render code. Renaming of disassembly variables and moving of disabled Crystal Ball renderer to a separate function.
2021-03-20 18:20:42 +00:00
predict.floordist = ClipLow(floorZ-bottom, 0)>>8;
if (predict.xvel || predict.yvel)
- split Blood prediction code into its own file.
2020-08-02 17:43:45 +00:00
{
if ((floorHit & 0xc000) == 0xc000)
{
int nHitSprite = floorHit & 0x3fff;
if ((sprite[nHitSprite].cstat & 0x30) == 0)
{
- Blood: cleanup of render code. Renaming of disassembly variables and moving of disabled Crystal Ball renderer to a separate function.
2021-03-20 18:20:42 +00:00
predict.xvel += MulScale(4, predict.x - sprite[nHitSprite].x, 2);
predict.yvel += MulScale(4, predict.y - sprite[nHitSprite].y, 2);
- split Blood prediction code into its own file.
2020-08-02 17:43:45 +00:00
return;
}
}
int nXSector = sector[pSprite->sectnum].extra;
if (nXSector > 0 && xsector[nXSector].Underwater)
return;
- Blood: cleanup of render code. Renaming of disassembly variables and moving of disabled Crystal Ball renderer to a separate function.
2021-03-20 18:20:42 +00:00
if (predict.floordist >= 0x100)
- split Blood prediction code into its own file.
2020-08-02 17:43:45 +00:00
return;
int nDrag = gDudeDrag;
- Blood: cleanup of render code. Renaming of disassembly variables and moving of disabled Crystal Ball renderer to a separate function.
2021-03-20 18:20:42 +00:00
if (predict.floordist > 0)
nDrag -= scale(gDudeDrag, predict.floordist, 0x100);
predict.xvel -= mulscale16r(predict.xvel, nDrag);
predict.yvel -= mulscale16r(predict.yvel, nDrag);
if (approxDist(predict.xvel, predict.yvel) < 0x1000)
predict.xvel = predict.yvel = 0;
- split Blood prediction code into its own file.
2020-08-02 17:43:45 +00:00
}
}
static void fakeActAirDrag(spritetype *, int num)
{
int xvec = 0;
int yvec = 0;
- Blood: cleanup of render code. Renaming of disassembly variables and moving of disabled Crystal Ball renderer to a separate function.
2021-03-20 18:20:42 +00:00
int nSector = predict.sectnum;
- cleanup of the remaining homegrown Blood wrappers. consoleSysMsg and dassert are gone now, all places now call the system implementation directly.
2020-10-11 10:38:17 +00:00
assert(nSector >= 0 && nSector < kMaxSectors);
- split Blood prediction code into its own file.
2020-08-02 17:43:45 +00:00
sectortype *pSector = &sector[nSector];
int nXSector = pSector->extra;
if (nXSector > 0)
{
- cleanup of the remaining homegrown Blood wrappers. consoleSysMsg and dassert are gone now, all places now call the system implementation directly.
2020-10-11 10:38:17 +00:00
assert(nXSector < kMaxXSectors);
- split Blood prediction code into its own file.
2020-08-02 17:43:45 +00:00
XSECTOR *pXSector = &xsector[nXSector];
if (pXSector->windVel && (pXSector->windAlways || pXSector->busy))
{
int vel = pXSector->windVel<<12;
if (!pXSector->windAlways && pXSector->busy)
- Replace `mulscale##()` calls with `MulScale()` from common. * Regex for reference: mulscale([0-9]+)\((.+)(\)+)
2021-01-04 11:36:54 +00:00
vel = MulScale(vel, pXSector->busy, 16);
xvec = MulScale(vel, Cos(pXSector->windAng), 30);
yvec = MulScale(vel, Sin(pXSector->windAng), 30);
- split Blood prediction code into its own file.
2020-08-02 17:43:45 +00:00
}
}
- Blood: cleanup of render code. Renaming of disassembly variables and moving of disabled Crystal Ball renderer to a separate function.
2021-03-20 18:20:42 +00:00
predict.xvel += MulScale(xvec-predict.xvel, num, 16);
predict.yvel += MulScale(yvec-predict.yvel, num, 16);
predict.zvel -= MulScale(predict.zvel, num, 16);
- split Blood prediction code into its own file.
2020-08-02 17:43:45 +00:00
}
void fakeActProcessSprites(void)
{
spritetype *pSprite = gMe->pSprite;
if (pSprite->statnum == kStatDude)
{
int nXSprite = pSprite->extra;
- cleanup of the remaining homegrown Blood wrappers. consoleSysMsg and dassert are gone now, all places now call the system implementation directly.
2020-10-11 10:38:17 +00:00
assert(nXSprite > 0 && nXSprite < kMaxXSprites);
- Blood: cleanup of render code. Renaming of disassembly variables and moving of disabled Crystal Ball renderer to a separate function.
2021-03-20 18:20:42 +00:00
int nSector = predict.sectnum;
- split Blood prediction code into its own file.
2020-08-02 17:43:45 +00:00
int nXSector = sector[nSector].extra;
XSECTOR *pXSector = NULL;
if (nXSector > 0)
{
- cleanup of the remaining homegrown Blood wrappers. consoleSysMsg and dassert are gone now, all places now call the system implementation directly.
2020-10-11 10:38:17 +00:00
assert(nXSector > 0 && nXSector < kMaxXSectors);
assert(xsector[nXSector].reference == nSector);
- split Blood prediction code into its own file.
2020-08-02 17:43:45 +00:00
pXSector = &xsector[nXSector];
}
if (pXSector)
{
int top, bottom;
GetSpriteExtents(pSprite, &top, &bottom);
- Blood: cleanup of render code. Renaming of disassembly variables and moving of disabled Crystal Ball renderer to a separate function.
2021-03-20 18:20:42 +00:00
top += predict.z - pSprite->z;
bottom += predict.z - pSprite->z;
if (getflorzofslope(nSector, predict.x, predict.y) < bottom)
- split Blood prediction code into its own file.
2020-08-02 17:43:45 +00:00
{
int angle = pXSector->panAngle;
int speed = 0;
if (pXSector->panAlways || pXSector->state || pXSector->busy)
{
speed = pXSector->panVel << 9;
if (!pXSector->panAlways && pXSector->busy)
- Replace `mulscale##()` calls with `MulScale()` from common. * Regex for reference: mulscale([0-9]+)\((.+)(\)+)
2021-01-04 11:36:54 +00:00
speed = MulScale(speed, pXSector->busy, 16);
- split Blood prediction code into its own file.
2020-08-02 17:43:45 +00:00
}
if (sector[nSector].floorstat&64)
angle = (GetWallAngle(sector[nSector].wallptr)+512)&2047;
- Blood: cleanup of render code. Renaming of disassembly variables and moving of disabled Crystal Ball renderer to a separate function.
2021-03-20 18:20:42 +00:00
predict.xvel += MulScale(speed,Cos(angle), 30);
predict.yvel += MulScale(speed,Sin(angle), 30);
- split Blood prediction code into its own file.
2020-08-02 17:43:45 +00:00
}
}
if (pXSector && pXSector->Underwater)
fakeActAirDrag(pSprite, 5376);
else
fakeActAirDrag(pSprite, 128);
- Blood: cleanup of render code. Renaming of disassembly variables and moving of disabled Crystal Ball renderer to a separate function.
2021-03-20 18:20:42 +00:00
if ((predict.at73 & 4) != 0 || predict.xvel != 0 || predict.yvel != 0 || predict.zvel != 0 || velFloor[predict.sectnum] != 0 || velCeil[predict.sectnum] != 0)
- split Blood prediction code into its own file.
2020-08-02 17:43:45 +00:00
{
fakeMoveDude(pSprite);
}
}
}
void viewCorrectPrediction(void)
{
- transitioned Blood to the new main loop. Mostly working but interpolation is not correct yet and for some strange reason the numbers on the HUD are gone.
2020-09-01 21:34:04 +00:00
#if 0
- split Blood prediction code into its own file.
2020-08-02 17:43:45 +00:00
spritetype *pSprite = gMe->pSprite;
VIEW *pView = &predictFifo[(gNetFifoTail-1)&255];
- Blood: Cut `q16ang`/`q16look_ang`/`q16rotscrnang` over to PlayerAngle struct.
2020-10-07 20:55:54 +00:00
if (gMe->angle.ang != pView->at30 || pView->at24 != gMe->horizon.horiz || pView->at50 != pSprite->x || pView->at54 != pSprite->y || pView->at58 != pSprite->z)
- split Blood prediction code into its own file.
2020-08-02 17:43:45 +00:00
{
viewInitializePrediction();
predictOld = gPrevView[myconnectindex];
gPredictTail = gNetFifoTail;
while (gPredictTail < gNetFifoHead[myconnectindex])
{
viewUpdatePrediction(&gFifoInput[gPredictTail&255][myconnectindex]);
}
}
- transitioned Blood to the new main loop. Mostly working but interpolation is not correct yet and for some strange reason the numbers on the HUD are gone.
2020-09-01 21:34:04 +00:00
#endif
- split Blood prediction code into its own file.
2020-08-02 17:43:45 +00:00
}
END_BLD_NS
Reference in a new issue Copy permalink