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

- Blood: Re-time weapon and scene QAV code based on reworked timer and QAV struct code.

Browse source
This commit is contained in:
Mitchell Richters 2021-08-05 12:38:26 +10:00
parent ab502ebc66
commit 24fbaa527c
10 changed files with 59 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
source/games/blood/src/blood.cpp
View file

@ -201,6 +201,8 @@ void StartLevel(MapRecord* level, bool newgame)
pPlayer->qavLoop = gPlayerTemp[i].qavLoop;
pPlayer->weaponTimer = gPlayerTemp[i].weaponTimer;
pPlayer->nextWeapon = gPlayerTemp[i].nextWeapon;
pPlayer->qavLastTick = gPlayerTemp[i].qavLastTick;
pPlayer->qavTimer = gPlayerTemp[i].qavTimer;
}
}
PreloadCache();

8
source/games/blood/src/hudsprites.cpp
View file

@ -127,14 +127,14 @@ void hudDraw(PLAYER *gView, int nSectnum, double bobx, double boby, double zDelt
}
#ifdef NOONE_EXTENSIONS
if (gView->sceneQav < 0) WeaponDraw(gView, nShade, cX, cY, nPalette, smoothratio);
else if (gView->pXSprite->health > 0) playerQavSceneDraw(gView, nShade, cX, cY, nPalette, smoothratio);
if (gView->sceneQav < 0) WeaponDraw(gView, nShade, cX, cY, nPalette);
else if (gView->pXSprite->health > 0) playerQavSceneDraw(gView, nShade, cX, cY, nPalette);
else {
gView->sceneQav = gView->weaponQav = -1;
gView->weaponTimer = gView->curWeapon = 0;
gView->qavTimer = gView->weaponTimer = gView->curWeapon = 0;
}
#else
WeaponDraw(gView, nShade, cX, cY, nPalette, smoothratio);
WeaponDraw(gView, nShade, cX, cY, nPalette);
#endif
}
if (gViewPos == 0 && gView->pXSprite->burnTime > 60)

2
source/games/blood/src/misc.h
View file

@ -46,7 +46,7 @@ struct PLAYER;
extern QAV* weaponQAV[];
void WeaponInit(void);
void WeaponDraw(PLAYER *pPlayer, int a2, double a3, double a4, int a5, double smoothratio);
void WeaponDraw(PLAYER *pPlayer, int a2, double a3, double a4, int a5);
void WeaponRaise(PLAYER *pPlayer);
void WeaponLower(PLAYER *pPlayer);
int WeaponUpgrade(PLAYER *pPlayer, int newWeapon);

9
source/games/blood/src/nnexts.cpp
View file

@ -1844,6 +1844,8 @@ void trPlayerCtrlStartScene(XSPRITE* pXSource, PLAYER* pPlayer, bool force) {
pPlayer->weaponTimer = pCtrl->qavScene.qavResrc->duration;
pPlayer->qavCallback = (pXSource->data3 > 0) ? ClipRange(pXSource->data3 - 1, 0, 32) : -1;
pPlayer->qavLoop = false;
pPlayer->qavLastTick = I_GetTime(pCtrl->qavScene.qavResrc->ticrate);
pPlayer->qavTimer = pCtrl->qavScene.qavResrc->duration;
}
@ -6180,7 +6182,7 @@ void playerQavSceneProcess(PLAYER* pPlayer, QAVSCENE* pQavScene) {
}
}
void playerQavSceneDraw(PLAYER* pPlayer, int a2, double a3, double a4, int a5, double smoothratio) {
void playerQavSceneDraw(PLAYER* pPlayer, int a2, double a3, double a4, int a5) {
if (pPlayer == NULL || pPlayer->sceneQav == -1) return;
QAVSCENE* pQavScene = &gPlayerCtrl[pPlayer->nPlayer].qavScene;
@ -6189,7 +6191,10 @@ void playerQavSceneDraw(PLAYER* pPlayer, int a2, double a3, double a4, int a5, d
if (pQavScene->qavResrc != NULL) {
QAV* pQAV = pQavScene->qavResrc;
int v4 = (pPlayer->weaponTimer == 0) ? ((PlayClock + MulScale(4, int(smoothratio), 16)) % pQAV->duration) : pQAV->duration - pPlayer->weaponTimer;
int v4;
double smoothratio;
qavProcessTimer(pPlayer, pQAV, &v4, &smoothratio);
int flags = 2; int nInv = powerupCheck(pPlayer, kPwUpShadowCloak);
if (nInv >= 120 * 8 || (nInv != 0 && (PlayClock & 32))) {

2
source/games/blood/src/nnexts.h
View file

@ -384,7 +384,7 @@ void playerDeactivateShrooms(PLAYER* pPlayer);
QAV* playerQavSceneLoad(int qavId);
void playerQavSceneProcess(PLAYER* pPlayer, QAVSCENE* pQavScene);
void playerQavScenePlay(PLAYER* pPlayer);
void playerQavSceneDraw(PLAYER* pPlayer, int a2, double a3, double a4, int a5, double smoothratio);
void playerQavSceneDraw(PLAYER* pPlayer, int a2, double a3, double a4, int a5);
void playerQavSceneReset(PLAYER* pPlayer);
// ------------------------------------------------------------------------- //
void callbackUniMissileBurst(int nSprite);

6
source/games/blood/src/player.cpp
View file

@ -740,6 +740,8 @@ void playerStart(int nPlayer, int bNewLevel)
pPlayer->weaponTimer = 0;
pPlayer->weaponState = 0;
pPlayer->weaponQav = -1;
pPlayer->qavLastTick = 0;
pPlayer->qavTimer = 0;
#ifdef NOONE_EXTENSIONS
playerQavSceneReset(pPlayer); // reset qav scene
@ -813,6 +815,8 @@ void playerReset(PLAYER *pPlayer)
pPlayer->weaponState = 0;
pPlayer->weaponQav = -1;
pPlayer->qavLoop = 0;
pPlayer->qavLastTick = 0;
pPlayer->qavTimer = 0;
pPlayer->packItemId = -1;
for (int i = 0; i < 5; i++) {
@ -2249,6 +2253,8 @@ FSerializer& Serialize(FSerializer& arc, const char* keyname, PLAYER& w, PLAYER*
.Array("weaponorder", &w.weaponOrder[0][0], 14*2)
.Array("ammocount", w.ammoCount, countof(w.ammoCount))
("qavloop", w.qavLoop)
("qavlastTick", w.qavLastTick)
("qavtimer", w.qavTimer)
("fusetime", w.fuseTime)
("throwtime", w.throwTime)
("throwpower", w.throwPower)

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

@ -127,6 +127,8 @@ struct PLAYER
//int at149[14];
int ammoCount[12];
bool qavLoop;
int qavLastTick;
int qavTimer;
int fuseTime;
int throwTime;
int throwPower;

25
source/games/blood/src/qav.cpp
View file

@ -236,6 +236,31 @@ void qavProcessTicker(QAV* const pQAV, int* duration, int* lastTick)
*duration = ClipLow(*duration, 0);
}
void qavProcessTimer(PLAYER* const pPlayer, QAV* const pQAV, int* duration, double* smoothratio, bool const fixedduration)
{
// Process clock based on QAV's ticrate and last tick value.
qavProcessTicker(pQAV, &pPlayer->qavTimer, &pPlayer->qavLastTick);
if (pPlayer->weaponTimer == 0)
{
// Check if we're playing an idle QAV as per the ticker's weapon timer.
*duration = fixedduration ? pQAV->duration - 1 : I_GetBuildTime() % pQAV->duration;
*smoothratio = MaxSmoothRatio;
}
else if (pPlayer->qavTimer == 0)
{
// If qavTimer is 0, play the last frame uninterpolated. Sometimes the timer can be just ahead of weaponTimer.
*duration = pQAV->duration - 1;
*smoothratio = MaxSmoothRatio;
}
else
{
// Apply normal values.
*duration = pQAV->duration - pPlayer->qavTimer;
*smoothratio = I_GetTimeFrac(pQAV->ticrate) * MaxSmoothRatio;
}
}
// This is to eliminate a huge design issue in NBlood that was apparently copied verbatim from the DOS-Version.
// Sequences were cached in the resource and directly returned from there in writable form, with byte swapping directly performed in the cache on Big Endian systems.

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

@ -87,5 +87,6 @@ struct QAV
QAV* getQAV(int res_id);
void qavProcessTicker(QAV* const pQAV, int* duration, int* lastTick);
void qavProcessTimer(PLAYER* const pPlayer, QAV* const pQAV, int* duration, double* smoothratio, bool const fixedduration = false);
END_BLD_NS

19
source/games/blood/src/weapon.cpp
View file

@ -255,22 +255,16 @@ bool isOriginalQAV()
return cached;
}
void WeaponDraw(PLAYER *pPlayer, int shade, double xpos, double ypos, int palnum, double smoothratio)
void WeaponDraw(PLAYER *pPlayer, int shade, double xpos, double ypos, int palnum)
{
assert(pPlayer != NULL);
if (pPlayer->weaponQav == -1)
return;
QAV * pQAV = weaponQAV[pPlayer->weaponQav];
int duration;
double smoothratio;
if (pPlayer->weaponTimer == 0) // playing idle QAV?
{
// Double shotgun fix from BloodGDX.
if (/*!IsOriginalDemo() &&*/ (pPlayer->weaponState == -1 || (pPlayer->curWeapon == 3 && pPlayer->weaponState == 7))/* && isOriginalQAV()*/)
duration = pQAV->duration - 1;
else duration = (PlayClock + MulScale(4, int(smoothratio), 16)) % pQAV->duration;
}
else duration = pQAV->duration - pPlayer->weaponTimer;
qavProcessTimer(pPlayer, pQAV, &duration, &smoothratio, pPlayer->weaponState == -1 || (pPlayer->curWeapon == 3 && pPlayer->weaponState == 7));
pQAV->x = int(xpos);
pQAV->y = int(ypos);
@ -302,6 +296,8 @@ static void StartQAV(PLAYER *pPlayer, int nWeaponQAV, int callback, bool looped
pPlayer->weaponTimer = weaponQAV[nWeaponQAV]->duration;
pPlayer->qavCallback = callback;
pPlayer->qavLoop = looped;
pPlayer->qavLastTick = I_GetTime(weaponQAV[nWeaponQAV]->ticrate);
pPlayer->qavTimer = weaponQAV[nWeaponQAV]->duration;
//weaponQAV[nWeaponQAV]->Preload();
WeaponPlay(pPlayer);
pPlayer->weaponTimer -= 4;
@ -1913,6 +1909,7 @@ static bool processProxy(PLAYER *pPlayer)
case 9:
pPlayer->throwPower = ClipHigh(DivScale(PlayClock-pPlayer->throwTime,240, 16), 65536);
pPlayer->weaponTimer = 0;
pPlayer->qavTimer = 0;
if (!(pPlayer->input.actions & SB_FIRE))
{
pPlayer->weaponState = 8;
@ -2043,11 +2040,15 @@ void WeaponProcess(PLAYER *pPlayer) {
if (bShoot && CheckAmmo(pPlayer, pPlayer->weaponAmmo, 1))
{
while (pPlayer->weaponTimer <= 0)
{
pPlayer->weaponTimer += weaponQAV[pPlayer->weaponQav]->duration;
pPlayer->qavTimer += weaponQAV[pPlayer->weaponQav]->duration;
}
}
else
{
pPlayer->weaponTimer = 0;
pPlayer->qavTimer = 0;
pPlayer->qavLoop = 0;
}
return;