From 148c8770e90549246c229b8d88e4097b43baa4ea Mon Sep 17 00:00:00 2001 From: Evan Ramos Date: Thu, 2 Jan 2020 22:51:06 -0600 Subject: [PATCH] Blood: Constify some {u,t,}spritetype templates This is important where tracked spritetype could be involved. --- source/blood/src/actor.h | 4 ++-- source/blood/src/db.h | 2 +- source/blood/src/view.cpp | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/source/blood/src/actor.h b/source/blood/src/actor.h index a08e2d2f9..04ce1676c 100644 --- a/source/blood/src/actor.h +++ b/source/blood/src/actor.h @@ -204,14 +204,14 @@ extern short gAffectedXWalls[kMaxXWalls]; extern #endif -inline bool IsPlayerSprite(spritetype *pSprite) +inline bool IsPlayerSprite(spritetype const * const pSprite) { if (pSprite->type >= kDudePlayer1 && pSprite->type <= kDudePlayer8) return 1; return 0; } -template bool IsDudeSprite(T *pSprite) +template bool IsDudeSprite(T const * const pSprite) { if (pSprite->type >= kDudeBase && pSprite->type < kDudeMax) return 1; diff --git a/source/blood/src/db.h b/source/blood/src/db.h index 6cd060aa9..5870c76c2 100644 --- a/source/blood/src/db.h +++ b/source/blood/src/db.h @@ -312,7 +312,7 @@ static inline int GetWallType(int nWall) return wall[nWall].type; } -template void GetSpriteExtents(T *pSprite, int *top, int *bottom) +template void GetSpriteExtents(T const * const pSprite, int *top, int *bottom) { *top = *bottom = pSprite->z; if ((pSprite->cstat & 0x30) != 0x20) diff --git a/source/blood/src/view.cpp b/source/blood/src/view.cpp index 2bf7b3f21..6de0c0cf4 100644 --- a/source/blood/src/view.cpp +++ b/source/blood/src/view.cpp @@ -1887,7 +1887,7 @@ void viewDrawInterface(ClockTicks arg) static fix16_t gCameraAng; -template tspritetype* viewInsertTSprite(int nSector, int nStatnum, T *pSprite) +template tspritetype* viewInsertTSprite(int nSector, int nStatnum, T const * const pSprite) { int nTSprite = spritesortcnt; tspritetype *pTSprite = &tsprite[nTSprite];