Commit 62426363 authored by Richard Gobeille's avatar Richard Gobeille
Browse files

Duke3d: clang warning fixes

parent b1331f54
......@@ -101,7 +101,7 @@ void G_DoConveyorInterp(int smoothratio)
auto sect = &sector[s->sectnum];
if ((s->lotag == SE_24_CONVEYOR) | (s->lotag == SE_34_CONVEYOR2))
if ((int)(s->lotag == SE_24_CONVEYOR) | (int)(s->lotag == SE_34_CONVEYOR2))
sect->floorxpanning -= (uint8_t)mulscale16(65536 - smoothratio, sect->floorxpanning - (sect->floorxpanning - (s->yvel >> 7)));
}
}
......@@ -118,7 +118,7 @@ void G_ResetConveyorInterp(void)
auto sect = &sector[s->sectnum];
if ((s->lotag == SE_24_CONVEYOR) | (s->lotag == SE_34_CONVEYOR2))
if ((int)(s->lotag == SE_24_CONVEYOR) | (int)(s->lotag == SE_34_CONVEYOR2))
sect->floorxpanning = (uint8_t)actor[i].bpos.x;
}
}
......
......@@ -3226,7 +3226,7 @@ badindex:
vm.pActor->lastv = pSprite->xy;
}
if (tw && ((vm.pSprite->statnum == STAT_ACTOR) | (vm.pSprite->statnum == STAT_STANDABLE)))
if (tw && ((int)(vm.pSprite->statnum == STAT_ACTOR) | (int)(vm.pSprite->statnum == STAT_STANDABLE)))
vm.pActor->timetosleep = SLEEPTIME;
branch(tw);
......@@ -3249,7 +3249,7 @@ badindex:
AC_ACTION_COUNT(vm.pData) = 0;
AC_CURFRAME(vm.pData) = 0;
if (!A_CheckEnemySprite(vm.pSprite) | (vm.pSprite->extra > 0)) // hack
if ((int)!A_CheckEnemySprite(vm.pSprite) | (int)(vm.pSprite->extra > 0)) // hack
if (vm.pSprite->hitag & random_angle)
vm.pSprite->ang = krand() & 2047;
dispatch();
......@@ -3611,7 +3611,7 @@ badindex:
AC_MOVE_ID(vm.pData) = *insptr++;
vm.pSprite->hitag = *insptr++;
if (!A_CheckEnemySprite(vm.pSprite) | (vm.pSprite->extra > 0)) // hack
if ((int)!A_CheckEnemySprite(vm.pSprite) | (int)(vm.pSprite->extra > 0)) // hack
if (vm.pSprite->hitag & random_angle)
vm.pSprite->ang = krand() & 2047;
dispatch();
......@@ -6767,7 +6767,7 @@ void A_Execute(int const spriteNum, int const playerNum, int const playerDist)
{
// hack for 1.3D fire sprites
#ifndef EDUKE32_STANDALONE
if (!FURY && EDUKE32_PREDICT_FALSE(g_scriptVersion == 13 && ((vm.pSprite->picnum == FIRE) | (vm.pSprite->picnum == FIRE2))))
if (!FURY && EDUKE32_PREDICT_FALSE(g_scriptVersion == 13 && ((int)(vm.pSprite->picnum == FIRE) | (int)(vm.pSprite->picnum == FIRE2))))
return;
#endif
changespritestat(vm.spriteNum, STAT_ZOMBIEACTOR);
......
......@@ -35,6 +35,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#include "sbar.h"
#include "screens.h"
#include <cfloat>
#define COLOR_RED redcol
#define COLOR_WHITE whitecol
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment