From 6b75f14c0fa18f276180a5585be40d270d76752c Mon Sep 17 00:00:00 2001 From: Christoph Oelckers Date: Tue, 2 Feb 2016 01:04:59 +0100 Subject: [PATCH] - fixed some Linux/GCC warnings. --- src/p_3dfloors.h | 2 +- src/p_sight.cpp | 2 +- src/textures/pngtexture.cpp | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/p_3dfloors.h b/src/p_3dfloors.h index 5ddded3d3c..51761d31bd 100644 --- a/src/p_3dfloors.h +++ b/src/p_3dfloors.h @@ -90,7 +90,7 @@ struct F3DFloor fixed_t delta; - int flags; + unsigned int flags; line_t* master; sector_t * model; diff --git a/src/p_sight.cpp b/src/p_sight.cpp index 259b3baa85..b007410c84 100644 --- a/src/p_sight.cpp +++ b/src/p_sight.cpp @@ -56,7 +56,7 @@ class SightCheck fixed_t topslope, bottomslope; // slopes to top and bottom of target int Flags; divline_t trace; - int myseethrough; + unsigned int myseethrough; bool PTR_SightTraverse (intercept_t *in); bool P_SightCheckLine (line_t *ld); diff --git a/src/textures/pngtexture.cpp b/src/textures/pngtexture.cpp index 5a3ae960a1..6a7370facc 100644 --- a/src/textures/pngtexture.cpp +++ b/src/textures/pngtexture.cpp @@ -276,9 +276,9 @@ FPNGTexture::FPNGTexture (FileReader &lump, int lumpnum, const FString &filename lump.Read (trans, len); HaveTrans = true; // Save for colortype 2 - NonPaletteTrans[0] = BigShort(((WORD *)trans)[0]); - NonPaletteTrans[1] = BigShort(((WORD *)trans)[1]); - NonPaletteTrans[2] = BigShort(((WORD *)trans)[2]); + NonPaletteTrans[0] = WORD(trans[0] * 256 + trans[1]); + NonPaletteTrans[1] = WORD(trans[2] * 256 + trans[3]); + NonPaletteTrans[2] = WORD(trans[4] * 256 + trans[5]); break; case MAKE_ID('a','l','P','h'):