zdoom/raze
0
0
Fork 0
mirror of https://github.com/ZDoom/Raze.git synced 2024-12-15 07:01:15 +00:00
Code Issues Projects Releases Packages Wiki Activity
raze/source/games/blood/src/animatesprite.cpp

1006 lines
35 KiB
C++
Raw Normal View History

- split sprite animation off view.cpp
2020-08-02 17:59:14 +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 "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 sprite animation off view.cpp
2020-08-02 17:59:14 +00:00
#include "zstring.h"
- it compiles again (with lots of code commented out.)
2020-10-04 16:31:48 +00:00
#include "razemenu.h"
- split sprite animation off view.cpp
2020-08-02 17:59:14 +00:00
#include "gstrings.h"
#include "v_2ddrawer.h"
#include "v_video.h"
#include "v_font.h"
- Cleanup of the voxel code. * moving polymost_voxdraw into polymost.cpp. * consolidated all remaining voxel code in hw_voxels.cpp. All original Build voxel code is completely gone now, except for polymost_voxdraw, so this got moved out of the build/ folder. * integrate Blood's voxel init code into the main function. * some further cleanup was allowed as a result of this, so engineInit is gone now because these parts can now be done outside the games' app_init functions.
2021-04-05 11:55:36 +00:00
#include "hw_voxels.h"
- palookup.
2021-04-13 18:33:21 +00:00
#include "gamefuncs.h"
- split sprite animation off view.cpp
2020-08-02 17:59:14 +00:00
#include "glbackend/glbackend.h"
BEGIN_BLD_NS
- 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
static fixed_t gCameraAng;
- split sprite animation off view.cpp
2020-08-02 17:59:14 +00:00
int dword_172CE0[16][3];
static void RotateYZ(int *, int *pY, int *pZ, int ang)
{
int oY, oZ, angSin, angCos;
oY = *pY;
oZ = *pZ;
angSin = Sin(ang);
angCos = Cos(ang);
*pY = dmulscale30r(oY,angCos,oZ,-angSin);
*pZ = dmulscale30r(oY,angSin,oZ,angCos);
}
static void RotateXZ(int *pX, int *, int *pZ, int ang)
{
int oX, oZ, angSin, angCos;
oX = *pX;
oZ = *pZ;
angSin = Sin(ang);
angCos = Cos(ang);
*pX = dmulscale30r(oX,angCos,oZ,-angSin);
*pZ = dmulscale30r(oX,angSin,oZ,angCos);
}
- give each DrawInfo its own list of tsprites. Since these do not fully get processed sequentially the contents need to be preserved until needed. This required getting rid of the global tsprite array. Polymost still uses a static vatiable, though, but this is only accessed in polymost-exclusive code.
2021-04-02 08:28:40 +00:00
template<typename T> tspritetype* viewInsertTSprite(spritetype* tsprite, int& spritesortcnt, int nSector, int nStatnum, T const * const pSprite)
- split sprite animation off view.cpp
2020-08-02 17:59:14 +00:00
{
Blood: fix potential view sprite overflows
2021-07-26 05:59:59 +00:00
if (spritesortcnt >= MAXSPRITESONSCREEN)
return nullptr;
- split sprite animation off view.cpp
2020-08-02 17:59:14 +00:00
int nTSprite = spritesortcnt;
tspritetype *pTSprite = &tsprite[nTSprite];
memset(pTSprite, 0, sizeof(tspritetype));
pTSprite->cstat = 128;
pTSprite->xrepeat = 64;
pTSprite->yrepeat = 64;
pTSprite->owner = -1;
pTSprite->extra = -1;
pTSprite->type = -spritesortcnt;
pTSprite->statnum = nStatnum;
pTSprite->sectnum = nSector;
spritesortcnt++;
if (pSprite)
{
pTSprite->x = pSprite->x;
pTSprite->y = pSprite->y;
pTSprite->z = pSprite->z;
pTSprite->owner = pSprite->owner;
pTSprite->ang = pSprite->ang;
}
- re-enabled all model specific code in Duke's animatesprites function and removed some remaining software renderer-only code in the engine.
2020-12-01 22:57:39 +00:00
pTSprite->x += Cos(gCameraAng)>>25;
pTSprite->y += Sin(gCameraAng)>>25;
- split sprite animation off view.cpp
2020-08-02 17:59:14 +00:00
return pTSprite;
}
Blood: fix potential view sprite overflows
2021-07-26 05:59:59 +00:00
static const int effectDetail[kViewEffectMax] = {
- split sprite animation off view.cpp
2020-08-02 17:59:14 +00:00
4, 4, 4, 4, 0, 0, 0, 0, 0, 1, 4, 4, 0, 0, 0, 1, 0, 0, 0
};
struct WEAPONICON {
short nTile;
char zOffset;
};
static const WEAPONICON gWeaponIcon[] = {
{ -1, 0 },
{ -1, 0 }, // 1: pitchfork
{ 524, 6 }, // 2: flare gun
{ 559, 6 }, // 3: shotgun
{ 558, 8 }, // 4: tommy gun
{ 526, 6 }, // 5: napalm launcher
{ 589, 11 }, // 6: dynamite
{ 618, 11 }, // 7: spray can
{ 539, 6 }, // 8: tesla gun
{ 800, 0 }, // 9: life leech
{ 525, 11 }, // 10: voodoo doll
{ 811, 11 }, // 11: proxy bomb
{ 810, 11 }, // 12: remote bomb
{ -1, 0 },
};
- give each DrawInfo its own list of tsprites. Since these do not fully get processed sequentially the contents need to be preserved until needed. This required getting rid of the global tsprite array. Polymost still uses a static vatiable, though, but this is only accessed in polymost-exclusive code.
2021-04-02 08:28:40 +00:00
static tspritetype *viewAddEffect(spritetype* tsprite, int& spritesortcnt, int nTSprite, VIEW_EFFECT nViewEffect)
- split sprite animation off view.cpp
2020-08-02 17:59:14 +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(nViewEffect >= 0 && nViewEffect < kViewEffectMax);
- split sprite animation off view.cpp
2020-08-02 17:59:14 +00:00
auto pTSprite = &tsprite[nTSprite];
- some xsprite cleanup
2021-09-05 07:30:46 +00:00
auto owneractor = &bloodActors[pTSprite->owner];
- added sprite collection loop to ProcessSector and did a bit of cleanup on the TSprite code.
2021-03-25 22:16:32 +00:00
if (gDetail < effectDetail[nViewEffect] || nTSprite >= MAXSPRITESONSCREEN) return NULL;
- split sprite animation off view.cpp
2020-08-02 17:59:14 +00:00
switch (nViewEffect)
{
Add modern map kViewEffectSpotProgress support Fix kViewEffectShowWeapon positional/angle offset for voodoo doll
2021-08-23 09:12:32 +00:00
case kViewEffectSpotProgress: {
- some xsprite cleanup
2021-09-05 07:30:46 +00:00
XSPRITE* pXSprite = &owneractor->x();
Add modern map kViewEffectSpotProgress support Fix kViewEffectShowWeapon positional/angle offset for voodoo doll
2021-08-23 09:12:32 +00:00
int perc = (100 * pXSprite->data3) / kMaxPatrolSpotValue;
int width = (94 * pXSprite->data3) / kMaxPatrolSpotValue;
int top, bottom;
GetSpriteExtents(pTSprite, &top, &bottom);
auto pNSprite2 = viewInsertTSprite(tsprite, spritesortcnt, pTSprite->sectnum, 32767, pTSprite);
if (!pNSprite2)
break;
pNSprite2->picnum = 2203;
pNSprite2->xrepeat = width;
pNSprite2->yrepeat = 20;
pNSprite2->pal = 10;
if (perc >= 75) pNSprite2->pal = 0;
else if (perc >= 50) pNSprite2->pal = 6;
pNSprite2->z = top - 2048;
pNSprite2->shade = -128;
break;
}
- renamed some constants. Manually copied from NBlood because the underlying code has changed too much already.
2021-06-16 19:13:04 +00:00
case kViewEffectAtom:
- split sprite animation off view.cpp
2020-08-02 17:59:14 +00:00
for (int i = 0; i < 16; i++)
{
- give each DrawInfo its own list of tsprites. Since these do not fully get processed sequentially the contents need to be preserved until needed. This required getting rid of the global tsprite array. Polymost still uses a static vatiable, though, but this is only accessed in polymost-exclusive code.
2021-04-02 08:28:40 +00:00
auto pNSprite = viewInsertTSprite(tsprite, spritesortcnt, pTSprite->sectnum, 32767, pTSprite);
Blood: fix potential view sprite overflows
2021-07-26 05:59:59 +00:00
if (!pNSprite)
break;
- All Games: Migrate each game's clock counter to backend solution.
2021-02-18 10:46:36 +00:00
int ang = (PlayClock*2048)/120;
- split sprite animation off view.cpp
2020-08-02 17:59:14 +00:00
int nRand1 = dword_172CE0[i][0];
int nRand2 = dword_172CE0[i][1];
int nRand3 = dword_172CE0[i][2];
ang += nRand3;
- Replace `mulscale##()` calls with `MulScale()` from common. * Regex for reference: mulscale([0-9]+)\((.+)(\)+)
2021-01-04 11:36:54 +00:00
int x = MulScale(512, Cos(ang), 30);
int y = MulScale(512, Sin(ang), 30);
- split sprite animation off view.cpp
2020-08-02 17:59:14 +00:00
int z = 0;
RotateYZ(&x, &y, &z, nRand1);
RotateXZ(&x, &y, &z, nRand2);
pNSprite->x = pTSprite->x + x;
pNSprite->y = pTSprite->y + y;
pNSprite->z = pTSprite->z + (z<<4);
pNSprite->picnum = 1720;
pNSprite->shade = -128;
}
break;
- renamed some constants. Manually copied from NBlood because the underlying code has changed too much already.
2021-06-16 19:13:04 +00:00
case kViewEffectFlag:
case kViewEffectBigFlag:
- split sprite animation off view.cpp
2020-08-02 17:59:14 +00:00
{
int top, bottom;
GetSpriteExtents(pTSprite, &top, &bottom);
- give each DrawInfo its own list of tsprites. Since these do not fully get processed sequentially the contents need to be preserved until needed. This required getting rid of the global tsprite array. Polymost still uses a static vatiable, though, but this is only accessed in polymost-exclusive code.
2021-04-02 08:28:40 +00:00
auto pNSprite = viewInsertTSprite(tsprite, spritesortcnt, pTSprite->sectnum, 32767, pTSprite);
Blood: fix potential view sprite overflows
2021-07-26 05:59:59 +00:00
if (!pNSprite)
break;
- split sprite animation off view.cpp
2020-08-02 17:59:14 +00:00
pNSprite->shade = -128;
pNSprite->pal = 0;
pNSprite->z = top;
- renamed some constants. Manually copied from NBlood because the underlying code has changed too much already.
2021-06-16 19:13:04 +00:00
if (nViewEffect == kViewEffectFlag)
- split sprite animation off view.cpp
2020-08-02 17:59:14 +00:00
pNSprite->xrepeat = pNSprite->yrepeat = 24;
else
pNSprite->xrepeat = pNSprite->yrepeat = 64;
pNSprite->picnum = 3558;
return pNSprite;
}
- renamed some constants. Manually copied from NBlood because the underlying code has changed too much already.
2021-06-16 19:13:04 +00:00
case kViewEffectTesla:
- split sprite animation off view.cpp
2020-08-02 17:59:14 +00:00
{
- give each DrawInfo its own list of tsprites. Since these do not fully get processed sequentially the contents need to be preserved until needed. This required getting rid of the global tsprite array. Polymost still uses a static vatiable, though, but this is only accessed in polymost-exclusive code.
2021-04-02 08:28:40 +00:00
auto pNSprite = viewInsertTSprite(tsprite, spritesortcnt, pTSprite->sectnum, 32767, pTSprite);
Blood: fix potential view sprite overflows
2021-07-26 05:59:59 +00:00
if (!pNSprite)
break;
- split sprite animation off view.cpp
2020-08-02 17:59:14 +00:00
pNSprite->z = pTSprite->z;
pNSprite->cstat |= 2;
pNSprite->shade = -128;
pNSprite->xrepeat = pTSprite->xrepeat;
pNSprite->yrepeat = pTSprite->yrepeat;
pNSprite->picnum = 2135;
break;
}
- renamed some constants. Manually copied from NBlood because the underlying code has changed too much already.
2021-06-16 19:13:04 +00:00
case kViewEffectShoot:
- split sprite animation off view.cpp
2020-08-02 17:59:14 +00:00
{
- give each DrawInfo its own list of tsprites. Since these do not fully get processed sequentially the contents need to be preserved until needed. This required getting rid of the global tsprite array. Polymost still uses a static vatiable, though, but this is only accessed in polymost-exclusive code.
2021-04-02 08:28:40 +00:00
auto pNSprite = viewInsertTSprite(tsprite, spritesortcnt, pTSprite->sectnum, 32767, pTSprite);
Blood: fix potential view sprite overflows
2021-07-26 05:59:59 +00:00
if (!pNSprite)
break;
- split sprite animation off view.cpp
2020-08-02 17:59:14 +00:00
pNSprite->shade = -128;
pNSprite->pal = 0;
pNSprite->xrepeat = pNSprite->yrepeat = 64;
pNSprite->picnum = 2605;
return pNSprite;
}
- renamed some constants. Manually copied from NBlood because the underlying code has changed too much already.
2021-06-16 19:13:04 +00:00
case kViewEffectReflectiveBall:
- split sprite animation off view.cpp
2020-08-02 17:59:14 +00:00
{
- give each DrawInfo its own list of tsprites. Since these do not fully get processed sequentially the contents need to be preserved until needed. This required getting rid of the global tsprite array. Polymost still uses a static vatiable, though, but this is only accessed in polymost-exclusive code.
2021-04-02 08:28:40 +00:00
auto pNSprite = viewInsertTSprite(tsprite, spritesortcnt, pTSprite->sectnum, 32767, pTSprite);
Blood: fix potential view sprite overflows
2021-07-26 05:59:59 +00:00
if (!pNSprite)
break;
- split sprite animation off view.cpp
2020-08-02 17:59:14 +00:00
pNSprite->shade = 26;
pNSprite->pal = 0;
pNSprite->cstat |= 2;
pNSprite->xrepeat = pNSprite->yrepeat = 64;
pNSprite->picnum = 2089;
break;
}
- renamed some constants. Manually copied from NBlood because the underlying code has changed too much already.
2021-06-16 19:13:04 +00:00
case kViewEffectPhase:
- split sprite animation off view.cpp
2020-08-02 17:59:14 +00:00
{
- give each DrawInfo its own list of tsprites. Since these do not fully get processed sequentially the contents need to be preserved until needed. This required getting rid of the global tsprite array. Polymost still uses a static vatiable, though, but this is only accessed in polymost-exclusive code.
2021-04-02 08:28:40 +00:00
auto pNSprite = viewInsertTSprite(tsprite, spritesortcnt, pTSprite->sectnum, 32767, pTSprite);
Blood: fix potential view sprite overflows
2021-07-26 05:59:59 +00:00
if (!pNSprite)
break;
- split sprite animation off view.cpp
2020-08-02 17:59:14 +00:00
int top, bottom;
GetSpriteExtents(pTSprite, &top, &bottom);
pNSprite->shade = 26;
pNSprite->pal = 0;
pNSprite->cstat |= 2;
pNSprite->xrepeat = pNSprite->yrepeat = 24;
pNSprite->picnum = 626;
pNSprite->z = top;
break;
}
- renamed some constants. Manually copied from NBlood because the underlying code has changed too much already.
2021-06-16 19:13:04 +00:00
case kViewEffectTrail:
- split sprite animation off view.cpp
2020-08-02 17:59:14 +00:00
{
int nAng = pTSprite->ang;
if (pTSprite->cstat & 16)
{
nAng = (nAng+512)&2047;
}
else
{
nAng = (nAng+1024)&2047;
}
- added sprite collection loop to ProcessSector and did a bit of cleanup on the TSprite code.
2021-03-25 22:16:32 +00:00
for (int i = 0; i < 5 && spritesortcnt < MAXSPRITESONSCREEN; i++)
- split sprite animation off view.cpp
2020-08-02 17:59:14 +00:00
{
int nSector = pTSprite->sectnum;
- give each DrawInfo its own list of tsprites. Since these do not fully get processed sequentially the contents need to be preserved until needed. This required getting rid of the global tsprite array. Polymost still uses a static vatiable, though, but this is only accessed in polymost-exclusive code.
2021-04-02 08:28:40 +00:00
auto pNSprite = viewInsertTSprite<tspritetype>(tsprite, spritesortcnt, nSector, 32767, NULL);
Blood: fix potential view sprite overflows
2021-07-26 05:59:59 +00:00
if (!pNSprite)
break;
- split sprite animation off view.cpp
2020-08-02 17:59:14 +00:00
int nLen = 128+(i<<7);
- Replace `mulscale##()` calls with `MulScale()` from common. * Regex for reference: mulscale([0-9]+)\((.+)(\)+)
2021-01-04 11:36:54 +00:00
int x = MulScale(nLen, Cos(nAng), 30);
- split sprite animation off view.cpp
2020-08-02 17:59:14 +00:00
pNSprite->x = pTSprite->x + x;
- Replace `mulscale##()` calls with `MulScale()` from common. * Regex for reference: mulscale([0-9]+)\((.+)(\)+)
2021-01-04 11:36:54 +00:00
int y = MulScale(nLen, Sin(nAng), 30);
- split sprite animation off view.cpp
2020-08-02 17:59:14 +00:00
pNSprite->y = pTSprite->y + y;
pNSprite->z = pTSprite->z;
- 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 sprite animation off view.cpp
2020-08-02 17:59:14 +00:00
FindSector(pNSprite->x, pNSprite->y, pNSprite->z, &nSector);
pNSprite->sectnum = nSector;
pNSprite->owner = pTSprite->owner;
pNSprite->picnum = pTSprite->picnum;
pNSprite->cstat |= 2;
if (i < 2)
pNSprite->cstat |= 514;
pNSprite->shade = ClipLow(pTSprite->shade-16, -128);
pNSprite->xrepeat = pTSprite->xrepeat;
pNSprite->yrepeat = pTSprite->yrepeat;
pNSprite->picnum = pTSprite->picnum;
}
break;
}
- renamed some constants. Manually copied from NBlood because the underlying code has changed too much already.
2021-06-16 19:13:04 +00:00
case kViewEffectFlame:
- split sprite animation off view.cpp
2020-08-02 17:59:14 +00:00
{
- give each DrawInfo its own list of tsprites. Since these do not fully get processed sequentially the contents need to be preserved until needed. This required getting rid of the global tsprite array. Polymost still uses a static vatiable, though, but this is only accessed in polymost-exclusive code.
2021-04-02 08:28:40 +00:00
auto pNSprite = viewInsertTSprite(tsprite, spritesortcnt, pTSprite->sectnum, 32767, pTSprite);
Blood: fix potential view sprite overflows
2021-07-26 05:59:59 +00:00
if (!pNSprite)
break;
- split sprite animation off view.cpp
2020-08-02 17:59:14 +00:00
pNSprite->shade = -128;
pNSprite->z = pTSprite->z;
pNSprite->picnum = 908;
pNSprite->statnum = kStatDecoration;
- replaced approx 1/3 of all accesses to the tilesiz wrapper class.
2020-11-22 23:18:07 +00:00
pNSprite->xrepeat = pNSprite->yrepeat = (tileWidth(pTSprite->picnum)*pTSprite->xrepeat)/64;
- split sprite animation off view.cpp
2020-08-02 17:59:14 +00:00
break;
}
- renamed some constants. Manually copied from NBlood because the underlying code has changed too much already.
2021-06-16 19:13:04 +00:00
case kViewEffectSmokeHigh:
- split sprite animation off view.cpp
2020-08-02 17:59:14 +00:00
{
- give each DrawInfo its own list of tsprites. Since these do not fully get processed sequentially the contents need to be preserved until needed. This required getting rid of the global tsprite array. Polymost still uses a static vatiable, though, but this is only accessed in polymost-exclusive code.
2021-04-02 08:28:40 +00:00
auto pNSprite = viewInsertTSprite(tsprite, spritesortcnt, pTSprite->sectnum, 32767, pTSprite);
Blood: fix potential view sprite overflows
2021-07-26 05:59:59 +00:00
if (!pNSprite)
break;
- split sprite animation off view.cpp
2020-08-02 17:59:14 +00:00
int top, bottom;
GetSpriteExtents(pTSprite, &top, &bottom);
pNSprite->z = top;
if (IsDudeSprite(pTSprite))
pNSprite->picnum = 672;
else
pNSprite->picnum = 754;
pNSprite->cstat |= 2;
pNSprite->shade = 8;
pNSprite->xrepeat = pTSprite->xrepeat;
pNSprite->yrepeat = pTSprite->yrepeat;
break;
}
- renamed some constants. Manually copied from NBlood because the underlying code has changed too much already.
2021-06-16 19:13:04 +00:00
case kViewEffectSmokeLow:
- split sprite animation off view.cpp
2020-08-02 17:59:14 +00:00
{
- give each DrawInfo its own list of tsprites. Since these do not fully get processed sequentially the contents need to be preserved until needed. This required getting rid of the global tsprite array. Polymost still uses a static vatiable, though, but this is only accessed in polymost-exclusive code.
2021-04-02 08:28:40 +00:00
auto pNSprite = viewInsertTSprite(tsprite, spritesortcnt, pTSprite->sectnum, 32767, pTSprite);
Blood: fix potential view sprite overflows
2021-07-26 05:59:59 +00:00
if (!pNSprite)
break;
- split sprite animation off view.cpp
2020-08-02 17:59:14 +00:00
int top, bottom;
GetSpriteExtents(pTSprite, &top, &bottom);
pNSprite->z = bottom;
if (pTSprite->type >= kDudeBase && pTSprite->type < kDudeMax)
pNSprite->picnum = 672;
else
pNSprite->picnum = 754;
pNSprite->cstat |= 2;
pNSprite->shade = 8;
pNSprite->xrepeat = pTSprite->xrepeat;
pNSprite->yrepeat = pTSprite->yrepeat;
break;
}
- renamed some constants. Manually copied from NBlood because the underlying code has changed too much already.
2021-06-16 19:13:04 +00:00
case kViewEffectTorchHigh:
- split sprite animation off view.cpp
2020-08-02 17:59:14 +00:00
{
- give each DrawInfo its own list of tsprites. Since these do not fully get processed sequentially the contents need to be preserved until needed. This required getting rid of the global tsprite array. Polymost still uses a static vatiable, though, but this is only accessed in polymost-exclusive code.
2021-04-02 08:28:40 +00:00
auto pNSprite = viewInsertTSprite(tsprite, spritesortcnt, pTSprite->sectnum, 32767, pTSprite);
Blood: fix potential view sprite overflows
2021-07-26 05:59:59 +00:00
if (!pNSprite)
break;
- split sprite animation off view.cpp
2020-08-02 17:59:14 +00:00
int top, bottom;
GetSpriteExtents(pTSprite, &top, &bottom);
pNSprite->z = top;
pNSprite->picnum = 2101;
pNSprite->shade = -128;
- replaced approx 1/3 of all accesses to the tilesiz wrapper class.
2020-11-22 23:18:07 +00:00
pNSprite->xrepeat = pNSprite->yrepeat = (tileWidth(pTSprite->picnum)*pTSprite->xrepeat)/32;
- split sprite animation off view.cpp
2020-08-02 17:59:14 +00:00
break;
}
- renamed some constants. Manually copied from NBlood because the underlying code has changed too much already.
2021-06-16 19:13:04 +00:00
case kViewEffectTorchLow:
- split sprite animation off view.cpp
2020-08-02 17:59:14 +00:00
{
- give each DrawInfo its own list of tsprites. Since these do not fully get processed sequentially the contents need to be preserved until needed. This required getting rid of the global tsprite array. Polymost still uses a static vatiable, though, but this is only accessed in polymost-exclusive code.
2021-04-02 08:28:40 +00:00
auto pNSprite = viewInsertTSprite(tsprite, spritesortcnt, pTSprite->sectnum, 32767, pTSprite);
Blood: fix potential view sprite overflows
2021-07-26 05:59:59 +00:00
if (!pNSprite)
break;
- split sprite animation off view.cpp
2020-08-02 17:59:14 +00:00
int top, bottom;
GetSpriteExtents(pTSprite, &top, &bottom);
pNSprite->z = bottom;
pNSprite->picnum = 2101;
pNSprite->shade = -128;
- replaced approx 1/3 of all accesses to the tilesiz wrapper class.
2020-11-22 23:18:07 +00:00
pNSprite->xrepeat = pNSprite->yrepeat = (tileWidth(pTSprite->picnum)*pTSprite->xrepeat)/32;
- split sprite animation off view.cpp
2020-08-02 17:59:14 +00:00
break;
}
- renamed some constants. Manually copied from NBlood because the underlying code has changed too much already.
2021-06-16 19:13:04 +00:00
case kViewEffectShadow:
- split sprite animation off view.cpp
2020-08-02 17:59:14 +00:00
{
if (r_shadows)
{
- give each DrawInfo its own list of tsprites. Since these do not fully get processed sequentially the contents need to be preserved until needed. This required getting rid of the global tsprite array. Polymost still uses a static vatiable, though, but this is only accessed in polymost-exclusive code.
2021-04-02 08:28:40 +00:00
auto pNSprite = viewInsertTSprite(tsprite, spritesortcnt, pTSprite->sectnum, 32767, pTSprite);
Blood: fix potential view sprite overflows
2021-07-26 05:59:59 +00:00
if (!pNSprite)
break;
- split sprite animation off view.cpp
2020-08-02 17:59:14 +00:00
pNSprite->z = getflorzofslope(pTSprite->sectnum, pNSprite->x, pNSprite->y);
pNSprite->shade = 127;
pNSprite->cstat |= 2;
pNSprite->xrepeat = pTSprite->xrepeat;
pNSprite->yrepeat = pTSprite->yrepeat >> 2;
pNSprite->picnum = pTSprite->picnum;
pNSprite->pal = 5;
- replaced approx 1/3 of all accesses to the tilesiz wrapper class.
2020-11-22 23:18:07 +00:00
int height = tileHeight(pNSprite->picnum);
- split sprite animation off view.cpp
2020-08-02 17:59:14 +00:00
int center = height / 2 + tileTopOffset(pNSprite->picnum);
pNSprite->z -= (pNSprite->yrepeat << 2) * (height - center);
}
break;
}
- renamed some constants. Manually copied from NBlood because the underlying code has changed too much already.
2021-06-16 19:13:04 +00:00
case kViewEffectFlareHalo:
- split sprite animation off view.cpp
2020-08-02 17:59:14 +00:00
{
- give each DrawInfo its own list of tsprites. Since these do not fully get processed sequentially the contents need to be preserved until needed. This required getting rid of the global tsprite array. Polymost still uses a static vatiable, though, but this is only accessed in polymost-exclusive code.
2021-04-02 08:28:40 +00:00
auto pNSprite = viewInsertTSprite(tsprite, spritesortcnt, pTSprite->sectnum, 32767, pTSprite);
Blood: fix potential view sprite overflows
2021-07-26 05:59:59 +00:00
if (!pNSprite)
break;
- split sprite animation off view.cpp
2020-08-02 17:59:14 +00:00
pNSprite->shade = -128;
pNSprite->pal = 2;
pNSprite->cstat |= 2;
pNSprite->z = pTSprite->z;
pNSprite->xrepeat = pTSprite->xrepeat;
pNSprite->yrepeat = pTSprite->yrepeat;
pNSprite->picnum = 2427;
break;
}
- renamed some constants. Manually copied from NBlood because the underlying code has changed too much already.
2021-06-16 19:13:04 +00:00
case kViewEffectCeilGlow:
- split sprite animation off view.cpp
2020-08-02 17:59:14 +00:00
{
- give each DrawInfo its own list of tsprites. Since these do not fully get processed sequentially the contents need to be preserved until needed. This required getting rid of the global tsprite array. Polymost still uses a static vatiable, though, but this is only accessed in polymost-exclusive code.
2021-04-02 08:28:40 +00:00
auto pNSprite = viewInsertTSprite(tsprite, spritesortcnt, pTSprite->sectnum, 32767, pTSprite);
Blood: fix potential view sprite overflows
2021-07-26 05:59:59 +00:00
if (!pNSprite)
break;
- split sprite animation off view.cpp
2020-08-02 17:59:14 +00:00
sectortype *pSector = &sector[pTSprite->sectnum];
pNSprite->x = pTSprite->x;
pNSprite->y = pTSprite->y;
pNSprite->z = pSector->ceilingz;
pNSprite->picnum = 624;
pNSprite->shade = ((pTSprite->z-pSector->ceilingz)>>8)-64;
pNSprite->pal = 2;
pNSprite->xrepeat = pNSprite->yrepeat = 64;
pNSprite->cstat |= 106;
pNSprite->ang = pTSprite->ang;
pNSprite->owner = pTSprite->owner;
break;
}
- renamed some constants. Manually copied from NBlood because the underlying code has changed too much already.
2021-06-16 19:13:04 +00:00
case kViewEffectFloorGlow:
- split sprite animation off view.cpp
2020-08-02 17:59:14 +00:00
{
- give each DrawInfo its own list of tsprites. Since these do not fully get processed sequentially the contents need to be preserved until needed. This required getting rid of the global tsprite array. Polymost still uses a static vatiable, though, but this is only accessed in polymost-exclusive code.
2021-04-02 08:28:40 +00:00
auto pNSprite = viewInsertTSprite(tsprite, spritesortcnt, pTSprite->sectnum, 32767, pTSprite);
Blood: fix potential view sprite overflows
2021-07-26 05:59:59 +00:00
if (!pNSprite)
break;
- split sprite animation off view.cpp
2020-08-02 17:59:14 +00:00
sectortype *pSector = &sector[pTSprite->sectnum];
pNSprite->x = pTSprite->x;
pNSprite->y = pTSprite->y;
pNSprite->z = pSector->floorz;
pNSprite->picnum = 624;
char nShade = (pSector->floorz-pTSprite->z)>>8;
pNSprite->shade = nShade-32;
pNSprite->pal = 2;
pNSprite->xrepeat = pNSprite->yrepeat = nShade;
pNSprite->cstat |= 98;
pNSprite->ang = pTSprite->ang;
pNSprite->owner = pTSprite->owner;
break;
}
- renamed some constants. Manually copied from NBlood because the underlying code has changed too much already.
2021-06-16 19:13:04 +00:00
case kViewEffectSpear:
- split sprite animation off view.cpp
2020-08-02 17:59:14 +00:00
{
- give each DrawInfo its own list of tsprites. Since these do not fully get processed sequentially the contents need to be preserved until needed. This required getting rid of the global tsprite array. Polymost still uses a static vatiable, though, but this is only accessed in polymost-exclusive code.
2021-04-02 08:28:40 +00:00
auto pNSprite = viewInsertTSprite(tsprite, spritesortcnt, pTSprite->sectnum, 32767, pTSprite);
Blood: fix potential view sprite overflows
2021-07-26 05:59:59 +00:00
if (!pNSprite)
break;
- split sprite animation off view.cpp
2020-08-02 17:59:14 +00:00
pNSprite->z = pTSprite->z;
if (gDetail > 1)
pNSprite->cstat |= 514;
pNSprite->shade = ClipLow(pTSprite->shade-32, -128);
pNSprite->xrepeat = pTSprite->xrepeat;
pNSprite->yrepeat = 64;
pNSprite->picnum = 775;
break;
}
- renamed some constants. Manually copied from NBlood because the underlying code has changed too much already.
2021-06-16 19:13:04 +00:00
case kViewEffectShowWeapon:
- split sprite animation off view.cpp
2020-08-02 17:59:14 +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(pTSprite->type >= kDudePlayer1 && pTSprite->type <= kDudePlayer8);
- split sprite animation off view.cpp
2020-08-02 17:59:14 +00:00
PLAYER *pPlayer = &gPlayer[pTSprite->type-kDudePlayer1];
WEAPONICON weaponIcon = gWeaponIcon[pPlayer->curWeapon];
- Blood: Replace all numerical constants for player's `curWeapon` with enum values.
2021-08-18 09:56:06 +00:00
auto& nTile = weaponIcon.nTile;
- split sprite animation off view.cpp
2020-08-02 17:59:14 +00:00
if (nTile < 0) break;
- give each DrawInfo its own list of tsprites. Since these do not fully get processed sequentially the contents need to be preserved until needed. This required getting rid of the global tsprite array. Polymost still uses a static vatiable, though, but this is only accessed in polymost-exclusive code.
2021-04-02 08:28:40 +00:00
auto pNSprite = viewInsertTSprite(tsprite, spritesortcnt, pTSprite->sectnum, 32767, pTSprite);
Blood: fix potential view sprite overflows
2021-07-26 05:59:59 +00:00
if (!pNSprite)
break;
- split sprite animation off view.cpp
2020-08-02 17:59:14 +00:00
pNSprite->x = pTSprite->x;
pNSprite->y = pTSprite->y;
pNSprite->z = pTSprite->z-(32<<8);
Add modern map kViewEffectSpotProgress support Fix kViewEffectShowWeapon positional/angle offset for voodoo doll
2021-08-23 09:12:32 +00:00
pNSprite->z -= weaponIcon.zOffset<<8; // offset up
- split sprite animation off view.cpp
2020-08-02 17:59:14 +00:00
pNSprite->picnum = nTile;
pNSprite->shade = pTSprite->shade;
pNSprite->xrepeat = 32;
pNSprite->yrepeat = 32;
- Blood: Replace all numerical constants for player's `curWeapon` with enum values.
2021-08-18 09:56:06 +00:00
auto& nVoxel = voxelIndex[nTile];
- removed leftover Polymer checks.
2020-11-11 12:03:47 +00:00
if (cl_showweapon == 2 && r_voxels && nVoxel != -1)
- split sprite animation off view.cpp
2020-08-02 17:59:14 +00:00
{
Add modern map kViewEffectSpotProgress support Fix kViewEffectShowWeapon positional/angle offset for voodoo doll
2021-08-23 09:12:32 +00:00
pNSprite->ang = (gView->pSprite->ang + 512) & 2047; // always face viewer
- split sprite animation off view.cpp
2020-08-02 17:59:14 +00:00
pNSprite->cstat |= 48;
pNSprite->cstat &= ~8;
pNSprite->picnum = nVoxel;
Add modern map kViewEffectSpotProgress support Fix kViewEffectShowWeapon positional/angle offset for voodoo doll
2021-08-23 09:12:32 +00:00
if (pPlayer->curWeapon == kWeapLifeLeech) // position lifeleech behind player
- split sprite animation off view.cpp
2020-08-02 17:59:14 +00:00
{
Add modern map kViewEffectSpotProgress support Fix kViewEffectShowWeapon positional/angle offset for voodoo doll
2021-08-23 09:12:32 +00:00
pNSprite->x += MulScale(128, Cos(gView->pSprite->ang), 30);
pNSprite->y += MulScale(128, Sin(gView->pSprite->ang), 30);
- split sprite animation off view.cpp
2020-08-02 17:59:14 +00:00
}
Add modern map kViewEffectSpotProgress support Fix kViewEffectShowWeapon positional/angle offset for voodoo doll
2021-08-23 09:12:32 +00:00
if ((pPlayer->curWeapon == kWeapLifeLeech) || (pPlayer->curWeapon == kWeapVoodooDoll)) // make lifeleech/voodoo doll always face viewer like sprite
pNSprite->ang = (pNSprite->ang + 512) & 2047; // offset angle 90 degrees
- split sprite animation off view.cpp
2020-08-02 17:59:14 +00:00
}
break;
}
}
return NULL;
}
static void viewApplyDefaultPal(tspritetype *pTSprite, sectortype const *pSector)
{
- Blood: Replace all numerical constants for player's `curWeapon` with enum values.
2021-08-18 09:56:06 +00:00
auto& nXSector = pSector->extra;
- split sprite animation off view.cpp
2020-08-02 17:59:14 +00:00
XSECTOR const *pXSector = nXSector >= 0 ? &xsector[nXSector] : NULL;
if (pXSector && pXSector->color && (VanillaMode() || pSector->floorpal != 0))
{
- palookup.
2021-04-13 18:33:21 +00:00
copyfloorpal(pTSprite, pSector);
- split sprite animation off view.cpp
2020-08-02 17:59:14 +00:00
}
}
- give each DrawInfo its own list of tsprites. Since these do not fully get processed sequentially the contents need to be preserved until needed. This required getting rid of the global tsprite array. Polymost still uses a static vatiable, though, but this is only accessed in polymost-exclusive code.
2021-04-02 08:28:40 +00:00
void viewProcessSprites(spritetype* tsprite, int& spritesortcnt, int32_t cX, int32_t cY, int32_t cZ, int32_t cA, int32_t smoothratio)
- split sprite animation off view.cpp
2020-08-02 17:59:14 +00:00
{
- use gFrameClock plus interpolation for angles in viewProcessSprites Both more reliable and precise.
2020-09-01 18:02:37 +00:00
// shift before interpolating to increase precision.
- All Games: Migrate each game's clock counter to backend solution.
2021-02-18 10:46:36 +00:00
int myclock = (PlayClock<<3) + MulScale(4<<3, smoothratio, 16);
- added sprite collection loop to ProcessSector and did a bit of cleanup on the TSprite code.
2021-03-25 22:16:32 +00:00
assert(spritesortcnt <= MAXSPRITESONSCREEN);
- split sprite animation off view.cpp
2020-08-02 17:59:14 +00:00
gCameraAng = cA;
int nViewSprites = spritesortcnt;
for (int nTSprite = spritesortcnt-1; nTSprite >= 0; nTSprite--)
{
tspritetype *pTSprite = &tsprite[nTSprite];
- made voodooTarget a pointer and removed most direct references to target_i.
2021-08-29 16:13:15 +00:00
auto owneractor = &bloodActors[pTSprite->owner];
- split sprite animation off view.cpp
2020-08-02 17:59:14 +00:00
//int nXSprite = pTSprite->extra;
XSPRITE *pTXSprite = NULL;
- these parts were missed somehow.
2020-10-02 20:42:54 +00:00
if (sprite[pTSprite->owner].detail > gDetail)
- split sprite animation off view.cpp
2020-08-02 17:59:14 +00:00
{
pTSprite->xrepeat = 0;
continue;
}
- some xsprite cleanup
2021-09-05 07:30:46 +00:00
if (owneractor->hasX())
- split sprite animation off view.cpp
2020-08-02 17:59:14 +00:00
{
- some xsprite cleanup
2021-09-05 07:30:46 +00:00
pTXSprite = &owneractor->x();
- split sprite animation off view.cpp
2020-08-02 17:59:14 +00:00
}
int nTile = pTSprite->picnum;
if (nTile < 0 || nTile >= kMaxTiles)
{
continue;
}
int nSprite = pTSprite->owner;
- moved gInterpolateSprite into DBloodActor
2021-09-05 10:35:13 +00:00
if (cl_interpolate && owneractor->interpolated && !(pTSprite->flags&512))
- split sprite animation off view.cpp
2020-08-02 17:59:14 +00:00
{
- Blood: Leverage new `spritetype` methods within Blood.
2021-01-05 12:48:20 +00:00
pTSprite->pos = pTSprite->interpolatedvec3(gInterpolate);
pTSprite->ang = pTSprite->interpolatedang(gInterpolate);
- split sprite animation off view.cpp
2020-08-02 17:59:14 +00:00
}
int nAnim = 0;
switch (picanm[nTile].extra & 7) {
case 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(nXSprite > 0 && nXSprite < kMaxXSprites);
- some xsprite cleanup
2021-09-05 07:30:46 +00:00
if (pTXSprite == nullptr) break;
- split sprite animation off view.cpp
2020-08-02 17:59:14 +00:00
switch (pTSprite->type) {
case kSwitchToggle:
case kSwitchOneWay:
- some xsprite cleanup
2021-09-05 07:30:46 +00:00
if (pTXSprite->state) nAnim = 1;
- split sprite animation off view.cpp
2020-08-02 17:59:14 +00:00
break;
case kSwitchCombo:
- some xsprite cleanup
2021-09-05 07:30:46 +00:00
nAnim = pTXSprite->data1;
- split sprite animation off view.cpp
2020-08-02 17:59:14 +00:00
break;
}
break;
case 1:
{
if (tilehasmodelorvoxel(pTSprite->picnum, pTSprite->pal) && !(spriteext[nSprite].flags&SPREXT_NOTMD))
{
pTSprite->cstat &= ~4;
break;
}
int dX = cX - pTSprite->x;
int dY = cY - pTSprite->y;
RotateVector(&dX, &dY, 128-pTSprite->ang);
nAnim = GetOctant(dX, dY);
if (nAnim <= 4)
{
pTSprite->cstat &= ~4;
}
else
{
nAnim = 8 - nAnim;
pTSprite->cstat |= 4;
}
break;
}
case 2:
{
if (tilehasmodelorvoxel(pTSprite->picnum, pTSprite->pal) && !(spriteext[nSprite].flags&SPREXT_NOTMD))
{
pTSprite->cstat &= ~4;
break;
}
int dX = cX - pTSprite->x;
int dY = cY - pTSprite->y;
RotateVector(&dX, &dY, 128-pTSprite->ang);
nAnim = GetOctant(dX, dY);
break;
}
case 3:
{
- some xsprite cleanup
2021-09-05 07:30:46 +00:00
if (pTXSprite)
- split sprite animation off view.cpp
2020-08-02 17:59:14 +00:00
{
- moved gSpriteHit into DBloodActor.
2021-08-29 17:09:29 +00:00
if (owneractor->hit.florhit.type == kHitNone)
- split sprite animation off view.cpp
2020-08-02 17:59:14 +00:00
nAnim = 1;
}
else
{
int top, bottom;
GetSpriteExtents(pTSprite, &top, &bottom);
if (getflorzofslope(pTSprite->sectnum, pTSprite->x, pTSprite->y) > bottom)
nAnim = 1;
}
break;
}
case 6:
case 7:
{
if (hw_models && md_tilehasmodel(pTSprite->picnum, pTSprite->pal) >= 0 && !(spriteext[nSprite].flags&SPREXT_NOTMD))
break;
// Can be overridden by def script
- removed leftover Polymer checks.
2020-11-11 12:03:47 +00:00
if (r_voxels && tiletovox[pTSprite->picnum] == -1 && voxelIndex[pTSprite->picnum] != -1 && !(spriteext[nSprite].flags&SPREXT_NOTMD))
- split sprite animation off view.cpp
2020-08-02 17:59:14 +00:00
{
if ((pTSprite->flags&kHitagRespawn) == 0)
{
pTSprite->cstat |= 48;
pTSprite->cstat &= ~(4|8);
pTSprite->yoffset += tileTopOffset(pTSprite->picnum);
pTSprite->picnum = voxelIndex[pTSprite->picnum];
if ((picanm[nTile].extra&7) == 7)
{
- use gFrameClock plus interpolation for angles in viewProcessSprites Both more reliable and precise.
2020-09-01 18:02:37 +00:00
pTSprite->ang = myclock & 2047;
- split sprite animation off view.cpp
2020-08-02 17:59:14 +00:00
}
}
}
break;
}
}
while (nAnim > 0)
{
pTSprite->picnum += picanm[pTSprite->picnum].num+1;
nAnim--;
}
- re-enabled all model specific code in Duke's animatesprites function and removed some remaining software renderer-only code in the engine.
2020-12-01 22:57:39 +00:00
if ((pTSprite->cstat&48) != 48 && r_voxels && !(spriteext[nSprite].flags&SPREXT_NOTMD))
- split sprite animation off view.cpp
2020-08-02 17:59:14 +00:00
{
int const nRootTile = pTSprite->picnum;
int nAnimTile = pTSprite->picnum + animateoffs_replace(pTSprite->picnum, 32768+pTSprite->owner);
#if 0
if (tiletovox[nAnimTile] != -1)
{
pTSprite->yoffset += tileTopOffset(nAnimTile);
pTSprite->xoffset += tileLeftOffset(nAnimTile);
}
#endif
int const nVoxel = tiletovox[pTSprite->picnum];
- handle voxel rotation in the backend to enable it for all games. This was previously only present in the Blood module and missed in Exhumed from upstream so the entire option was rather pointless. Fixes #290
2021-04-04 08:33:29 +00:00
if (nVoxel != -1 && (picanm[nRootTile].extra & 7) == 7)
- split off the extended sprite flags into their own word. Some code overwrites the cstat field entirely (thanks Duke, for being sloppy with this...!)
2021-09-05 10:25:52 +00:00
pTSprite->cstat2 |= CSTAT2_SPRITE_MDLROTATE; // per-sprite rotation setting.
- split sprite animation off view.cpp
2020-08-02 17:59:14 +00:00
}
if ((pTSprite->cstat&48) != 48 && hw_models && !(spriteext[nSprite].flags&SPREXT_NOTMD))
{
int const nRootTile = pTSprite->picnum;
int nAnimTile = pTSprite->picnum + animateoffs_replace(pTSprite->picnum, 32768+pTSprite->owner);
if (tile2model[Ptile2tile(nAnimTile, pTSprite->pal)].modelid >= 0 &&
tile2model[Ptile2tile(nAnimTile, pTSprite->pal)].framenum >= 0)
{
pTSprite->yoffset += tileTopOffset(nAnimTile);
pTSprite->xoffset += tileLeftOffset(nAnimTile);
if ((picanm[nRootTile].extra&7) == 7)
- split off the extended sprite flags into their own word. Some code overwrites the cstat field entirely (thanks Duke, for being sloppy with this...!)
2021-09-05 10:25:52 +00:00
pTSprite->cstat2 |= CSTAT2_SPRITE_MDLROTATE; // per-sprite rotation setting.
- split sprite animation off view.cpp
2020-08-02 17:59:14 +00:00
}
}
sectortype *pSector = &sector[pTSprite->sectnum];
XSECTOR *pXSector;
int nShade = pTSprite->shade;
if (pSector->extra > 0)
{
pXSector = &xsector[pSector->extra];
}
else
{
pXSector = NULL;
}
if ((pSector->ceilingstat&1) && (pSector->floorstat&32768) == 0)
{
nShade += tileShade[pSector->ceilingpicnum]+pSector->ceilingshade;
}
else
{
nShade += tileShade[pSector->floorpicnum]+pSector->floorshade;
}
nShade += tileShade[pTSprite->picnum];
pTSprite->shade = ClipRange(nShade, -128, 127);
if ((pTSprite->flags&kHitagRespawn) && sprite[pTSprite->owner].owner == 3)
{
- 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(pTXSprite != NULL);
- split sprite animation off view.cpp
2020-08-02 17:59:14 +00:00
pTSprite->xrepeat = 48;
pTSprite->yrepeat = 48;
pTSprite->shade = -128;
pTSprite->picnum = 2272 + 2*pTXSprite->respawnPending;
pTSprite->cstat &= ~514;
if (((IsItemSprite(pTSprite) || IsAmmoSprite(pTSprite)) && gGameOptions.nItemSettings == 2)
|| (IsWeaponSprite(pTSprite) && gGameOptions.nWeaponSettings == 3))
{
pTSprite->xrepeat = pTSprite->yrepeat = 48;
}
else
{
pTSprite->xrepeat = pTSprite->yrepeat = 0;
}
}
- added sprite collection loop to ProcessSector and did a bit of cleanup on the TSprite code.
2021-03-25 22:16:32 +00:00
if (spritesortcnt >= MAXSPRITESONSCREEN) continue;
- split sprite animation off view.cpp
2020-08-02 17:59:14 +00:00
if (pTXSprite && pTXSprite->burnTime > 0)
{
pTSprite->shade = ClipRange(pTSprite->shade-16-QRandom(8), -128, 127);
}
if (pTSprite->flags&256)
{
- renamed some constants. Manually copied from NBlood because the underlying code has changed too much already.
2021-06-16 19:13:04 +00:00
viewAddEffect(tsprite, spritesortcnt, nTSprite, kViewEffectSmokeHigh);
- split sprite animation off view.cpp
2020-08-02 17:59:14 +00:00
}
if (pTSprite->flags&1024)
{
pTSprite->cstat |= 4;
}
if (pTSprite->flags&2048)
{
pTSprite->cstat |= 8;
}
switch (pTSprite->statnum) {
case kStatDecoration: {
switch (pTSprite->type) {
case kDecorationCandle:
if (!pTXSprite || pTXSprite->state == 1) {
pTSprite->shade = -128;
- renamed some constants. Manually copied from NBlood because the underlying code has changed too much already.
2021-06-16 19:13:04 +00:00
viewAddEffect(tsprite, spritesortcnt, nTSprite, kViewEffectPhase);
- split sprite animation off view.cpp
2020-08-02 17:59:14 +00:00
} else {
pTSprite->shade = -8;
}
break;
case kDecorationTorch:
if (!pTXSprite || pTXSprite->state == 1) {
pTSprite->picnum++;
- renamed some constants. Manually copied from NBlood because the underlying code has changed too much already.
2021-06-16 19:13:04 +00:00
viewAddEffect(tsprite, spritesortcnt, nTSprite, kViewEffectTorchHigh);
- split sprite animation off view.cpp
2020-08-02 17:59:14 +00:00
} else {
- renamed some constants. Manually copied from NBlood because the underlying code has changed too much already.
2021-06-16 19:13:04 +00:00
viewAddEffect(tsprite, spritesortcnt, nTSprite, kViewEffectSmokeHigh);
- split sprite animation off view.cpp
2020-08-02 17:59:14 +00:00
}
break;
default:
viewApplyDefaultPal(pTSprite, pSector);
break;
}
}
break;
case kStatItem: {
switch (pTSprite->type) {
case kItemFlagABase:
if (pTXSprite && pTXSprite->state > 0 && gGameOptions.nGameType == 3) {
- renamed some constants. Manually copied from NBlood because the underlying code has changed too much already.
2021-06-16 19:13:04 +00:00
auto pNTSprite = viewAddEffect(tsprite, spritesortcnt, nTSprite, kViewEffectBigFlag);
- split sprite animation off view.cpp
2020-08-02 17:59:14 +00:00
if (pNTSprite) pNTSprite->pal = 10;
}
break;
case kItemFlagBBase:
if (pTXSprite && pTXSprite->state > 0 && gGameOptions.nGameType == 3) {
- renamed some constants. Manually copied from NBlood because the underlying code has changed too much already.
2021-06-16 19:13:04 +00:00
auto pNTSprite = viewAddEffect(tsprite, spritesortcnt, nTSprite, kViewEffectBigFlag);
- split sprite animation off view.cpp
2020-08-02 17:59:14 +00:00
if (pNTSprite) pNTSprite->pal = 7;
}
break;
case kItemFlagA:
pTSprite->pal = 10;
pTSprite->cstat |= 1024;
break;
case kItemFlagB:
pTSprite->pal = 7;
pTSprite->cstat |= 1024;
break;
default:
if (pTSprite->type >= kItemKeySkull && pTSprite->type < kItemKeyMax)
pTSprite->shade = -128;
viewApplyDefaultPal(pTSprite, pSector);
break;
}
}
break;
case kStatProjectile: {
switch (pTSprite->type) {
case kMissileTeslaAlt:
pTSprite->yrepeat = 128;
pTSprite->cstat |= 32;
break;
case kMissileTeslaRegular:
- renamed some constants. Manually copied from NBlood because the underlying code has changed too much already.
2021-06-16 19:13:04 +00:00
viewAddEffect(tsprite, spritesortcnt, nTSprite, kViewEffectTesla);
- split sprite animation off view.cpp
2020-08-02 17:59:14 +00:00
break;
case kMissileButcherKnife:
- renamed some constants. Manually copied from NBlood because the underlying code has changed too much already.
2021-06-16 19:13:04 +00:00
viewAddEffect(tsprite, spritesortcnt, nTSprite, kViewEffectTrail);
- split sprite animation off view.cpp
2020-08-02 17:59:14 +00:00
break;
case kMissileFlareRegular:
case kMissileFlareAlt:
if (pTSprite->statnum == kStatFlare) {
- store an actual actor pointer in PLAYER. # Conflicts: # source/games/blood/src/player.cpp
2021-09-05 07:53:06 +00:00
if (owneractor->GetTarget() == gView->actor)
- made voodooTarget a pointer and removed most direct references to target_i.
2021-08-29 16:13:15 +00:00
{
- split sprite animation off view.cpp
2020-08-02 17:59:14 +00:00
pTSprite->xrepeat = 0;
break;
}
}
- renamed some constants. Manually copied from NBlood because the underlying code has changed too much already.
2021-06-16 19:13:04 +00:00
viewAddEffect(tsprite, spritesortcnt, nTSprite, kViewEffectFlareHalo);
- split sprite animation off view.cpp
2020-08-02 17:59:14 +00:00
if (pTSprite->type != kMissileFlareRegular) break;
sectortype *pSector = &sector[pTSprite->sectnum];
int zDiff = (pTSprite->z - pSector->ceilingz) >> 8;
if ((pSector->ceilingstat&1) == 0 && zDiff < 64) {
- renamed some constants. Manually copied from NBlood because the underlying code has changed too much already.
2021-06-16 19:13:04 +00:00
viewAddEffect(tsprite, spritesortcnt, nTSprite, kViewEffectCeilGlow);
- split sprite animation off view.cpp
2020-08-02 17:59:14 +00:00
}
zDiff = (pSector->floorz - pTSprite->z) >> 8;
if ((pSector->floorstat&1) == 0 && zDiff < 64) {
- renamed some constants. Manually copied from NBlood because the underlying code has changed too much already.
2021-06-16 19:13:04 +00:00
viewAddEffect(tsprite, spritesortcnt, nTSprite, kViewEffectFloorGlow);
- split sprite animation off view.cpp
2020-08-02 17:59:14 +00:00
}
break;
}
break;
}
case kStatDude:
{
if (pTSprite->type == kDudeHand && pTXSprite->aiState == &hand13A3B4)
{
- made voodooTarget a pointer and removed most direct references to target_i.
2021-08-29 16:13:15 +00:00
auto target = owneractor->GetTarget();
if (target && target->IsPlayerActor())
- split sprite animation off view.cpp
2020-08-02 17:59:14 +00:00
{
pTSprite->xrepeat = 0;
break;
}
}
- palookup.
2021-04-13 18:33:21 +00:00
if (pXSector && pXSector->color) copyfloorpal(pTSprite, pSector);
- split sprite animation off view.cpp
2020-08-02 17:59:14 +00:00
if (powerupCheck(gView, kPwUpBeastVision) > 0) pTSprite->shade = -128;
if (IsPlayerSprite(pTSprite)) {
PLAYER *pPlayer = &gPlayer[pTSprite->type-kDudePlayer1];
if (powerupCheck(pPlayer, kPwUpShadowCloak) && !powerupCheck(gView, kPwUpBeastVision)) {
pTSprite->cstat |= 2;
pTSprite->pal = 5;
} else if (powerupCheck(pPlayer, kPwUpDeathMask)) {
pTSprite->shade = -128;
pTSprite->pal = 5;
} else if (powerupCheck(pPlayer, kPwUpDoppleganger)) {
pTSprite->pal = 11+(gView->teamId&3);
}
if (powerupCheck(pPlayer, kPwUpReflectShots)) {
- renamed some constants. Manually copied from NBlood because the underlying code has changed too much already.
2021-06-16 19:13:04 +00:00
viewAddEffect(tsprite, spritesortcnt, nTSprite, kViewEffectReflectiveBall);
- split sprite animation off view.cpp
2020-08-02 17:59:14 +00:00
}
if (cl_showweapon && gGameOptions.nGameType > 0 && gView) {
- renamed some constants. Manually copied from NBlood because the underlying code has changed too much already.
2021-06-16 19:13:04 +00:00
viewAddEffect(tsprite, spritesortcnt, nTSprite, kViewEffectShowWeapon);
- split sprite animation off view.cpp
2020-08-02 17:59:14 +00:00
}
if (pPlayer->flashEffect && (gView != pPlayer || gViewPos != VIEWPOS_0)) {
- renamed some constants. Manually copied from NBlood because the underlying code has changed too much already.
2021-06-16 19:13:04 +00:00
auto pNTSprite = viewAddEffect(tsprite, spritesortcnt, nTSprite, kViewEffectShoot);
- split sprite animation off view.cpp
2020-08-02 17:59:14 +00:00
if (pNTSprite) {
POSTURE *pPosture = &pPlayer->pPosture[pPlayer->lifeMode][pPlayer->posture];
- Replace `mulscale##()` calls with `MulScale()` from common. * Regex for reference: mulscale([0-9]+)\((.+)(\)+)
2021-01-04 11:36:54 +00:00
pNTSprite->x += MulScale(pPosture->zOffset, Cos(pTSprite->ang), 28);
pNTSprite->y += MulScale(pPosture->zOffset, Sin(pTSprite->ang), 28);
- split sprite animation off view.cpp
2020-08-02 17:59:14 +00:00
pNTSprite->z = pPlayer->pSprite->z-pPosture->xOffset;
}
}
if (pPlayer->hasFlag > 0 && gGameOptions.nGameType == 3) {
if (pPlayer->hasFlag&1) {
- renamed some constants. Manually copied from NBlood because the underlying code has changed too much already.
2021-06-16 19:13:04 +00:00
auto pNTSprite = viewAddEffect(tsprite, spritesortcnt, nTSprite, kViewEffectFlag);
- split sprite animation off view.cpp
2020-08-02 17:59:14 +00:00
if (pNTSprite)
{
pNTSprite->pal = 10;
pNTSprite->cstat |= 4;
}
}
if (pPlayer->hasFlag&2) {
- renamed some constants. Manually copied from NBlood because the underlying code has changed too much already.
2021-06-16 19:13:04 +00:00
auto pNTSprite = viewAddEffect(tsprite, spritesortcnt, nTSprite, kViewEffectFlag);
- split sprite animation off view.cpp
2020-08-02 17:59:14 +00:00
if (pNTSprite)
{
pNTSprite->pal = 7;
pNTSprite->cstat |= 4;
}
}
}
}
- mark all places using a sprite index that needs addressing with a GetSpriteIndex function.
2021-09-05 17:05:06 +00:00
if (pTSprite->owner != gView->actor->GetSpriteIndex() || gViewPos != VIEWPOS_0) {
- split sprite animation off view.cpp
2020-08-02 17:59:14 +00:00
if (getflorzofslope(pTSprite->sectnum, pTSprite->x, pTSprite->y) >= cZ)
{
- renamed some constants. Manually copied from NBlood because the underlying code has changed too much already.
2021-06-16 19:13:04 +00:00
viewAddEffect(tsprite, spritesortcnt, nTSprite, kViewEffectShadow);
- split sprite animation off view.cpp
2020-08-02 17:59:14 +00:00
}
}
Add modern map kViewEffectSpotProgress support Fix kViewEffectShowWeapon positional/angle offset for voodoo doll
2021-08-23 09:12:32 +00:00
if (gModernMap) { // add target spot indicator for patrol dudes
if (pTXSprite->dudeFlag4 && aiInPatrolState(pTXSprite->aiState) && pTXSprite->data3 > 0 && pTXSprite->data3 <= kMaxPatrolSpotValue)
viewAddEffect(tsprite, spritesortcnt, nTSprite, kViewEffectSpotProgress);
}
- split sprite animation off view.cpp
2020-08-02 17:59:14 +00:00
break;
}
case kStatTraps: {
if (pTSprite->type == kTrapSawCircular) {
if (pTXSprite->state) {
if (pTXSprite->data1) {
pTSprite->picnum = 772;
if (pTXSprite->data2)
- renamed some constants. Manually copied from NBlood because the underlying code has changed too much already.
2021-06-16 19:13:04 +00:00
viewAddEffect(tsprite, spritesortcnt, nTSprite, kViewEffectSpear);
- split sprite animation off view.cpp
2020-08-02 17:59:14 +00:00
}
}
else if (pTXSprite->data1) pTSprite->picnum = 773;
else pTSprite->picnum = 656;
}
break;
}
case kStatThing: {
viewApplyDefaultPal(pTSprite, pSector);
- moved gSpriteHit into DBloodActor.
2021-08-29 17:09:29 +00:00
if (pTSprite->type < kThingBase || pTSprite->type >= kThingMax || owneractor->hit.florhit.type == kHitNone)
- refactoring of all getzrange code to use the Collision struct.
2021-09-02 18:23:51 +00:00
{
- split sprite animation off view.cpp
2020-08-02 17:59:14 +00:00
if ((pTSprite->flags & kPhysMove) && getflorzofslope(pTSprite->sectnum, pTSprite->x, pTSprite->y) >= cZ)
- renamed some constants. Manually copied from NBlood because the underlying code has changed too much already.
2021-06-16 19:13:04 +00:00
viewAddEffect(tsprite, spritesortcnt, nTSprite, kViewEffectShadow);
- split sprite animation off view.cpp
2020-08-02 17:59:14 +00:00
}
}
break;
}
}
for (int nTSprite = spritesortcnt-1; nTSprite >= nViewSprites; nTSprite--)
{
tspritetype *pTSprite = &tsprite[nTSprite];
int nAnim = 0;
switch (picanm[pTSprite->picnum].extra&7)
{
case 1:
{
int dX = cX - pTSprite->x;
int dY = cY - pTSprite->y;
RotateVector(&dX, &dY, 128-pTSprite->ang);
nAnim = GetOctant(dX, dY);
if (nAnim <= 4)
{
pTSprite->cstat &= ~4;
}
else
{
nAnim = 8 - nAnim;
pTSprite->cstat |= 4;
}
break;
}
case 2:
{
int dX = cX - pTSprite->x;
int dY = cY - pTSprite->y;
RotateVector(&dX, &dY, 128-pTSprite->ang);
nAnim = GetOctant(dX, dY);
break;
}
}
while (nAnim > 0)
{
pTSprite->picnum += picanm[pTSprite->picnum].num+1;
nAnim--;
}
}
}
- give each DrawInfo its own list of tsprites. Since these do not fully get processed sequentially the contents need to be preserved until needed. This required getting rid of the global tsprite array. Polymost still uses a static vatiable, though, but this is only accessed in polymost-exclusive code.
2021-04-02 08:28:40 +00:00
void GameInterface::processSprites(spritetype* tsprite, int& spritesortcnt, int viewx, int viewy, int viewz, binangle viewang, double smoothRatio)
- WIP
2021-03-20 22:01:16 +00:00
{
- give each DrawInfo its own list of tsprites. Since these do not fully get processed sequentially the contents need to be preserved until needed. This required getting rid of the global tsprite array. Polymost still uses a static vatiable, though, but this is only accessed in polymost-exclusive code.
2021-04-02 08:28:40 +00:00
viewProcessSprites(tsprite, spritesortcnt, viewx, viewy, viewz, viewang.asbuild(), int(smoothRatio));
- WIP
2021-03-20 22:01:16 +00:00
}
- fixed display of player in mirrors.
2021-03-29 19:48:23 +00:00
int display_mirror;
void GameInterface::EnterPortal(spritetype* viewer, int type)
{
if (type == PORTAL_WALL_MIRROR)
{
display_mirror++;
if (viewer) viewer->cstat &= ~CSTAT_SPRITE_INVISIBLE;
}
}
void GameInterface::LeavePortal(spritetype* viewer, int type)
{
if (type == PORTAL_WALL_MIRROR)
{
display_mirror--;
if (viewer && display_mirror == 0 && !(viewer->cstat & CSTAT_SPRITE_TRANSLUCENT)) viewer->cstat |= CSTAT_SPRITE_INVISIBLE;
}
}
- split sprite animation off view.cpp
2020-08-02 17:59:14 +00:00
END_BLD_NS
Reference in a new issue Copy permalink