From 23471fdf0a47d7df26fd5a2bdafb0ea419d5f7e8 Mon Sep 17 00:00:00 2001 From: terminx Date: Wed, 4 Apr 2018 21:06:07 +0000 Subject: [PATCH] Build fixes, oops git-svn-id: https://svn.eduke32.com/eduke32@6805 1a8010ca-5511-0410-912e-c29ae57300e0 --- source/duke3d/src/actors.cpp | 5 ++--- source/duke3d/src/screens.cpp | 2 +- source/duke3d/src/sector.cpp | 4 +++- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/source/duke3d/src/actors.cpp b/source/duke3d/src/actors.cpp index 81b244ed9..3a8da5281 100644 --- a/source/duke3d/src/actors.cpp +++ b/source/duke3d/src/actors.cpp @@ -114,14 +114,13 @@ void A_RadiusDamage(int spriteNum, int blastRadius, int dmg1, int dmg2, int dmg3 int32_t sectorCount = 0; int32_t numSectors = 1; + int16_t sectorList[64] = { pSprite->sectnum }; #ifndef EDUKE32_STANDALONE if ((pSprite->picnum == RPG && pSprite->xrepeat < 11) || pSprite->picnum == SHRINKSPARK) goto SKIPWALLCHECK; #endif - int16_t sectorList[64] = { pSprite->sectnum }; - do { int const sectorNum = sectorList[sectorCount++]; @@ -464,7 +463,7 @@ int32_t A_MoveSpriteClipdist(int32_t spriteNum, vec3_t const * const change, uin } int16_t newSectnum = pSprite->sectnum; - int const UNUSED(oldSectnum) = newSectnum; + int const oldSectnum = newSectnum; int32_t newZ = pSprite->z - 2 * tilesiz[pSprite->picnum].y * pSprite->yrepeat; int const oldZ = pSprite->z; diff --git a/source/duke3d/src/screens.cpp b/source/duke3d/src/screens.cpp index 7984eba5e..3b6b7d277 100644 --- a/source/duke3d/src/screens.cpp +++ b/source/duke3d/src/screens.cpp @@ -730,7 +730,7 @@ static void G_ShowCacheLocks(void) if (k >= ydim-12) break; - Bsprintf(tempbuf, "Locked- %d: Leng:%zu, Lock:%d", i, cac[i].leng, *cac[i].lock); + Bsprintf(tempbuf, "Locked- %d: Leng:%d, Lock:%d", i, cac[i].leng, *cac[i].lock); printext256(0L, k, COLOR_WHITE, -1, tempbuf, 1); k += 6; } diff --git a/source/duke3d/src/sector.cpp b/source/duke3d/src/sector.cpp index 39be9dd27..472c1a34d 100644 --- a/source/duke3d/src/sector.cpp +++ b/source/duke3d/src/sector.cpp @@ -145,7 +145,7 @@ int G_CheckActivatorMotion(int lotag) return 0; } -int CheckDoorTile(int UNUSED(tileNum)) +int CheckDoorTile(int tileNum) { #ifndef EDUKE32_STANDALONE switch (DYNAMICTILEMAP(tileNum)) @@ -174,6 +174,8 @@ int CheckDoorTile(int UNUSED(tileNum)) case DOORTILE23__STATIC: return 1; } +#else + UNREFERENCED_PARAMETER(tileNum); #endif return 0; }