- Exhumed: Mark unused function arguments in standard C++ fashion.

source/exhumed/src/bubbles.cpp

@@ -144,7 +144,7 @@ int BuildBubble(int x, int y, int z, short nSector)
     return nBubble | 0x140000;
 }
 
-void FuncBubble(int a, int UNUSED(b), int nRun)
+void FuncBubble(int a, int, int nRun)
 {
     short nBubble = RunData[nRun].nVal;
     assert(nBubble >= 0 && nBubble < kMaxBubbles);

source/exhumed/src/bullet.cpp

@@ -534,7 +534,7 @@ void SetBulletEnemy(short nBullet, short nEnemy)
     }
 }
 
-int BuildBullet(short nSprite, int nType, int UNUSED(ebx), int UNUSED(ecx), int val1, int nAngle, int val2, int val3)
+int BuildBullet(short nSprite, int nType, int, int, int val1, int nAngle, int val2, int val3)
 {
     Bullet sBullet;
     bulletInfo *pBulletInfo = &BulletInfo[nType];
@@ -785,7 +785,7 @@ int BuildBullet(short nSprite, int nType, int UNUSED(ebx), int UNUSED(ecx), int
     return nBulletSprite | (nBullet << 16);
 }
 
-void FuncBullet(int a, int UNUSED(b), int nRun)
+void FuncBullet(int a, int, int nRun)
 {
     short nBullet = RunData[nRun].nVal;
     assert(nBullet >= 0 && nBullet < kMaxBullets);

source/exhumed/src/fish.cpp

@@ -142,7 +142,7 @@ void BuildBlood(int x, int y, int z, short nSector)
     BuildAnim(-1, kSeqFish, 36, x, y, z, nSector, 75, 128);
 }
 
-void FuncFishLimb(int a, int UNUSED(nDamage), int nRun)
+void FuncFishLimb(int a, int, int nRun)
 {
     short nFish = RunData[nRun].nVal;
     short nSprite = FishChunk[nFish].nSprite;

source/exhumed/src/grenade.cpp

@@ -94,7 +94,7 @@ void BounceGrenade(short nGrenade, short nAngle)
     D3PlayFX(StaticSound[kSound3], GrenadeList[nGrenade].nSprite);
 }
 
-int ThrowGrenade(short nPlayer, int UNUSED(edx), int UNUSED(ebx), int ecx, int push1)
+int ThrowGrenade(short nPlayer, int, int, int ecx, int push1)
 {
     if (nPlayerGrenade[nPlayer] < 0)
         return -1;
@@ -265,7 +265,7 @@ void ExplodeGrenade(short nGrenade)
     DestroyGrenade(nGrenade);
 }
 
-void FuncGrenade(int a, int UNUSED(nDamage), int nRun)
+void FuncGrenade(int a, int, int nRun)
 {
     short nGrenade = RunData[nRun].nVal;
     assert(nGrenade >= 0 && nGrenade < kMaxGrenades);

source/exhumed/src/lavadude.cpp

@@ -99,7 +99,7 @@ int BuildLavaLimb(int nSprite, int edx, int ebx)
     return nLimbSprite;
 }
 
-void FuncLavaLimb(int a, int UNUSED(nDamage), int nRun)
+void FuncLavaLimb(int a, int, int nRun)
 {
     short nSprite = RunData[nRun].nVal;
     assert(nSprite >= 0 && nSprite < kMaxSprites);
@@ -140,7 +140,7 @@ void FuncLavaLimb(int a, int UNUSED(nDamage), int nRun)
     }
 }
 
-int BuildLava(short nSprite, int x, int y, int UNUSED(z), short nSector, short nAngle, int nChannel)
+int BuildLava(short nSprite, int x, int y, int, short nSector, short nAngle, int nChannel)
 {
     short nLava = LavaCount;
     LavaCount++;

source/exhumed/src/lighting.cpp

@@ -773,7 +773,7 @@ void SetTorch(int nPlayer, int bTorchOnOff)
     StatusMessage(150, buf);
 }
 
-void BuildFlash(short nPlayer, short UNUSED(nSector), int nVal)
+void BuildFlash(short nPlayer, short, int nVal)
 {
     if (nPlayer == nLocalPlayer)
     {

source/exhumed/src/move.cpp

@@ -314,7 +314,7 @@ int BelowNear(short nSprite)
     }
 }
 
-int movespritez(short nSprite, int z, int height, int UNUSED(flordist), int clipdist)
+int movespritez(short nSprite, int z, int height, int, int clipdist)
 {
     spritetype* pSprite = &sprite[nSprite];
     short nSector = pSprite->sectnum;
@@ -492,7 +492,7 @@ int GetSpriteHeight(int nSprite)
     return tilesiz[sprite[nSprite].picnum].y * sprite[nSprite].yrepeat * 4;
 }
 
-int movesprite(short nSprite, int dx, int dy, int dz, int UNUSED(ceildist), int flordist, unsigned int clipmask)
+int movesprite(short nSprite, int dx, int dy, int dz, int, int flordist, unsigned int clipmask)
 {
     spritetype *pSprite = &sprite[nSprite];
     bTouchFloor = false;

source/exhumed/src/object.cpp

@@ -559,7 +559,7 @@ void StartElevSound(short nSprite, int nVal)
     D3PlayFX(StaticSound[nSound], nSprite);
 }
 
-void FuncElev(int a, int UNUSED(b), int nRun)
+void FuncElev(int a, int, int nRun)
 {
     short nElev = RunData[nRun].nVal;
     assert(nElev >= 0 && nElev < kMaxElevs);
@@ -815,7 +815,7 @@ int BuildWallFace(short nChannel, short nWall, int nCount, ...)
     return WallFaceCount | 0x70000;
 }
 
-void FuncWallFace(int a, int UNUSED(b), int nRun)
+void FuncWallFace(int a, int, int nRun)
 {
     int nWallFace = RunData[nRun].nVal;
     assert(nWallFace >= 0 && nWallFace < kMaxWallFace);
@@ -972,7 +972,7 @@ int BuildSlide(int nChannel, int nStartWall, int ebx, int ecx, int nWall2, int n
     return nSlide | 0x80000;
 }
 
-void FuncSlide(int a, int UNUSED(b), int nRun)
+void FuncSlide(int a, int, int nRun)
 {
     int nSlide = RunData[nRun].nVal;
     assert(nSlide >= 0 && nSlide < kMaxSlides);
@@ -1219,7 +1219,7 @@ int BuildTrap(int nSprite, int edx, int ebx, int ecx)
     }
 }
 
-void FuncTrap(int a, int UNUSED(b), int nRun)
+void FuncTrap(int a, int, int nRun)
 {
     short nTrap = RunData[nRun].nVal;
     short nSprite = sTrap[nTrap].nSprite;
@@ -1408,7 +1408,7 @@ int BuildSpark(int nSprite, int nVal)
     return var_14;
 }
 
-void FuncSpark(int a, int UNUSED(b), int nRun)
+void FuncSpark(int a, int, int nRun)
 {
     int nSprite = RunData[nRun].nVal;
     assert(nSprite >= 0 && nSprite < kMaxSprites);

source/exhumed/src/ra.cpp

@@ -149,7 +149,7 @@ void MoveRaToEnemy(short nPlayer)
     }
 }
 
-void FuncRa(int a, int UNUSED(nDamage), int nRun)
+void FuncRa(int a, int, int nRun)
 {
     short nPlayer = RunData[nRun].nVal;
     short nCurrentWeapon = PlayerList[nPlayer].nCurrentWeapon;

source/exhumed/src/snake.cpp

@@ -307,7 +307,7 @@ int FindSnakeEnemy(short nSnake)
     return nEnemy;
 }
 
-void FuncSnake(int a, int UNUSED(nDamage), int nRun)
+void FuncSnake(int a, int, int nRun)
 {
     int nMessage = a & kMessageMask;