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

1061 lines
32 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 "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];
- tabified several Blood source files.
2021-12-29 19:03:42 +00:00
//---------------------------------------------------------------------------
//
//
//
//---------------------------------------------------------------------------
static void RotateYZ(int*, int* pY, int* pZ, int ang)
- split sprite animation off view.cpp
2020-08-02 17:59:14 +00:00
{
int oY, oZ, angSin, angCos;
oY = *pY;
oZ = *pZ;
angSin = Sin(ang);
angCos = Cos(ang);
- tabified several Blood source files.
2021-12-29 19:03:42 +00:00
*pY = dmulscale30r(oY, angCos, oZ, -angSin);
*pZ = dmulscale30r(oY, angSin, oZ, angCos);
- split sprite animation off view.cpp
2020-08-02 17:59:14 +00:00
}
- tabified several Blood source files.
2021-12-29 19:03:42 +00:00
//---------------------------------------------------------------------------
//
//
//
//---------------------------------------------------------------------------
static void RotateXZ(int* pX, int*, int* pZ, int ang)
- split sprite animation off view.cpp
2020-08-02 17:59:14 +00:00
{
int oX, oZ, angSin, angCos;
oX = *pX;
oZ = *pZ;
- tabified several Blood source files.
2021-12-29 19:03:42 +00:00
angSin = Sin(ang);
angCos = Cos(ang);
*pX = dmulscale30r(oX, angCos, oZ, -angSin);
*pZ = dmulscale30r(oX, angSin, oZ, angCos);
- split sprite animation off view.cpp
2020-08-02 17:59:14 +00:00
}
- tabified several Blood source files.
2021-12-29 19:03:42 +00:00
//---------------------------------------------------------------------------
//
//
//
//---------------------------------------------------------------------------
tspritetype* viewInsertTSprite(tspritetype* tsprite, int& spritesortcnt, sectortype* pSector, int nStatnum, tspritetype const* const parentTSprite)
- split sprite animation off view.cpp
2020-08-02 17:59:14 +00:00
{
- tabified several Blood source files.
2021-12-29 19:03:42 +00:00
if (spritesortcnt >= MAXSPRITESONSCREEN)
return nullptr;
int nTSprite = spritesortcnt;
tspritetype* pTSprite = &tsprite[nTSprite];
memset(pTSprite, 0, sizeof(tspritetype));
pTSprite->cstat = CSTAT_SPRITE_YCENTER;
pTSprite->xrepeat = 64;
pTSprite->yrepeat = 64;
pTSprite->ownerActor = nullptr;
pTSprite->type = -spritesortcnt;
pTSprite->statnum = nStatnum;
- use setsector from DCoreActor. Also did a bit of cleanup
2021-12-30 15:36:04 +00:00
pTSprite->sectp = pSector;
- tabified several Blood source files.
2021-12-29 19:03:42 +00:00
spritesortcnt++;
if (parentTSprite)
{
pTSprite->pos = parentTSprite->pos;
pTSprite->ownerActor = parentTSprite->ownerActor;
pTSprite->ang = parentTSprite->ang;
}
pTSprite->pos.X += Cos(gCameraAng) >> 25;
pTSprite->pos.Y += Sin(gCameraAng) >> 25;
return pTSprite;
- 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
static const int effectDetail[kViewEffectMax] = {
- tabified several Blood source files.
2021-12-29 19:03:42 +00:00
4, 4, 4, 4, 0, 0, 0, 0, 0, 1, 4, 4, 0, 0, 0, 1, 0, 0, 0
- split sprite animation off view.cpp
2020-08-02 17:59:14 +00:00
};
struct WEAPONICON {
- tabified several Blood source files.
2021-12-29 19:03:42 +00:00
int16_t nTile;
uint8_t zOffset;
- split sprite animation off view.cpp
2020-08-02 17:59:14 +00:00
};
static const WEAPONICON gWeaponIcon[] = {
- tabified several Blood source files.
2021-12-29 19:03:42 +00:00
{ -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 },
- split sprite animation off view.cpp
2020-08-02 17:59:14 +00:00
};
- tabified several Blood source files.
2021-12-29 19:03:42 +00:00
//---------------------------------------------------------------------------
//
//
//
//---------------------------------------------------------------------------
static tspritetype* viewAddEffect(tspritetype* tsprite, int& spritesortcnt, int nTSprite, VIEW_EFFECT nViewEffect)
- split sprite animation off view.cpp
2020-08-02 17:59:14 +00:00
{
- tabified several Blood source files.
2021-12-29 19:03:42 +00:00
assert(nViewEffect >= 0 && nViewEffect < kViewEffectMax);
auto pTSprite = &tsprite[nTSprite];
auto owneractor = static_cast<DBloodActor*>(pTSprite->ownerActor);
if (gDetail < effectDetail[nViewEffect] || nTSprite >= MAXSPRITESONSCREEN) return NULL;
switch (nViewEffect)
{
case kViewEffectSpotProgress: {
int perc = (100 * owneractor->xspr.data3) / kMaxPatrolSpotValue;
int width = (94 * owneractor->xspr.data3) / kMaxPatrolSpotValue;
int top, bottom;
GetSpriteExtents(pTSprite, &top, &bottom);
- removed sector() method from low level sprite type.
2021-12-30 15:58:48 +00:00
auto pNSprite2 = viewInsertTSprite(tsprite, spritesortcnt, pTSprite->sectp, 32767, pTSprite);
- tabified several Blood source files.
2021-12-29 19:03:42 +00:00
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->pos.Z = top - 2048;
pNSprite2->shade = -128;
break;
}
case kViewEffectAtom:
for (int i = 0; i < 16; i++)
{
- removed sector() method from low level sprite type.
2021-12-30 15:58:48 +00:00
auto pNSprite = viewInsertTSprite(tsprite, spritesortcnt, pTSprite->sectp, 32767, pTSprite);
- tabified several Blood source files.
2021-12-29 19:03:42 +00:00
if (!pNSprite)
break;
int ang = (PlayClock * 2048) / 120;
int nRand1 = dword_172CE0[i][0];
int nRand2 = dword_172CE0[i][1];
int nRand3 = dword_172CE0[i][2];
ang += nRand3;
int x = MulScale(512, Cos(ang), 30);
int y = MulScale(512, Sin(ang), 30);
int z = 0;
RotateYZ(&x, &y, &z, nRand1);
RotateXZ(&x, &y, &z, nRand2);
pNSprite->pos.X = pTSprite->pos.X + x;
pNSprite->pos.Y = pTSprite->pos.Y + y;
pNSprite->pos.Z = pTSprite->pos.Z + (z << 4);
pNSprite->picnum = 1720;
pNSprite->shade = -128;
}
break;
case kViewEffectFlag:
case kViewEffectBigFlag:
{
int top, bottom;
GetSpriteExtents(pTSprite, &top, &bottom);
- removed sector() method from low level sprite type.
2021-12-30 15:58:48 +00:00
auto pNSprite = viewInsertTSprite(tsprite, spritesortcnt, pTSprite->sectp, 32767, pTSprite);
- tabified several Blood source files.
2021-12-29 19:03:42 +00:00
if (!pNSprite)
break;
pNSprite->shade = -128;
pNSprite->pal = 0;
pNSprite->pos.Z = top;
if (nViewEffect == kViewEffectFlag)
pNSprite->xrepeat = pNSprite->yrepeat = 24;
else
pNSprite->xrepeat = pNSprite->yrepeat = 64;
pNSprite->picnum = 3558;
return pNSprite;
}
case kViewEffectTesla:
{
- removed sector() method from low level sprite type.
2021-12-30 15:58:48 +00:00
auto pNSprite = viewInsertTSprite(tsprite, spritesortcnt, pTSprite->sectp, 32767, pTSprite);
- tabified several Blood source files.
2021-12-29 19:03:42 +00:00
if (!pNSprite)
break;
pNSprite->pos.Z = pTSprite->pos.Z;
pNSprite->cstat |= CSTAT_SPRITE_TRANSLUCENT;
pNSprite->shade = -128;
pNSprite->xrepeat = pTSprite->xrepeat;
pNSprite->yrepeat = pTSprite->yrepeat;
pNSprite->picnum = 2135;
break;
}
case kViewEffectShoot:
{
- removed sector() method from low level sprite type.
2021-12-30 15:58:48 +00:00
auto pNSprite = viewInsertTSprite(tsprite, spritesortcnt, pTSprite->sectp, 32767, pTSprite);
- tabified several Blood source files.
2021-12-29 19:03:42 +00:00
if (!pNSprite)
break;
pNSprite->shade = -128;
pNSprite->pal = 0;
pNSprite->xrepeat = pNSprite->yrepeat = 64;
pNSprite->picnum = 2605;
return pNSprite;
}
case kViewEffectReflectiveBall:
{
- removed sector() method from low level sprite type.
2021-12-30 15:58:48 +00:00
auto pNSprite = viewInsertTSprite(tsprite, spritesortcnt, pTSprite->sectp, 32767, pTSprite);
- tabified several Blood source files.
2021-12-29 19:03:42 +00:00
if (!pNSprite)
break;
pNSprite->shade = 26;
pNSprite->pal = 0;
pNSprite->cstat |= CSTAT_SPRITE_TRANSLUCENT;
pNSprite->xrepeat = pNSprite->yrepeat = 64;
pNSprite->picnum = 2089;
break;
}
case kViewEffectPhase:
{
- removed sector() method from low level sprite type.
2021-12-30 15:58:48 +00:00
auto pNSprite = viewInsertTSprite(tsprite, spritesortcnt, pTSprite->sectp, 32767, pTSprite);
- tabified several Blood source files.
2021-12-29 19:03:42 +00:00
if (!pNSprite)
break;
int top, bottom;
GetSpriteExtents(pTSprite, &top, &bottom);
pNSprite->shade = 26;
pNSprite->pal = 0;
pNSprite->cstat |= CSTAT_SPRITE_TRANSLUCENT;
pNSprite->xrepeat = pNSprite->yrepeat = 24;
pNSprite->picnum = 626;
pNSprite->pos.Z = top;
break;
}
case kViewEffectTrail:
{
int nAng = pTSprite->ang;
if (pTSprite->cstat & CSTAT_SPRITE_ALIGNMENT_WALL)
{
nAng = (nAng + 512) & 2047;
}
else
{
nAng = (nAng + 1024) & 2047;
}
for (int i = 0; i < 5 && spritesortcnt < MAXSPRITESONSCREEN; i++)
{
- removed sector() method from low level sprite type.
2021-12-30 15:58:48 +00:00
auto pSector = pTSprite->sectp;
- tabified several Blood source files.
2021-12-29 19:03:42 +00:00
auto pNSprite = viewInsertTSprite(tsprite, spritesortcnt, pSector, 32767, NULL);
if (!pNSprite)
break;
int nLen = 128 + (i << 7);
int x = MulScale(nLen, Cos(nAng), 30);
pNSprite->pos.X = pTSprite->pos.X + x;
int y = MulScale(nLen, Sin(nAng), 30);
pNSprite->pos.Y = pTSprite->pos.Y + y;
pNSprite->pos.Z = pTSprite->pos.Z;
assert(pSector);
FindSector(pNSprite->pos.X, pNSprite->pos.Y, pNSprite->pos.Z, &pSector);
- use setsector from DCoreActor. Also did a bit of cleanup
2021-12-30 15:36:04 +00:00
pNSprite->sectp = pSector;
- tabified several Blood source files.
2021-12-29 19:03:42 +00:00
pNSprite->ownerActor = pTSprite->ownerActor;
pNSprite->picnum = pTSprite->picnum;
pNSprite->cstat |= CSTAT_SPRITE_TRANSLUCENT;
if (i < 2)
pNSprite->cstat |= CSTAT_SPRITE_TRANSLUCENT | CSTAT_SPRITE_TRANS_FLIP;
pNSprite->shade = ClipLow(pTSprite->shade - 16, -128);
pNSprite->xrepeat = pTSprite->xrepeat;
pNSprite->yrepeat = pTSprite->yrepeat;
pNSprite->picnum = pTSprite->picnum;
}
break;
}
case kViewEffectFlame:
{
- removed sector() method from low level sprite type.
2021-12-30 15:58:48 +00:00
auto pNSprite = viewInsertTSprite(tsprite, spritesortcnt, pTSprite->sectp, 32767, pTSprite);
- tabified several Blood source files.
2021-12-29 19:03:42 +00:00
if (!pNSprite)
break;
pNSprite->shade = -128;
pNSprite->pos.Z = pTSprite->pos.Z;
pNSprite->picnum = 908;
pNSprite->statnum = kStatDecoration;
pNSprite->xrepeat = pNSprite->yrepeat = (tileWidth(pTSprite->picnum) * pTSprite->xrepeat) / 64;
break;
}
case kViewEffectSmokeHigh:
{
- removed sector() method from low level sprite type.
2021-12-30 15:58:48 +00:00
auto pNSprite = viewInsertTSprite(tsprite, spritesortcnt, pTSprite->sectp, 32767, pTSprite);
- tabified several Blood source files.
2021-12-29 19:03:42 +00:00
if (!pNSprite)
break;
int top, bottom;
GetSpriteExtents(pTSprite, &top, &bottom);
pNSprite->pos.Z = top;
if (IsDudeSprite(pTSprite))
pNSprite->picnum = 672;
else
pNSprite->picnum = 754;
pNSprite->cstat |= CSTAT_SPRITE_TRANSLUCENT;
pNSprite->shade = 8;
pNSprite->xrepeat = pTSprite->xrepeat;
pNSprite->yrepeat = pTSprite->yrepeat;
break;
}
case kViewEffectSmokeLow:
{
- removed sector() method from low level sprite type.
2021-12-30 15:58:48 +00:00
auto pNSprite = viewInsertTSprite(tsprite, spritesortcnt, pTSprite->sectp, 32767, pTSprite);
- tabified several Blood source files.
2021-12-29 19:03:42 +00:00
if (!pNSprite)
break;
int top, bottom;
GetSpriteExtents(pTSprite, &top, &bottom);
pNSprite->pos.Z = bottom;
if (pTSprite->type >= kDudeBase && pTSprite->type < kDudeMax)
pNSprite->picnum = 672;
else
pNSprite->picnum = 754;
pNSprite->cstat |= CSTAT_SPRITE_TRANSLUCENT;
pNSprite->shade = 8;
pNSprite->xrepeat = pTSprite->xrepeat;
pNSprite->yrepeat = pTSprite->yrepeat;
break;
}
case kViewEffectTorchHigh:
{
- removed sector() method from low level sprite type.
2021-12-30 15:58:48 +00:00
auto pNSprite = viewInsertTSprite(tsprite, spritesortcnt, pTSprite->sectp, 32767, pTSprite);
- tabified several Blood source files.
2021-12-29 19:03:42 +00:00
if (!pNSprite)
break;
int top, bottom;
GetSpriteExtents(pTSprite, &top, &bottom);
pNSprite->pos.Z = top;
pNSprite->picnum = 2101;
pNSprite->shade = -128;
pNSprite->xrepeat = pNSprite->yrepeat = (tileWidth(pTSprite->picnum) * pTSprite->xrepeat) / 32;
break;
}
case kViewEffectTorchLow:
{
- removed sector() method from low level sprite type.
2021-12-30 15:58:48 +00:00
auto pNSprite = viewInsertTSprite(tsprite, spritesortcnt, pTSprite->sectp, 32767, pTSprite);
- tabified several Blood source files.
2021-12-29 19:03:42 +00:00
if (!pNSprite)
break;
int top, bottom;
GetSpriteExtents(pTSprite, &top, &bottom);
pNSprite->pos.Z = bottom;
pNSprite->picnum = 2101;
pNSprite->shade = -128;
pNSprite->xrepeat = pNSprite->yrepeat = (tileWidth(pTSprite->picnum) * pTSprite->xrepeat) / 32;
break;
}
case kViewEffectShadow:
{
- shadow positioning improvements from NBlood
2022-05-05 22:22:39 +00:00
auto pNSprite = viewInsertTSprite(tsprite, spritesortcnt, pTSprite->sectp, 32767, pTSprite);
if (!pNSprite)
break;
pNSprite->pos.Z = getflorzofslopeptr(pTSprite->sectp, pNSprite->pos.X, pNSprite->pos.Y);
if ((pNSprite->sectp->floorpicnum >= 4080) && (pNSprite->sectp->floorpicnum <= 4095) && !VanillaMode()) // if floor has ror, find actual floor
- tabified several Blood source files.
2021-12-29 19:03:42 +00:00
{
- shadow positioning improvements from NBlood
2022-05-05 22:22:39 +00:00
int cX = pNSprite->pos.X, cY = pNSprite->pos.Y, cZ = pNSprite->pos.Z, cZrel = pNSprite->pos.Z;
auto cSect = pNSprite->sectp;
for (int i = 0; i < 16; i++) // scan through max stacked sectors
{
if (!CheckLink(&cX, &cY, &cZ, &cSect)) // if no more floors underneath, abort
break;
const int newFloorZ = getflorzofslopeptr(cSect, cX, cZ);
cZrel += newFloorZ - cZ; // get height difference for next sector's ceiling/floor, and add to relative height for shadow
if ((cSect->floorpicnum < 4080) || (cSect->floorpicnum > 4095)) // if current sector is not open air, use as floor for shadow casting, otherwise continue to next sector
break;
cZ = newFloorZ;
}
pNSprite->sectp = cSect;
pNSprite->pos.Z = cZrel;
- tabified several Blood source files.
2021-12-29 19:03:42 +00:00
}
- shadow positioning improvements from NBlood
2022-05-05 22:22:39 +00:00
pNSprite->shade = 127;
pNSprite->cstat |= CSTAT_SPRITE_TRANSLUCENT;
pNSprite->xrepeat = pTSprite->xrepeat;
pNSprite->yrepeat = pTSprite->yrepeat>>2;
pNSprite->picnum = pTSprite->picnum;
if (!VanillaMode() && (pTSprite->type == kThingDroppedLifeLeech)) // fix shadow for thrown lifeleech
pNSprite->picnum = 800;
pNSprite->pal = 5;
int height = tileHeight(pNSprite->picnum);
int center = height / 2 + tileTopOffset(pNSprite->picnum);
pNSprite->pos.Z -= (pNSprite->yrepeat << 2) * (height - center);
- tabified several Blood source files.
2021-12-29 19:03:42 +00:00
break;
}
case kViewEffectFlareHalo:
{
- removed sector() method from low level sprite type.
2021-12-30 15:58:48 +00:00
auto pNSprite = viewInsertTSprite(tsprite, spritesortcnt, pTSprite->sectp, 32767, pTSprite);
- tabified several Blood source files.
2021-12-29 19:03:42 +00:00
if (!pNSprite)
break;
pNSprite->shade = -128;
pNSprite->pal = 2;
pNSprite->cstat |= CSTAT_SPRITE_TRANSLUCENT;
pNSprite->pos.Z = pTSprite->pos.Z;
pNSprite->xrepeat = pTSprite->xrepeat;
pNSprite->yrepeat = pTSprite->yrepeat;
pNSprite->picnum = 2427;
break;
}
case kViewEffectCeilGlow:
{
- removed sector() method from low level sprite type.
2021-12-30 15:58:48 +00:00
auto pNSprite = viewInsertTSprite(tsprite, spritesortcnt, pTSprite->sectp, 32767, pTSprite);
- tabified several Blood source files.
2021-12-29 19:03:42 +00:00
if (!pNSprite)
break;
- removed sector() method from low level sprite type.
2021-12-30 15:58:48 +00:00
sectortype* pSector = pTSprite->sectp;
- tabified several Blood source files.
2021-12-29 19:03:42 +00:00
pNSprite->pos.X = pTSprite->pos.X;
pNSprite->pos.Y = pTSprite->pos.Y;
pNSprite->pos.Z = pSector->ceilingz;
pNSprite->picnum = 624;
pNSprite->shade = ((pTSprite->pos.Z - pSector->ceilingz) >> 8) - 64;
pNSprite->pal = 2;
pNSprite->xrepeat = pNSprite->yrepeat = 64;
pNSprite->cstat |= CSTAT_SPRITE_ONE_SIDE | CSTAT_SPRITE_ALIGNMENT_FLOOR | CSTAT_SPRITE_YFLIP | CSTAT_SPRITE_TRANSLUCENT;
pNSprite->ang = pTSprite->ang;
pNSprite->ownerActor = pTSprite->ownerActor;
break;
}
case kViewEffectFloorGlow:
{
- removed sector() method from low level sprite type.
2021-12-30 15:58:48 +00:00
auto pNSprite = viewInsertTSprite(tsprite, spritesortcnt, pTSprite->sectp, 32767, pTSprite);
- tabified several Blood source files.
2021-12-29 19:03:42 +00:00
if (!pNSprite)
break;
- removed sector() method from low level sprite type.
2021-12-30 15:58:48 +00:00
sectortype* pSector = pTSprite->sectp;
- tabified several Blood source files.
2021-12-29 19:03:42 +00:00
pNSprite->pos.X = pTSprite->pos.X;
pNSprite->pos.Y = pTSprite->pos.Y;
pNSprite->pos.Z = pSector->floorz;
pNSprite->picnum = 624;
uint8_t nShade = (pSector->floorz - pTSprite->pos.Z) >> 8;
pNSprite->shade = nShade - 32;
pNSprite->pal = 2;
pNSprite->xrepeat = pNSprite->yrepeat = nShade;
pNSprite->cstat |= CSTAT_SPRITE_ONE_SIDE | CSTAT_SPRITE_ALIGNMENT_FLOOR | CSTAT_SPRITE_TRANSLUCENT;
pNSprite->ang = pTSprite->ang;
pNSprite->ownerActor = pTSprite->ownerActor;
break;
}
case kViewEffectSpear:
{
- removed sector() method from low level sprite type.
2021-12-30 15:58:48 +00:00
auto pNSprite = viewInsertTSprite(tsprite, spritesortcnt, pTSprite->sectp, 32767, pTSprite);
- tabified several Blood source files.
2021-12-29 19:03:42 +00:00
if (!pNSprite)
break;
pNSprite->pos.Z = pTSprite->pos.Z;
if (gDetail > 1)
pNSprite->cstat |= CSTAT_SPRITE_TRANSLUCENT | CSTAT_SPRITE_TRANS_FLIP;
pNSprite->shade = ClipLow(pTSprite->shade - 32, -128);
pNSprite->xrepeat = pTSprite->xrepeat;
pNSprite->yrepeat = 64;
pNSprite->picnum = 775;
break;
}
case kViewEffectShowWeapon:
{
assert(pTSprite->type >= kDudePlayer1 && pTSprite->type <= kDudePlayer8);
PLAYER* pPlayer = &gPlayer[pTSprite->type - kDudePlayer1];
WEAPONICON weaponIcon = gWeaponIcon[pPlayer->curWeapon];
auto& nTile = weaponIcon.nTile;
if (nTile < 0) break;
- removed sector() method from low level sprite type.
2021-12-30 15:58:48 +00:00
auto pNSprite = viewInsertTSprite(tsprite, spritesortcnt, pTSprite->sectp, 32767, pTSprite);
- tabified several Blood source files.
2021-12-29 19:03:42 +00:00
if (!pNSprite)
break;
pNSprite->pos.X = pTSprite->pos.X;
pNSprite->pos.Y = pTSprite->pos.Y;
pNSprite->pos.Z = pTSprite->pos.Z - (32 << 8);
pNSprite->pos.Z -= weaponIcon.zOffset << 8; // offset up
pNSprite->picnum = nTile;
pNSprite->shade = pTSprite->shade;
pNSprite->xrepeat = 32;
pNSprite->yrepeat = 32;
auto& nVoxel = voxelIndex[nTile];
if (cl_showweapon == 2 && r_voxels && nVoxel != -1)
{
pNSprite->ang = (gView->actor->spr.ang + 512) & 2047; // always face viewer
pNSprite->cstat |= CSTAT_SPRITE_ALIGNMENT_SLAB;
pNSprite->cstat &= ~CSTAT_SPRITE_YFLIP;
pNSprite->picnum = nVoxel;
if (pPlayer->curWeapon == kWeapLifeLeech) // position lifeleech behind player
{
pNSprite->pos.X += MulScale(128, Cos(gView->actor->spr.ang), 30);
pNSprite->pos.Y += MulScale(128, Sin(gView->actor->spr.ang), 30);
}
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
}
break;
}
}
return NULL;
- split sprite animation off view.cpp
2020-08-02 17:59:14 +00:00
}
- tabified several Blood source files.
2021-12-29 19:03:42 +00:00
//---------------------------------------------------------------------------
//
//
//
//---------------------------------------------------------------------------
static void viewApplyDefaultPal(tspritetype* pTSprite, sectortype const* pSector)
- split sprite animation off view.cpp
2020-08-02 17:59:14 +00:00
{
- tabified several Blood source files.
2021-12-29 19:03:42 +00:00
XSECTOR const* pXSector = pSector->hasX() ? &pSector->xs() : nullptr;
if (pXSector && pXSector->color && (VanillaMode() || pSector->floorpal != 0))
{
copyfloorpal(pTSprite, pSector);
}
- split sprite animation off view.cpp
2020-08-02 17:59:14 +00:00
}
- tabified several Blood source files.
2021-12-29 19:03:42 +00:00
//---------------------------------------------------------------------------
//
//
//
//---------------------------------------------------------------------------
- refactored the owner index in tspritetype. This is now a separate type from spritetype which contains an actor pointer instead so that sprite display can be handled without requiring a static sprite array.
2021-12-04 18:08:50 +00:00
void viewProcessSprites(tspritetype* 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.
- tabified several Blood source files.
2021-12-29 19:03:42 +00:00
int myclock = (PlayClock << 3) + MulScale(4 << 3, smoothratio, 16);
assert(spritesortcnt <= MAXSPRITESONSCREEN);
gCameraAng = cA;
int nViewSprites = spritesortcnt;
for (int nTSprite = spritesortcnt - 1; nTSprite >= 0; nTSprite--)
{
- preparations for unlimited tsprites. Right now it is a no-op because Polymost cannot deal with this properly.
2022-01-09 23:38:26 +00:00
validateTSpriteSize(tsprite, spritesortcnt);
- tabified several Blood source files.
2021-12-29 19:03:42 +00:00
tspritetype* pTSprite = &tsprite[nTSprite];
auto owneractor = static_cast<DBloodActor*>(pTSprite->ownerActor);
if (owneractor->spr.detail > gDetail)
{
pTSprite->xrepeat = 0;
continue;
}
int nTile = pTSprite->picnum;
if (nTile < 0 || nTile >= kMaxTiles)
{
pTSprite->xrepeat = 0;
continue;
}
// skip picnum 0 on face sprites. picnum 0 is a simple wall texture in Blood,
// but there are maps that use 0 on some operator sprites that may show up in potals as a result.
// Since the wall texture is perfectly fine for wall and floor sprites, these will be allowed to pass.
if (nTile == 0 && (pTSprite->cstat & CSTAT_SPRITE_ALIGNMENT_MASK) == CSTAT_SPRITE_ALIGNMENT_FACING)
{
pTSprite->xrepeat = 0;
continue;
}
if (cl_interpolate && owneractor->interpolated && !(pTSprite->flags & 512))
{
- moved all interpolate* methods from spritetypebase to DCoreActor. The places where it was used on tsprites were redone to use the actor's base coordinate, which at the point of the operation would always be the same.
2021-12-30 16:32:31 +00:00
pTSprite->pos = owneractor->interpolatedvec3(gInterpolate);
pTSprite->ang = owneractor->interpolatedang(gInterpolate);
- tabified several Blood source files.
2021-12-29 19:03:42 +00:00
}
int nAnim = 0;
switch (picanm[nTile].extra & 7) {
case 0:
if (!owneractor->hasX()) break;
switch (pTSprite->type) {
- manual merge of latest nnext update.
2022-05-06 16:27:44 +00:00
#ifdef NOONE_EXTENSIONS
case kModernCondition:
case kModernConditionFalse:
if (!gModernMap) break;
[[fallthrough]];
#endif
- tabified several Blood source files.
2021-12-29 19:03:42 +00:00
case kSwitchToggle:
case kSwitchOneWay:
if (owneractor->xspr.state) nAnim = 1;
break;
case kSwitchCombo:
nAnim = owneractor->xspr.data1;
break;
}
break;
case 1:
{
- added script exports for DCoreActor's member variables.
2022-01-23 18:03:14 +00:00
if (tilehasmodelorvoxel(pTSprite->picnum, pTSprite->pal) && !(owneractor->sprext.renderflags & SPREXT_NOTMD))
- tabified several Blood source files.
2021-12-29 19:03:42 +00:00
{
pTSprite->cstat &= ~CSTAT_SPRITE_XFLIP;
break;
}
int dX = cX - pTSprite->pos.X;
int dY = cY - pTSprite->pos.Y;
RotateVector(&dX, &dY, 128 - pTSprite->ang);
nAnim = GetOctant(dX, dY);
if (nAnim <= 4)
{
pTSprite->cstat &= ~CSTAT_SPRITE_XFLIP;
}
else
{
nAnim = 8 - nAnim;
pTSprite->cstat |= CSTAT_SPRITE_XFLIP;
}
break;
}
case 2:
{
- added script exports for DCoreActor's member variables.
2022-01-23 18:03:14 +00:00
if (tilehasmodelorvoxel(pTSprite->picnum, pTSprite->pal) && !(owneractor->sprext.renderflags & SPREXT_NOTMD))
- tabified several Blood source files.
2021-12-29 19:03:42 +00:00
{
pTSprite->cstat &= ~CSTAT_SPRITE_XFLIP;
break;
}
int dX = cX - pTSprite->pos.X;
int dY = cY - pTSprite->pos.Y;
RotateVector(&dX, &dY, 128 - pTSprite->ang);
nAnim = GetOctant(dX, dY);
break;
}
case 3:
{
if (owneractor->hasX())
{
if (owneractor->hit.florhit.type == kHitNone)
nAnim = 1;
}
else
{
int top, bottom;
GetSpriteExtents(pTSprite, &top, &bottom);
- removed sector() method from low level sprite type.
2021-12-30 15:58:48 +00:00
if (getflorzofslopeptr(pTSprite->sectp, pTSprite->pos.X, pTSprite->pos.Y) > bottom)
- tabified several Blood source files.
2021-12-29 19:03:42 +00:00
nAnim = 1;
}
break;
}
case 6:
case 7:
{
- added script exports for DCoreActor's member variables.
2022-01-23 18:03:14 +00:00
if (hw_models && md_tilehasmodel(pTSprite->picnum, pTSprite->pal) >= 0 && !(owneractor->sprext.renderflags & SPREXT_NOTMD))
- tabified several Blood source files.
2021-12-29 19:03:42 +00:00
break;
// Can be overridden by def script
- added script exports for DCoreActor's member variables.
2022-01-23 18:03:14 +00:00
if (r_voxels && tiletovox[pTSprite->picnum] == -1 && voxelIndex[pTSprite->picnum] != -1 && !(owneractor->sprext.renderflags & SPREXT_NOTMD))
- tabified several Blood source files.
2021-12-29 19:03:42 +00:00
{
if ((pTSprite->flags & kHitagRespawn) == 0)
{
pTSprite->cstat |= CSTAT_SPRITE_ALIGNMENT_SLAB;
pTSprite->cstat &= ~(CSTAT_SPRITE_XFLIP | CSTAT_SPRITE_YFLIP);
pTSprite->yoffset += tileTopOffset(pTSprite->picnum);
pTSprite->picnum = voxelIndex[pTSprite->picnum];
if ((picanm[nTile].extra & 7) == 7)
{
pTSprite->ang = myclock & 2047;
}
}
}
break;
}
}
while (nAnim > 0)
{
pTSprite->picnum += picanm[pTSprite->picnum].num + 1;
nAnim--;
}
- added script exports for DCoreActor's member variables.
2022-01-23 18:03:14 +00:00
if ((pTSprite->cstat & CSTAT_SPRITE_ALIGNMENT_MASK) != CSTAT_SPRITE_ALIGNMENT_SLAB && r_voxels && !(owneractor->sprext.renderflags & SPREXT_NOTMD))
- tabified several Blood source files.
2021-12-29 19:03:42 +00:00
{
int const nRootTile = pTSprite->picnum;
int nAnimTile = pTSprite->picnum + qanimateoffs(pTSprite->picnum, 32768 + (pTSprite->ownerActor->GetIndex() & 16383));
- split sprite animation off view.cpp
2020-08-02 17:59:14 +00:00
#if 0
- tabified several Blood source files.
2021-12-29 19:03:42 +00:00
if (tiletovox[nAnimTile] != -1)
{
pTSprite->yoffset += tileTopOffset(nAnimTile);
pTSprite->xoffset += tileLeftOffset(nAnimTile);
}
- split sprite animation off view.cpp
2020-08-02 17:59:14 +00:00
#endif
- tabified several Blood source files.
2021-12-29 19:03:42 +00:00
int const nVoxel = tiletovox[pTSprite->picnum];
if (nVoxel != -1 && (picanm[nRootTile].extra & 7) == 7)
- moved the tsprite flags from cstat2 to clipdist which was already holding other ones. cstat2 should only hold flags for game-side sprites.
2021-12-30 18:00:35 +00:00
pTSprite->clipdist |= TSPR_MDLROTATE; // per-sprite rotation setting.
- tabified several Blood source files.
2021-12-29 19:03:42 +00:00
}
- added script exports for DCoreActor's member variables.
2022-01-23 18:03:14 +00:00
if ((pTSprite->cstat & CSTAT_SPRITE_ALIGNMENT_MASK) != CSTAT_SPRITE_ALIGNMENT_SLAB && hw_models && !(owneractor->sprext.renderflags & SPREXT_NOTMD))
- tabified several Blood source files.
2021-12-29 19:03:42 +00:00
{
int const nRootTile = pTSprite->picnum;
int nAnimTile = pTSprite->picnum + qanimateoffs(pTSprite->picnum, 32768 + (pTSprite->ownerActor->GetIndex() & 16383));
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)
- moved the tsprite flags from cstat2 to clipdist which was already holding other ones. cstat2 should only hold flags for game-side sprites.
2021-12-30 18:00:35 +00:00
pTSprite->clipdist |= TSPR_MDLROTATE; // per-sprite rotation setting.
- tabified several Blood source files.
2021-12-29 19:03:42 +00:00
}
}
- removed sector() method from low level sprite type.
2021-12-30 15:58:48 +00:00
sectortype* pSector = pTSprite->sectp;
- tabified several Blood source files.
2021-12-29 19:03:42 +00:00
XSECTOR const* pXSector = pSector->hasX() ? &pSector->xs() : nullptr;
int nShade = pTSprite->shade;
if ((pSector->ceilingstat & CSTAT_SECTOR_SKY) && (pSector->floorstat & CSTAT_SECTOR_NO_CEILINGSHADE) == 0)
{
nShade += tileShade[pSector->ceilingpicnum] + pSector->ceilingshade;
}
else
{
nShade += tileShade[pSector->floorpicnum] + pSector->floorshade;
}
nShade += tileShade[pTSprite->picnum];
pTSprite->shade = ClipRange(nShade, -128, 127);
-renamed spritetype’s owner field to ‚intowner‘ Mainly for easier searching. Also remove the duplicate ‚detail‘ field.
2022-05-23 22:30:41 +00:00
if ((pTSprite->flags & kHitagRespawn) && pTSprite->ownerActor->spr.intowner == 3 && owneractor->hasX()) // Where does this 3 come from? Nothing sets it.
- tabified several Blood source files.
2021-12-29 19:03:42 +00:00
{
pTSprite->xrepeat = 48;
pTSprite->yrepeat = 48;
pTSprite->shade = -128;
pTSprite->picnum = 2272 + 2 * owneractor->xspr.respawnPending;
pTSprite->cstat &= ~(CSTAT_SPRITE_TRANSLUCENT | CSTAT_SPRITE_TRANS_FLIP);
if (((IsItemSprite(pTSprite) || IsAmmoSprite(pTSprite)) && gGameOptions.nItemSettings == 2)
|| (IsWeaponSprite(pTSprite) && gGameOptions.nWeaponSettings == 3))
{
pTSprite->xrepeat = pTSprite->yrepeat = 48;
}
else
{
pTSprite->xrepeat = pTSprite->yrepeat = 0;
}
}
if (spritesortcnt >= MAXSPRITESONSCREEN) continue;
if (owneractor->hasX() && owneractor->xspr.burnTime > 0)
{
pTSprite->shade = ClipRange(pTSprite->shade - 16 - QRandom(8), -128, 127);
}
if (pTSprite->flags & 256)
{
viewAddEffect(tsprite, spritesortcnt, nTSprite, kViewEffectSmokeHigh);
}
if (pTSprite->flags & 1024)
{
pTSprite->cstat |= CSTAT_SPRITE_XFLIP;
}
if (pTSprite->flags & 2048)
{
pTSprite->cstat |= CSTAT_SPRITE_YFLIP;
}
switch (pTSprite->statnum) {
case kStatDecoration: {
switch (pTSprite->type) {
case kDecorationCandle:
if (!owneractor->hasX() || owneractor->xspr.state == 1) {
pTSprite->shade = -128;
viewAddEffect(tsprite, spritesortcnt, nTSprite, kViewEffectPhase);
}
else {
pTSprite->shade = -8;
}
break;
case kDecorationTorch:
if (!owneractor->hasX() || owneractor->xspr.state == 1) {
pTSprite->picnum++;
viewAddEffect(tsprite, spritesortcnt, nTSprite, kViewEffectTorchHigh);
}
else {
viewAddEffect(tsprite, spritesortcnt, nTSprite, kViewEffectSmokeHigh);
}
break;
default:
viewApplyDefaultPal(pTSprite, pSector);
break;
}
}
break;
case kStatItem: {
switch (pTSprite->type) {
case kItemFlagABase:
if (owneractor->hasX() && owneractor->xspr.state > 0 && gGameOptions.nGameType == 3) {
auto pNTSprite = viewAddEffect(tsprite, spritesortcnt, nTSprite, kViewEffectBigFlag);
if (pNTSprite) pNTSprite->pal = 10;
}
break;
case kItemFlagBBase:
if (owneractor->hasX() && owneractor->xspr.state > 0 && gGameOptions.nGameType == 3) {
auto pNTSprite = viewAddEffect(tsprite, spritesortcnt, nTSprite, kViewEffectBigFlag);
if (pNTSprite) pNTSprite->pal = 7;
}
break;
case kItemFlagA:
pTSprite->pal = 10;
pTSprite->cstat |= CSTAT_SPRITE_BLOOD_BIT2;
break;
case kItemFlagB:
pTSprite->pal = 7;
pTSprite->cstat |= CSTAT_SPRITE_BLOOD_BIT2;
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 |= CSTAT_SPRITE_ALIGNMENT_FLOOR;
break;
case kMissileTeslaRegular:
viewAddEffect(tsprite, spritesortcnt, nTSprite, kViewEffectTesla);
break;
case kMissileButcherKnife:
viewAddEffect(tsprite, spritesortcnt, nTSprite, kViewEffectTrail);
break;
case kMissileFlareRegular:
case kMissileFlareAlt:
if (pTSprite->statnum == kStatFlare) {
if (owneractor->GetTarget() == gView->actor)
{
pTSprite->xrepeat = 0;
break;
}
}
viewAddEffect(tsprite, spritesortcnt, nTSprite, kViewEffectFlareHalo);
if (pTSprite->type != kMissileFlareRegular) break;
- removed sector() method from low level sprite type.
2021-12-30 15:58:48 +00:00
sectortype* pSector1 = pTSprite->sectp;
- tabified several Blood source files.
2021-12-29 19:03:42 +00:00
int zDiff = (pTSprite->pos.Z - pSector1->ceilingz) >> 8;
if ((pSector1->ceilingstat & CSTAT_SECTOR_SKY) == 0 && zDiff < 64) {
viewAddEffect(tsprite, spritesortcnt, nTSprite, kViewEffectCeilGlow);
}
zDiff = (pSector1->floorz - pTSprite->pos.Z) >> 8;
if ((pSector1->floorstat & CSTAT_SECTOR_SKY) == 0 && zDiff < 64) {
viewAddEffect(tsprite, spritesortcnt, nTSprite, kViewEffectFloorGlow);
}
break;
}
break;
}
case kStatDude:
{
if (pTSprite->type == kDudeHand && owneractor->hasX() && owneractor->xspr.aiState == &hand13A3B4)
{
auto target = owneractor->GetTarget();
if (target && target->IsPlayerActor())
{
pTSprite->xrepeat = 0;
break;
}
}
if (pXSector && pXSector->color) copyfloorpal(pTSprite, pSector);
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 |= CSTAT_SPRITE_TRANSLUCENT;
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)) {
viewAddEffect(tsprite, spritesortcnt, nTSprite, kViewEffectReflectiveBall);
}
if (cl_showweapon && gGameOptions.nGameType > 0 && gView) {
viewAddEffect(tsprite, spritesortcnt, nTSprite, kViewEffectShowWeapon);
}
if (pPlayer->flashEffect && (gView != pPlayer || gViewPos != VIEWPOS_0)) {
auto pNTSprite = viewAddEffect(tsprite, spritesortcnt, nTSprite, kViewEffectShoot);
if (pNTSprite) {
POSTURE* pPosture = &pPlayer->pPosture[pPlayer->lifeMode][pPlayer->posture];
pNTSprite->pos.X += MulScale(pPosture->zOffset, Cos(pTSprite->ang), 28);
pNTSprite->pos.Y += MulScale(pPosture->zOffset, Sin(pTSprite->ang), 28);
pNTSprite->pos.Z = pPlayer->actor->spr.pos.Z - pPosture->xOffset;
}
}
if (pPlayer->hasFlag > 0 && gGameOptions.nGameType == 3) {
if (pPlayer->hasFlag & 1) {
auto pNTSprite = viewAddEffect(tsprite, spritesortcnt, nTSprite, kViewEffectFlag);
if (pNTSprite)
{
pNTSprite->pal = 10;
pNTSprite->cstat |= CSTAT_SPRITE_XFLIP;
}
}
if (pPlayer->hasFlag & 2) {
auto pNTSprite = viewAddEffect(tsprite, spritesortcnt, nTSprite, kViewEffectFlag);
if (pNTSprite)
{
pNTSprite->pal = 7;
pNTSprite->cstat |= CSTAT_SPRITE_XFLIP;
}
}
}
}
if (pTSprite->ownerActor != gView->actor || gViewPos != VIEWPOS_0) {
- removed sector() method from low level sprite type.
2021-12-30 15:58:48 +00:00
if (getflorzofslopeptr(pTSprite->sectp, pTSprite->pos.X, pTSprite->pos.Y) >= cZ)
- tabified several Blood source files.
2021-12-29 19:03:42 +00:00
{
viewAddEffect(tsprite, spritesortcnt, nTSprite, kViewEffectShadow);
}
}
if (gModernMap && owneractor->hasX()) { // add target spot indicator for patrol dudes
if (owneractor->xspr.dudeFlag4 && aiInPatrolState(owneractor->xspr.aiState) && owneractor->xspr.data3 > 0 && owneractor->xspr.data3 <= kMaxPatrolSpotValue)
viewAddEffect(tsprite, spritesortcnt, nTSprite, kViewEffectSpotProgress);
}
break;
}
case kStatTraps: {
if (pTSprite->type == kTrapSawCircular) {
if (owneractor->xspr.state) {
if (owneractor->xspr.data1) {
pTSprite->picnum = 772;
if (owneractor->xspr.data2)
viewAddEffect(tsprite, spritesortcnt, nTSprite, kViewEffectSpear);
}
}
else if (owneractor->xspr.data1) pTSprite->picnum = 773;
else pTSprite->picnum = 656;
}
break;
}
case kStatThing: {
viewApplyDefaultPal(pTSprite, pSector);
if (pTSprite->type < kThingBase || pTSprite->type >= kThingMax || owneractor->hit.florhit.type == kHitNone)
{
- removed sector() method from low level sprite type.
2021-12-30 15:58:48 +00:00
if ((pTSprite->flags & kPhysMove) && getflorzofslopeptr(pTSprite->sectp, pTSprite->pos.X, pTSprite->pos.Y) >= cZ)
- tabified several Blood source files.
2021-12-29 19:03:42 +00:00
viewAddEffect(tsprite, spritesortcnt, nTSprite, kViewEffectShadow);
}
}
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->pos.X;
int dY = cY - pTSprite->pos.Y;
RotateVector(&dX, &dY, 128 - pTSprite->ang);
nAnim = GetOctant(dX, dY);
if (nAnim <= 4)
{
pTSprite->cstat &= ~CSTAT_SPRITE_XFLIP;
}
else
{
nAnim = 8 - nAnim;
pTSprite->cstat |= CSTAT_SPRITE_XFLIP;
}
break;
}
case 2:
{
int dX = cX - pTSprite->pos.X;
int dY = cY - pTSprite->pos.Y;
RotateVector(&dX, &dY, 128 - pTSprite->ang);
nAnim = GetOctant(dX, dY);
break;
}
}
while (nAnim > 0)
{
pTSprite->picnum += picanm[pTSprite->picnum].num + 1;
nAnim--;
}
}
- split sprite animation off view.cpp
2020-08-02 17:59:14 +00:00
}
- tabified several Blood source files.
2021-12-29 19:03:42 +00:00
//---------------------------------------------------------------------------
//
//
//
//---------------------------------------------------------------------------
- refactored the owner index in tspritetype. This is now a separate type from spritetype which contains an actor pointer instead so that sprite display can be handled without requiring a static sprite array.
2021-12-04 18:08:50 +00:00
void GameInterface::processSprites(tspritetype* tsprite, int& spritesortcnt, int viewx, int viewy, int viewz, binangle viewang, double smoothRatio)
- WIP
2021-03-20 22:01:16 +00:00
{
- tabified several Blood source files.
2021-12-29 19:03:42 +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;
- use actors instead of sprites in the new renderer's API.
2021-12-22 22:27:32 +00:00
void GameInterface::EnterPortal(DCoreActor* viewer, int type)
- fixed display of player in mirrors.
2021-03-29 19:48:23 +00:00
{
- tabified several Blood source files.
2021-12-29 19:03:42 +00:00
if (type == PORTAL_WALL_MIRROR)
{
display_mirror++;
if (viewer) viewer->spr.cstat &= ~CSTAT_SPRITE_INVISIBLE;
}
- fixed display of player in mirrors.
2021-03-29 19:48:23 +00:00
}
- use actors instead of sprites in the new renderer's API.
2021-12-22 22:27:32 +00:00
void GameInterface::LeavePortal(DCoreActor* viewer, int type)
- fixed display of player in mirrors.
2021-03-29 19:48:23 +00:00
{
- tabified several Blood source files.
2021-12-29 19:03:42 +00:00
if (type == PORTAL_WALL_MIRROR)
{
display_mirror--;
if (viewer && display_mirror == 0 && !(viewer->spr.cstat & CSTAT_SPRITE_TRANSLUCENT)) viewer->spr.cstat |= CSTAT_SPRITE_INVISIBLE;
}
- fixed display of player in mirrors.
2021-03-29 19:48:23 +00:00
}
- split sprite animation off view.cpp
2020-08-02 17:59:14 +00:00
END_BLD_NS
Reference in a new issue Copy permalink