zdoom/raze
0
0
Fork 0
mirror of https://github.com/ZDoom/Raze.git synced 2025-02-07 07:21:10 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix blood compiling

Browse source 
# Conflicts:
#	source/blood/src/config.cpp
#	source/blood/src/osdcmd.cpp
#	source/blood/src/screen.cpp
#	source/blood/src/sound.cpp
#	source/blood/src/sound.h
#	source/blood/src/view.cpp
#	source/blood/src/view.h
This commit is contained in:
nukeykt 2019-12-30 04:20:58 +09:00 committed by Christoph Oelckers
parent 456d975392
commit a5351620db
6 changed files with 123 additions and 78 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
source/blood/src/actor.h
View file

@ -200,9 +200,9 @@ inline bool IsPlayerSprite(spritetype *pSprite)
return 0; return 0;
} }
inline bool IsDudeSprite(spritetype *pSprite) template<typename T> bool IsDudeSprite(T *pSprite)
{ {
if (pSprite->type >= kDudeBase && pSprite->type < kDudeMax) if (pSprite->lotag >= kDudeBase && pSprite->lotag < kDudeMax)
return 1; return 1;
return 0; return 0;
} }

60
source/blood/src/blood.cpp
View file

@ -149,7 +149,8 @@ enum gametokens
T_TEXTUREFILTER, T_TEXTUREFILTER,
T_RFFDEFINEID, T_RFFDEFINEID,
T_TILEFROMTEXTURE, T_TILEFROMTEXTURE,
T_IFCRC, T_IFCRC, T_IFMATCH, T_CRC32,
T_SIZE,
T_SURFACE, T_SURFACE,
T_VOXEL, T_VOXEL,
T_VIEW, T_VIEW,
@ -1596,7 +1597,10 @@ static int parsedefinitions_game(scriptfile *pScript, int firstPass)
int32_t tile = -1; int32_t tile = -1;
int32_t havesurface = 0, havevox = 0, haveview = 0, haveshade = 0; int32_t havesurface = 0, havevox = 0, haveview = 0, haveshade = 0;
int32_t surface = 0, vox = 0, view = 0, shade = 0; int32_t surface = 0, vox = 0, view = 0, shade = 0;
int32_t tilecrc = 0, origcrc = 0; int32_t tile_crc32 = 0;
vec2_t tile_size{};
uint8_t have_crc32 = 0;
uint8_t have_size = 0;
static const tokenlist tilefromtexturetokens[] = static const tokenlist tilefromtexturetokens[] =
{ {
@ -1615,8 +1619,40 @@ static int parsedefinitions_game(scriptfile *pScript, int firstPass)
switch (token) switch (token)
{ {
case T_IFCRC: case T_IFCRC:
scriptfile_getsymbol(pScript, &tilecrc); scriptfile_getsymbol(pScript, &tile_crc32);
have_crc32 = 1;
break; break;
case T_IFMATCH:
{
char *ifmatchend;
static const tokenlist ifmatchtokens[] =
{
{ "crc32", T_CRC32 },
{ "size", T_SIZE },
};
if (scriptfile_getbraces(pScript,&ifmatchend)) break;
while (pScript->textptr < ifmatchend)
{
int32_t token = getatoken(pScript,ifmatchtokens,ARRAY_SIZE(ifmatchtokens));
switch (token)
{
case T_CRC32:
scriptfile_getsymbol(pScript, &tile_crc32);
have_crc32 = 1;
break;
case T_SIZE:
scriptfile_getsymbol(pScript, &tile_size.x);
scriptfile_getsymbol(pScript, &tile_size.y);
have_size = 1;
break;
default:
break;
}
}
break;
}
case T_SURFACE: case T_SURFACE:
havesurface = 1; havesurface = 1;
scriptfile_getsymbol(pScript, &surface); scriptfile_getsymbol(pScript, &surface);
@ -1645,12 +1681,22 @@ static int parsedefinitions_game(scriptfile *pScript, int firstPass)
break; break;
} }
if (tilecrc) if (have_crc32)
{ {
origcrc = tileCRC(tile); int32_t const orig_crc32 = tileGetCRC32(tile);
if (origcrc != tilecrc) if (orig_crc32 != tile_crc32)
{ {
//initprintf("CRC of tile %d doesn't match! CRC: %d, Expected: %d\n", tile, origcrc, tilecrc); // initprintf("CRC32 of tile %d doesn't match! CRC32: %d, Expected: %d\n", tile, orig_crc32, tile_crc32);
break;
}
}
if (have_size)
{
vec2_16_t const orig_size = tileGetSize(tile);
if (orig_size.x != tile_size.x && orig_size.y != tile_size.y)
{
// initprintf("Size of tile %d doesn't match! Size: (%d, %d), Expected: (%d, %d)\n", tile, orig_size.x, orig_size.y, tile_size.x, tile_size.y);
break; break;
} }
} }

2
source/blood/src/db.h
View file

@ -316,7 +316,7 @@ static inline int GetWallType(int nWall)
return wall[nWall].type; return wall[nWall].type;
} }
inline void GetSpriteExtents(spritetype *pSprite, int *top, int *bottom) template<typename T> void GetSpriteExtents(T *pSprite, int *top, int *bottom)
{ {
*top = *bottom = pSprite->z; *top = *bottom = pSprite->z;
if ((pSprite->cstat & 0x30) != 0x20) if ((pSprite->cstat & 0x30) != 0x20)

12
source/blood/src/mirrors.cpp
View file

@ -237,7 +237,7 @@ void sub_557C4(int x, int y, int interpolation)
int nViewSprites = spritesortcnt-1; int nViewSprites = spritesortcnt-1;
for (int nTSprite = nViewSprites; nTSprite >= 0; nTSprite--) for (int nTSprite = nViewSprites; nTSprite >= 0; nTSprite--)
{ {
uspritetype *pTSprite = &tsprite[nTSprite]; tspritetype *pTSprite = &tsprite[nTSprite];
pTSprite->xrepeat = pTSprite->yrepeat = 0; pTSprite->xrepeat = pTSprite->yrepeat = 0;
} }
for (int i = mirrorcnt-1; i >= 0; i--) for (int i = mirrorcnt-1; i >= 0; i--)
@ -268,10 +268,10 @@ void sub_557C4(int x, int y, int interpolation)
int dx = mirror[j].at8; int dx = mirror[j].at8;
int dy = mirror[j].atc; int dy = mirror[j].atc;
int dz = mirror[j].at10; int dz = mirror[j].at10;
uspritetype *pTSprite = &tsprite[spritesortcnt]; tspritetype *pTSprite = &tsprite[spritesortcnt];
memset(pTSprite, 0, sizeof(uspritetype)); memset(pTSprite, 0, sizeof(uspritetype));
pTSprite->type = pSprite->type; pTSprite->lotag = pSprite->type;
pTSprite->index = pSprite->index; pTSprite->xvel = pSprite->index;
pTSprite->sectnum = nSector2; pTSprite->sectnum = nSector2;
pTSprite->x = pSprite->x+dx; pTSprite->x = pSprite->x+dx;
pTSprite->y = pSprite->y+dy; pTSprite->y = pSprite->y+dy;
@ -288,7 +288,7 @@ void sub_557C4(int x, int y, int interpolation)
pTSprite->statnum = kStatDecoration; pTSprite->statnum = kStatDecoration;
pTSprite->owner = pSprite->index; pTSprite->owner = pSprite->index;
pTSprite->extra = pSprite->extra; pTSprite->extra = pSprite->extra;
pTSprite->flags = pSprite->hitag|0x200; pTSprite->hitag = pSprite->hitag|0x200;
LOCATION *pLocation = &gPrevSpriteLoc[pSprite->index]; LOCATION *pLocation = &gPrevSpriteLoc[pSprite->index];
pTSprite->x = dx+interpolate(pLocation->x, pSprite->x, interpolation); pTSprite->x = dx+interpolate(pLocation->x, pSprite->x, interpolation);
pTSprite->y = dy+interpolate(pLocation->y, pSprite->y, interpolation); pTSprite->y = dy+interpolate(pLocation->y, pSprite->y, interpolation);
@ -302,7 +302,7 @@ void sub_557C4(int x, int y, int interpolation)
} }
for (int nTSprite = spritesortcnt-1; nTSprite >= nViewSprites; nTSprite--) for (int nTSprite = spritesortcnt-1; nTSprite >= nViewSprites; nTSprite--)
{ {
uspritetype *pTSprite = &tsprite[nTSprite]; tspritetype *pTSprite = &tsprite[nTSprite];
int nAnim = 0; int nAnim = 0;
switch (picanm[pTSprite->picnum].extra&7) switch (picanm[pTSprite->picnum].extra&7)
{ {

120
source/blood/src/view.cpp
View file

@ -1766,7 +1766,7 @@ void viewInit(void)
dword_172CE0[i][2] = mulscale16(wrand(), 2048); dword_172CE0[i][2] = mulscale16(wrand(), 2048);
} }
gViewMap.sub_25C38(0, 0, gZoom, 0, gFollowMap); gViewMap.sub_25C38(0, 0, gZoom, 0, gFollowMap);
bLoadScreenCrcMatch = tileCRC(kLoadScreen) == kLoadScreenCRC; bLoadScreenCrcMatch = tileGetCRC32(kLoadScreen) == kLoadScreenCRC;
} }
void viewResizeView(int size) void viewResizeView(int size)
@ -1849,17 +1849,17 @@ void viewDrawInterface(ClockTicks arg)
static fix16_t gCameraAng; static fix16_t gCameraAng;
uspritetype *viewInsertTSprite(int nSector, int nStatnum, uspritetype *pSprite) template<typename T> tspritetype* viewInsertTSprite(int nSector, int nStatnum, T *pSprite)
{ {
int nTSprite = spritesortcnt; int nTSprite = spritesortcnt;
uspritetype *pTSprite = &tsprite[nTSprite]; tspritetype *pTSprite = &tsprite[nTSprite];
memset(pTSprite, 0, sizeof(uspritetype)); memset(pTSprite, 0, sizeof(tspritetype));
pTSprite->cstat = 128; pTSprite->cstat = 128;
pTSprite->xrepeat = 64; pTSprite->xrepeat = 64;
pTSprite->yrepeat = 64; pTSprite->yrepeat = 64;
pTSprite->owner = -1; pTSprite->owner = -1;
pTSprite->extra = -1; pTSprite->extra = -1;
pTSprite->type = -spritesortcnt; pTSprite->lotag = -spritesortcnt;
pTSprite->statnum = nStatnum; pTSprite->statnum = nStatnum;
pTSprite->sectnum = nSector; pTSprite->sectnum = nSector;
spritesortcnt++; spritesortcnt++;
@ -1883,17 +1883,17 @@ int effectDetail[] = {
4, 4, 4, 4, 0, 0, 0, 0, 0, 1, 4, 4, 0, 0, 0, 1, 0, 0, 0 4, 4, 4, 4, 0, 0, 0, 0, 0, 1, 4, 4, 0, 0, 0, 1, 0, 0, 0
}; };
uspritetype *viewAddEffect(int nTSprite, VIEW_EFFECT nViewEffect) tspritetype *viewAddEffect(int nTSprite, VIEW_EFFECT nViewEffect)
{ {
dassert(nViewEffect >= 0 && nViewEffect < kViewEffectMax); dassert(nViewEffect >= 0 && nViewEffect < kViewEffectMax);
uspritetype *pTSprite = &tsprite[nTSprite]; auto pTSprite = &tsprite[nTSprite];
if (gDetail < effectDetail[nViewEffect] || nTSprite >= kMaxViewSprites) return NULL; if (gDetail < effectDetail[nViewEffect] || nTSprite >= kMaxViewSprites) return NULL;
switch (nViewEffect) switch (nViewEffect)
{ {
case VIEW_EFFECT_18: case VIEW_EFFECT_18:
for (int i = 0; i < 16; i++) for (int i = 0; i < 16; i++)
{ {
uspritetype *pNSprite = viewInsertTSprite(pTSprite->sectnum, 32767, pTSprite); auto pNSprite = viewInsertTSprite(pTSprite->sectnum, 32767, pTSprite);
int ang = ((int)gFrameClock*2048)/120; int ang = ((int)gFrameClock*2048)/120;
int nRand1 = dword_172CE0[i][0]; int nRand1 = dword_172CE0[i][0];
int nRand2 = dword_172CE0[i][1]; int nRand2 = dword_172CE0[i][1];
@ -1915,8 +1915,8 @@ uspritetype *viewAddEffect(int nTSprite, VIEW_EFFECT nViewEffect)
case VIEW_EFFECT_17: case VIEW_EFFECT_17:
{ {
int top, bottom; int top, bottom;
GetSpriteExtents((spritetype *)pTSprite, &top, &bottom); GetSpriteExtents(pTSprite, &top, &bottom);
uspritetype *pNSprite = viewInsertTSprite(pTSprite->sectnum, 32767, pTSprite); auto pNSprite = viewInsertTSprite(pTSprite->sectnum, 32767, pTSprite);
pNSprite->shade = -128; pNSprite->shade = -128;
pNSprite->pal = 0; pNSprite->pal = 0;
pNSprite->z = top; pNSprite->z = top;
@ -1929,7 +1929,7 @@ uspritetype *viewAddEffect(int nTSprite, VIEW_EFFECT nViewEffect)
} }
case VIEW_EFFECT_15: case VIEW_EFFECT_15:
{ {
uspritetype *pNSprite = viewInsertTSprite(pTSprite->sectnum, 32767, pTSprite); auto pNSprite = viewInsertTSprite(pTSprite->sectnum, 32767, pTSprite);
pNSprite->z = pTSprite->z; pNSprite->z = pTSprite->z;
pNSprite->cstat |= 2; pNSprite->cstat |= 2;
pNSprite->shade = -128; pNSprite->shade = -128;
@ -1940,7 +1940,7 @@ uspritetype *viewAddEffect(int nTSprite, VIEW_EFFECT nViewEffect)
} }
case VIEW_EFFECT_14: case VIEW_EFFECT_14:
{ {
uspritetype *pNSprite = viewInsertTSprite(pTSprite->sectnum, 32767, pTSprite); auto pNSprite = viewInsertTSprite(pTSprite->sectnum, 32767, pTSprite);
pNSprite->shade = -128; pNSprite->shade = -128;
pNSprite->pal = 0; pNSprite->pal = 0;
pNSprite->xrepeat = pNSprite->yrepeat = 64; pNSprite->xrepeat = pNSprite->yrepeat = 64;
@ -1949,7 +1949,7 @@ uspritetype *viewAddEffect(int nTSprite, VIEW_EFFECT nViewEffect)
} }
case VIEW_EFFECT_13: case VIEW_EFFECT_13:
{ {
uspritetype *pNSprite = viewInsertTSprite(pTSprite->sectnum, 32767, pTSprite); auto pNSprite = viewInsertTSprite(pTSprite->sectnum, 32767, pTSprite);
pNSprite->shade = 26; pNSprite->shade = 26;
pNSprite->pal = 0; pNSprite->pal = 0;
pNSprite->cstat |= 2; pNSprite->cstat |= 2;
@ -1959,9 +1959,9 @@ uspritetype *viewAddEffect(int nTSprite, VIEW_EFFECT nViewEffect)
} }
case VIEW_EFFECT_11: case VIEW_EFFECT_11:
{ {
uspritetype *pNSprite = viewInsertTSprite(pTSprite->sectnum, 32767, pTSprite); auto pNSprite = viewInsertTSprite(pTSprite->sectnum, 32767, pTSprite);
int top, bottom; int top, bottom;
GetSpriteExtents((spritetype *)pTSprite, &top, &bottom); GetSpriteExtents(pTSprite, &top, &bottom);
pNSprite->shade = 26; pNSprite->shade = 26;
pNSprite->pal = 0; pNSprite->pal = 0;
pNSprite->cstat |= 2; pNSprite->cstat |= 2;
@ -1984,7 +1984,7 @@ uspritetype *viewAddEffect(int nTSprite, VIEW_EFFECT nViewEffect)
for (int i = 0; i < 5 && spritesortcnt < kMaxViewSprites; i++) for (int i = 0; i < 5 && spritesortcnt < kMaxViewSprites; i++)
{ {
int nSector = pTSprite->sectnum; int nSector = pTSprite->sectnum;
uspritetype *pNSprite = viewInsertTSprite(nSector, 32767, NULL); auto pNSprite = viewInsertTSprite<tspritetype>(nSector, 32767, NULL);
int nLen = 128+(i<<7); int nLen = 128+(i<<7);
int x = mulscale30(nLen, Cos(nAng)); int x = mulscale30(nLen, Cos(nAng));
pNSprite->x = pTSprite->x + x; pNSprite->x = pTSprite->x + x;
@ -2008,7 +2008,7 @@ uspritetype *viewAddEffect(int nTSprite, VIEW_EFFECT nViewEffect)
} }
case VIEW_EFFECT_8: case VIEW_EFFECT_8:
{ {
uspritetype *pNSprite = viewInsertTSprite(pTSprite->sectnum, 32767, pTSprite); auto pNSprite = viewInsertTSprite(pTSprite->sectnum, 32767, pTSprite);
pNSprite->shade = -128; pNSprite->shade = -128;
pNSprite->z = pTSprite->z; pNSprite->z = pTSprite->z;
pNSprite->picnum = 908; pNSprite->picnum = 908;
@ -2018,11 +2018,11 @@ uspritetype *viewAddEffect(int nTSprite, VIEW_EFFECT nViewEffect)
} }
case VIEW_EFFECT_6: case VIEW_EFFECT_6:
{ {
uspritetype *pNSprite = viewInsertTSprite(pTSprite->sectnum, 32767, pTSprite); auto pNSprite = viewInsertTSprite(pTSprite->sectnum, 32767, pTSprite);
int top, bottom; int top, bottom;
GetSpriteExtents((spritetype *)pTSprite, &top, &bottom); GetSpriteExtents(pTSprite, &top, &bottom);
pNSprite->z = top; pNSprite->z = top;
if (IsDudeSprite((spritetype *)pTSprite)) if (IsDudeSprite(pTSprite))
pNSprite->picnum = 672; pNSprite->picnum = 672;
else else
pNSprite->picnum = 754; pNSprite->picnum = 754;
@ -2034,11 +2034,11 @@ uspritetype *viewAddEffect(int nTSprite, VIEW_EFFECT nViewEffect)
} }
case VIEW_EFFECT_7: case VIEW_EFFECT_7:
{ {
uspritetype *pNSprite = viewInsertTSprite(pTSprite->sectnum, 32767, pTSprite); auto pNSprite = viewInsertTSprite(pTSprite->sectnum, 32767, pTSprite);
int top, bottom; int top, bottom;
GetSpriteExtents((spritetype *)pTSprite, &top, &bottom); GetSpriteExtents(pTSprite, &top, &bottom);
pNSprite->z = bottom; pNSprite->z = bottom;
if (pTSprite->type >= kDudeBase && pTSprite->type < kDudeMax) if (pTSprite->lotag >= kDudeBase && pTSprite->lotag < kDudeMax)
pNSprite->picnum = 672; pNSprite->picnum = 672;
else else
pNSprite->picnum = 754; pNSprite->picnum = 754;
@ -2050,9 +2050,9 @@ uspritetype *viewAddEffect(int nTSprite, VIEW_EFFECT nViewEffect)
} }
case VIEW_EFFECT_4: case VIEW_EFFECT_4:
{ {
uspritetype *pNSprite = viewInsertTSprite(pTSprite->sectnum, 32767, pTSprite); auto pNSprite = viewInsertTSprite(pTSprite->sectnum, 32767, pTSprite);
int top, bottom; int top, bottom;
GetSpriteExtents((spritetype *)pTSprite, &top, &bottom); GetSpriteExtents(pTSprite, &top, &bottom);
pNSprite->z = top; pNSprite->z = top;
pNSprite->picnum = 2101; pNSprite->picnum = 2101;
pNSprite->shade = -128; pNSprite->shade = -128;
@ -2061,9 +2061,9 @@ uspritetype *viewAddEffect(int nTSprite, VIEW_EFFECT nViewEffect)
} }
case VIEW_EFFECT_5: case VIEW_EFFECT_5:
{ {
uspritetype *pNSprite = viewInsertTSprite(pTSprite->sectnum, 32767, pTSprite); auto pNSprite = viewInsertTSprite(pTSprite->sectnum, 32767, pTSprite);
int top, bottom; int top, bottom;
GetSpriteExtents((spritetype *)pTSprite, &top, &bottom); GetSpriteExtents(pTSprite, &top, &bottom);
pNSprite->z = bottom; pNSprite->z = bottom;
pNSprite->picnum = 2101; pNSprite->picnum = 2101;
pNSprite->shade = -128; pNSprite->shade = -128;
@ -2072,7 +2072,7 @@ uspritetype *viewAddEffect(int nTSprite, VIEW_EFFECT nViewEffect)
} }
case VIEW_EFFECT_0: case VIEW_EFFECT_0:
{ {
uspritetype *pNSprite = viewInsertTSprite(pTSprite->sectnum, 32767, pTSprite); auto pNSprite = viewInsertTSprite(pTSprite->sectnum, 32767, pTSprite);
pNSprite->z = getflorzofslope(pTSprite->sectnum, pNSprite->x, pNSprite->y); pNSprite->z = getflorzofslope(pTSprite->sectnum, pNSprite->x, pNSprite->y);
pNSprite->shade = 127; pNSprite->shade = 127;
pNSprite->cstat |= 2; pNSprite->cstat |= 2;
@ -2087,7 +2087,7 @@ uspritetype *viewAddEffect(int nTSprite, VIEW_EFFECT nViewEffect)
} }
case VIEW_EFFECT_1: case VIEW_EFFECT_1:
{ {
uspritetype *pNSprite = viewInsertTSprite(pTSprite->sectnum, 32767, pTSprite); auto pNSprite = viewInsertTSprite(pTSprite->sectnum, 32767, pTSprite);
pNSprite->shade = -128; pNSprite->shade = -128;
pNSprite->pal = 2; pNSprite->pal = 2;
pNSprite->cstat |= 2; pNSprite->cstat |= 2;
@ -2099,7 +2099,7 @@ uspritetype *viewAddEffect(int nTSprite, VIEW_EFFECT nViewEffect)
} }
case VIEW_EFFECT_2: case VIEW_EFFECT_2:
{ {
uspritetype *pNSprite = viewInsertTSprite(pTSprite->sectnum, 32767, pTSprite); auto pNSprite = viewInsertTSprite(pTSprite->sectnum, 32767, pTSprite);
sectortype *pSector = &sector[pTSprite->sectnum]; sectortype *pSector = &sector[pTSprite->sectnum];
pNSprite->x = pTSprite->x; pNSprite->x = pTSprite->x;
pNSprite->y = pTSprite->y; pNSprite->y = pTSprite->y;
@ -2115,7 +2115,7 @@ uspritetype *viewAddEffect(int nTSprite, VIEW_EFFECT nViewEffect)
} }
case VIEW_EFFECT_3: case VIEW_EFFECT_3:
{ {
uspritetype *pNSprite = viewInsertTSprite(pTSprite->sectnum, 32767, pTSprite); auto pNSprite = viewInsertTSprite(pTSprite->sectnum, 32767, pTSprite);
sectortype *pSector = &sector[pTSprite->sectnum]; sectortype *pSector = &sector[pTSprite->sectnum];
pNSprite->x = pTSprite->x; pNSprite->x = pTSprite->x;
pNSprite->y = pTSprite->y; pNSprite->y = pTSprite->y;
@ -2132,7 +2132,7 @@ uspritetype *viewAddEffect(int nTSprite, VIEW_EFFECT nViewEffect)
} }
case VIEW_EFFECT_9: case VIEW_EFFECT_9:
{ {
uspritetype *pNSprite = viewInsertTSprite(pTSprite->sectnum, 32767, pTSprite); auto pNSprite = viewInsertTSprite(pTSprite->sectnum, 32767, pTSprite);
pNSprite->z = pTSprite->z; pNSprite->z = pTSprite->z;
if (gDetail > 1) if (gDetail > 1)
pNSprite->cstat |= 514; pNSprite->cstat |= 514;
@ -2144,12 +2144,12 @@ uspritetype *viewAddEffect(int nTSprite, VIEW_EFFECT nViewEffect)
} }
case VIEW_EFFECT_12: case VIEW_EFFECT_12:
{ {
dassert(pTSprite->type >= kDudePlayer1 && pTSprite->type <= kDudePlayer8); dassert(pTSprite->lotag >= kDudePlayer1 && pTSprite->lotag <= kDudePlayer8);
PLAYER *pPlayer = &gPlayer[pTSprite->type-kDudePlayer1]; PLAYER *pPlayer = &gPlayer[pTSprite->lotag-kDudePlayer1];
WEAPONICON weaponIcon = gWeaponIcon[pPlayer->curWeapon]; WEAPONICON weaponIcon = gWeaponIcon[pPlayer->curWeapon];
const int nTile = weaponIcon.nTile; const int nTile = weaponIcon.nTile;
if (nTile < 0) break; if (nTile < 0) break;
uspritetype *pNSprite = viewInsertTSprite(pTSprite->sectnum, 32767, pTSprite); auto pNSprite = viewInsertTSprite(pTSprite->sectnum, 32767, pTSprite);
pNSprite->x = pTSprite->x; pNSprite->x = pTSprite->x;
pNSprite->y = pTSprite->y; pNSprite->y = pTSprite->y;
pNSprite->z = pTSprite->z-(32<<8); pNSprite->z = pTSprite->z-(32<<8);
@ -2179,7 +2179,7 @@ uspritetype *viewAddEffect(int nTSprite, VIEW_EFFECT nViewEffect)
LOCATION gPrevSpriteLoc[kMaxSprites]; LOCATION gPrevSpriteLoc[kMaxSprites];
static void viewApplyDefaultPal(uspritetype *pTSprite, sectortype const *pSector) static void viewApplyDefaultPal(tspritetype *pTSprite, sectortype const *pSector)
{ {
int const nXSector = pSector->extra; int const nXSector = pSector->extra;
XSECTOR const *pXSector = nXSector >= 0 ? &xsector[nXSector] : NULL; XSECTOR const *pXSector = nXSector >= 0 ? &xsector[nXSector] : NULL;
@ -2197,7 +2197,7 @@ void viewProcessSprites(int32_t cX, int32_t cY, int32_t cZ, int32_t cA, int32_t
int nViewSprites = spritesortcnt; int nViewSprites = spritesortcnt;
for (int nTSprite = spritesortcnt-1; nTSprite >= 0; nTSprite--) for (int nTSprite = spritesortcnt-1; nTSprite >= 0; nTSprite--)
{ {
uspritetype *pTSprite = &tsprite[nTSprite]; tspritetype *pTSprite = &tsprite[nTSprite];
//int nXSprite = pTSprite->extra; //int nXSprite = pTSprite->extra;
int nXSprite = sprite[pTSprite->owner].extra; int nXSprite = sprite[pTSprite->owner].extra;
XSPRITE *pTXSprite = NULL; XSPRITE *pTXSprite = NULL;
@ -2217,7 +2217,7 @@ void viewProcessSprites(int32_t cX, int32_t cY, int32_t cZ, int32_t cA, int32_t
} }
int nSprite = pTSprite->owner; int nSprite = pTSprite->owner;
if (cl_interpolate && TestBitString(gInterpolateSprite, nSprite) && !(pTSprite->flags&512)) if (cl_interpolate && TestBitString(gInterpolateSprite, nSprite) && !(pTSprite->hitag&512))
{ {
LOCATION *pPrevLoc = &gPrevSpriteLoc[nSprite]; LOCATION *pPrevLoc = &gPrevSpriteLoc[nSprite];
pTSprite->x = interpolate(pPrevLoc->x, pTSprite->x, gInterpolate); pTSprite->x = interpolate(pPrevLoc->x, pTSprite->x, gInterpolate);
@ -2230,7 +2230,7 @@ void viewProcessSprites(int32_t cX, int32_t cY, int32_t cZ, int32_t cA, int32_t
case 0: case 0:
//dassert(nXSprite > 0 && nXSprite < kMaxXSprites); //dassert(nXSprite > 0 && nXSprite < kMaxXSprites);
if (nXSprite <= 0 || nXSprite >= kMaxXSprites) break; if (nXSprite <= 0 || nXSprite >= kMaxXSprites) break;
switch (pTSprite->type) { switch (pTSprite->lotag) {
case kSwitchToggle: case kSwitchToggle:
case kSwitchOneWay: case kSwitchOneWay:
if (xsprite[nXSprite].state) nAnim = 1; if (xsprite[nXSprite].state) nAnim = 1;
@ -2301,7 +2301,7 @@ void viewProcessSprites(int32_t cX, int32_t cY, int32_t cZ, int32_t cA, int32_t
// Can be overridden by def script // Can be overridden by def script
if (r_voxels && gDetail >= 4 && videoGetRenderMode() != REND_POLYMER && tiletovox[pTSprite->picnum] == -1 && voxelIndex[pTSprite->picnum] != -1) if (r_voxels && gDetail >= 4 && videoGetRenderMode() != REND_POLYMER && tiletovox[pTSprite->picnum] == -1 && voxelIndex[pTSprite->picnum] != -1)
{ {
if ((pTSprite->flags&kHitagRespawn) == 0) if ((pTSprite->hitag&kHitagRespawn) == 0)
{ {
pTSprite->cstat |= 48; pTSprite->cstat |= 48;
pTSprite->cstat &= ~(4|8); pTSprite->cstat &= ~(4|8);
@ -2361,7 +2361,7 @@ void viewProcessSprites(int32_t cX, int32_t cY, int32_t cZ, int32_t cA, int32_t
} }
nShade += tileShade[pTSprite->picnum]; nShade += tileShade[pTSprite->picnum];
pTSprite->shade = ClipRange(nShade, -128, 127); pTSprite->shade = ClipRange(nShade, -128, 127);
if ((pTSprite->flags&kHitagRespawn) && sprite[pTSprite->owner].owner == 3) if ((pTSprite->hitag&kHitagRespawn) && sprite[pTSprite->owner].owner == 3)
{ {
dassert(pTXSprite != NULL); dassert(pTXSprite != NULL);
pTSprite->xrepeat = 48; pTSprite->xrepeat = 48;
@ -2384,21 +2384,21 @@ void viewProcessSprites(int32_t cX, int32_t cY, int32_t cZ, int32_t cA, int32_t
{ {
pTSprite->shade = ClipRange(pTSprite->shade-16-QRandom(8), -128, 127); pTSprite->shade = ClipRange(pTSprite->shade-16-QRandom(8), -128, 127);
} }
if (pTSprite->flags&256) if (pTSprite->hitag&256)
{ {
viewAddEffect(nTSprite, VIEW_EFFECT_6); viewAddEffect(nTSprite, VIEW_EFFECT_6);
} }
if (pTSprite->flags&1024) if (pTSprite->hitag&1024)
{ {
pTSprite->cstat |= 4; pTSprite->cstat |= 4;
} }
if (pTSprite->flags&2048) if (pTSprite->hitag&2048)
{ {
pTSprite->cstat |= 8; pTSprite->cstat |= 8;
} }
switch (pTSprite->statnum) { switch (pTSprite->statnum) {
case kStatDecoration: { case kStatDecoration: {
switch (pTSprite->type) { switch (pTSprite->hitag) {
case kDecorationCandle: case kDecorationCandle:
if (!pTXSprite || pTXSprite->state == 1) { if (!pTXSprite || pTXSprite->state == 1) {
pTSprite->shade = -128; pTSprite->shade = -128;
@ -2422,16 +2422,16 @@ void viewProcessSprites(int32_t cX, int32_t cY, int32_t cZ, int32_t cA, int32_t
} }
break; break;
case kStatItem: { case kStatItem: {
switch (pTSprite->type) { switch (pTSprite->hitag) {
case kItemFlagABase: case kItemFlagABase:
if (pTXSprite && pTXSprite->state > 0 && gGameOptions.nGameType == 3) { if (pTXSprite && pTXSprite->state > 0 && gGameOptions.nGameType == 3) {
uspritetype *pNTSprite = viewAddEffect(nTSprite, VIEW_EFFECT_17); auto pNTSprite = viewAddEffect(nTSprite, VIEW_EFFECT_17);
if (pNTSprite) pNTSprite->pal = 10; if (pNTSprite) pNTSprite->pal = 10;
} }
break; break;
case kItemFlagBBase: case kItemFlagBBase:
if (pTXSprite && pTXSprite->state > 0 && gGameOptions.nGameType == 3) { if (pTXSprite && pTXSprite->state > 0 && gGameOptions.nGameType == 3) {
uspritetype *pNTSprite = viewAddEffect(nTSprite, VIEW_EFFECT_17); auto pNTSprite = viewAddEffect(nTSprite, VIEW_EFFECT_17);
if (pNTSprite) pNTSprite->pal = 7; if (pNTSprite) pNTSprite->pal = 7;
} }
break; break;
@ -2444,7 +2444,7 @@ void viewProcessSprites(int32_t cX, int32_t cY, int32_t cZ, int32_t cA, int32_t
pTSprite->cstat |= 1024; pTSprite->cstat |= 1024;
break; break;
default: default:
if (pTSprite->type >= kItemKeySkull && pTSprite->type < kItemKeyMax) if (pTSprite->lotag >= kItemKeySkull && pTSprite->lotag < kItemKeyMax)
pTSprite->shade = -128; pTSprite->shade = -128;
viewApplyDefaultPal(pTSprite, pSector); viewApplyDefaultPal(pTSprite, pSector);
@ -2453,7 +2453,7 @@ void viewProcessSprites(int32_t cX, int32_t cY, int32_t cZ, int32_t cA, int32_t
} }
break; break;
case kStatProjectile: { case kStatProjectile: {
switch (pTSprite->type) { switch (pTSprite->lotag) {
case kMissileTeslaAlt: case kMissileTeslaAlt:
pTSprite->yrepeat = 128; pTSprite->yrepeat = 128;
pTSprite->cstat |= 32; pTSprite->cstat |= 32;
@ -2475,7 +2475,7 @@ void viewProcessSprites(int32_t cX, int32_t cY, int32_t cZ, int32_t cA, int32_t
} }
viewAddEffect(nTSprite, VIEW_EFFECT_1); viewAddEffect(nTSprite, VIEW_EFFECT_1);
if (pTSprite->type != kMissileFlareRegular) break; if (pTSprite->lotag != kMissileFlareRegular) break;
sectortype *pSector = &sector[pTSprite->sectnum]; sectortype *pSector = &sector[pTSprite->sectnum];
int zDiff = (pTSprite->z - pSector->ceilingz) >> 8; int zDiff = (pTSprite->z - pSector->ceilingz) >> 8;
@ -2493,7 +2493,7 @@ void viewProcessSprites(int32_t cX, int32_t cY, int32_t cZ, int32_t cA, int32_t
} }
case kStatDude: case kStatDude:
{ {
if (pTSprite->type == kDudeHand && pTXSprite->aiState == &hand13A3B4) if (pTSprite->lotag == kDudeHand && pTXSprite->aiState == &hand13A3B4)
{ {
spritetype *pTTarget = &sprite[pTXSprite->target]; spritetype *pTTarget = &sprite[pTXSprite->target];
dassert(pTXSprite != NULL && pTTarget != NULL); dassert(pTXSprite != NULL && pTTarget != NULL);
@ -2508,7 +2508,7 @@ void viewProcessSprites(int32_t cX, int32_t cY, int32_t cZ, int32_t cA, int32_t
if (powerupCheck(gView, kPwUpBeastVision) > 0) pTSprite->shade = -128; if (powerupCheck(gView, kPwUpBeastVision) > 0) pTSprite->shade = -128;
if (IsPlayerSprite((spritetype *)pTSprite)) { if (IsPlayerSprite((spritetype *)pTSprite)) {
PLAYER *pPlayer = &gPlayer[pTSprite->type-kDudePlayer1]; PLAYER *pPlayer = &gPlayer[pTSprite->lotag-kDudePlayer1];
if (powerupCheck(pPlayer, kPwUpShadowCloak) && !powerupCheck(gView, kPwUpBeastVision)) { if (powerupCheck(pPlayer, kPwUpShadowCloak) && !powerupCheck(gView, kPwUpBeastVision)) {
pTSprite->cstat |= 2; pTSprite->cstat |= 2;
pTSprite->pal = 5; pTSprite->pal = 5;
@ -2528,7 +2528,7 @@ void viewProcessSprites(int32_t cX, int32_t cY, int32_t cZ, int32_t cA, int32_t
} }
if (pPlayer->flashEffect && (gView != pPlayer || gViewPos != VIEWPOS_0)) { if (pPlayer->flashEffect && (gView != pPlayer || gViewPos != VIEWPOS_0)) {
uspritetype *pNTSprite = viewAddEffect(nTSprite, VIEW_EFFECT_14); auto pNTSprite = viewAddEffect(nTSprite, VIEW_EFFECT_14);
if (pNTSprite) { if (pNTSprite) {
POSTURE *pPosture = &gPosture[pPlayer->lifeMode][pPlayer->posture]; POSTURE *pPosture = &gPosture[pPlayer->lifeMode][pPlayer->posture];
pNTSprite->x += mulscale28(pPosture->zOffset, Cos(pTSprite->ang)); pNTSprite->x += mulscale28(pPosture->zOffset, Cos(pTSprite->ang));
@ -2539,7 +2539,7 @@ void viewProcessSprites(int32_t cX, int32_t cY, int32_t cZ, int32_t cA, int32_t
if (pPlayer->hasFlag > 0 && gGameOptions.nGameType == 3) { if (pPlayer->hasFlag > 0 && gGameOptions.nGameType == 3) {
if (pPlayer->hasFlag&1) { if (pPlayer->hasFlag&1) {
uspritetype *pNTSprite = viewAddEffect(nTSprite, VIEW_EFFECT_16); auto pNTSprite = viewAddEffect(nTSprite, VIEW_EFFECT_16);
if (pNTSprite) if (pNTSprite)
{ {
pNTSprite->pal = 10; pNTSprite->pal = 10;
@ -2547,7 +2547,7 @@ void viewProcessSprites(int32_t cX, int32_t cY, int32_t cZ, int32_t cA, int32_t
} }
} }
if (pPlayer->hasFlag&2) { if (pPlayer->hasFlag&2) {
uspritetype *pNTSprite = viewAddEffect(nTSprite, VIEW_EFFECT_16); auto pNTSprite = viewAddEffect(nTSprite, VIEW_EFFECT_16);
if (pNTSprite) if (pNTSprite)
{ {
pNTSprite->pal = 7; pNTSprite->pal = 7;
@ -2566,7 +2566,7 @@ void viewProcessSprites(int32_t cX, int32_t cY, int32_t cZ, int32_t cA, int32_t
break; break;
} }
case kStatTraps: { case kStatTraps: {
if (pTSprite->type == kTrapSawCircular) { if (pTSprite->lotag == kTrapSawCircular) {
if (pTXSprite->state) { if (pTXSprite->state) {
if (pTXSprite->data1) { if (pTXSprite->data1) {
pTSprite->picnum = 772; pTSprite->picnum = 772;
@ -2583,8 +2583,8 @@ void viewProcessSprites(int32_t cX, int32_t cY, int32_t cZ, int32_t cA, int32_t
case kStatThing: { case kStatThing: {
viewApplyDefaultPal(pTSprite, pSector); viewApplyDefaultPal(pTSprite, pSector);
if (pTSprite->type < kThingBase || pTSprite->type >= kThingMax || !gSpriteHit[nXSprite].florhit) { if (pTSprite->lotag < kThingBase || pTSprite->lotag >= kThingMax || !gSpriteHit[nXSprite].florhit) {
if ((pTSprite->flags & kPhysMove) && getflorzofslope(pTSprite->sectnum, pTSprite->x, pTSprite->y) >= cZ) if ((pTSprite->hitag & kPhysMove) && getflorzofslope(pTSprite->sectnum, pTSprite->x, pTSprite->y) >= cZ)
viewAddEffect(nTSprite, VIEW_EFFECT_0); viewAddEffect(nTSprite, VIEW_EFFECT_0);
} }
} }
@ -2594,7 +2594,7 @@ void viewProcessSprites(int32_t cX, int32_t cY, int32_t cZ, int32_t cA, int32_t
for (int nTSprite = spritesortcnt-1; nTSprite >= nViewSprites; nTSprite--) for (int nTSprite = spritesortcnt-1; nTSprite >= nViewSprites; nTSprite--)
{ {
uspritetype *pTSprite = &tsprite[nTSprite]; tspritetype *pTSprite = &tsprite[nTSprite];
int nAnim = 0; int nAnim = 0;
switch (picanm[pTSprite->picnum].extra&7) switch (picanm[pTSprite->picnum].extra&7)
{ {

3
source/blood/src/view.h
View file

@ -133,8 +133,7 @@ void viewInit(void);
void viewResizeView(int size); void viewResizeView(int size);
void UpdateFrame(void); void UpdateFrame(void);
void viewDrawInterface(ClockTicks arg); void viewDrawInterface(ClockTicks arg);
uspritetype *viewInsertTSprite(int nSector, int nStatnum, uspritetype *pSprite); tspritetype *viewAddEffect(int nTSprite, VIEW_EFFECT nViewEffect);
uspritetype *viewAddEffect(int nTSprite, VIEW_EFFECT nViewEffect);
void viewProcessSprites(int32_t cX, int32_t cY, int32_t cZ, int32_t cA, int32_t smooth); void viewProcessSprites(int32_t cX, int32_t cY, int32_t cZ, int32_t cA, int32_t smooth);
void CalcOtherPosition(spritetype *pSprite, int *pX, int *pY, int *pZ, int *vsectnum, int nAng, int zm); void CalcOtherPosition(spritetype *pSprite, int *pX, int *pY, int *pZ, int *vsectnum, int nAng, int zm);
void CalcPosition(spritetype *pSprite, int *pX, int *pY, int *pZ, int *vsectnum, int nAng, int zm); void CalcPosition(spritetype *pSprite, int *pX, int *pY, int *pZ, int *vsectnum, int nAng, int zm);