mirror of
https://github.com/ZDoom/qzdoom.git
synced 2025-01-31 04:50:48 +00:00
- fixed GCC warnings and errors
(Is there anyway to tone down GCC's warning level? It outputs too many false positives for potentially uninitialized variables in which the genuine errors get drowned.)
This commit is contained in:
parent
77a388e908
commit
921abc404d
21 changed files with 45 additions and 27 deletions
|
@ -70,6 +70,7 @@
|
||||||
#include "a_keys.h"
|
#include "a_keys.h"
|
||||||
#include "r_data/colormaps.h"
|
#include "r_data/colormaps.h"
|
||||||
#include "g_levellocals.h"
|
#include "g_levellocals.h"
|
||||||
|
#include "actorinlines.h"
|
||||||
|
|
||||||
|
|
||||||
//=============================================================================
|
//=============================================================================
|
||||||
|
|
|
@ -21,6 +21,7 @@
|
||||||
#include "d_player.h"
|
#include "d_player.h"
|
||||||
#include "p_spec.h"
|
#include "p_spec.h"
|
||||||
#include "p_checkposition.h"
|
#include "p_checkposition.h"
|
||||||
|
#include "actorinlines.h"
|
||||||
#include "math/cmath.h"
|
#include "math/cmath.h"
|
||||||
|
|
||||||
static FRandom pr_botopendoor ("BotOpenDoor");
|
static FRandom pr_botopendoor ("BotOpenDoor");
|
||||||
|
|
|
@ -21,6 +21,7 @@
|
||||||
#include "d_event.h"
|
#include "d_event.h"
|
||||||
#include "d_player.h"
|
#include "d_player.h"
|
||||||
#include "vectors.h"
|
#include "vectors.h"
|
||||||
|
#include "actorinlines.h"
|
||||||
|
|
||||||
static FRandom pr_botmove ("BotMove");
|
static FRandom pr_botmove ("BotMove");
|
||||||
|
|
||||||
|
|
|
@ -183,7 +183,7 @@ void DThinker::SerializeThinkers(FSerializer &arc, bool hubLoad)
|
||||||
int size = arc.ArraySize();
|
int size = arc.ArraySize();
|
||||||
for (int j = 0; j < size; j++)
|
for (int j = 0; j < size; j++)
|
||||||
{
|
{
|
||||||
DThinker *thinker;
|
DThinker *thinker = nullptr;
|
||||||
arc(nullptr, thinker);
|
arc(nullptr, thinker);
|
||||||
if (thinker != nullptr)
|
if (thinker != nullptr)
|
||||||
{
|
{
|
||||||
|
|
|
@ -91,6 +91,7 @@
|
||||||
|
|
||||||
#include "g_hub.h"
|
#include "g_hub.h"
|
||||||
#include "g_levellocals.h"
|
#include "g_levellocals.h"
|
||||||
|
#include "actorinlines.h"
|
||||||
|
|
||||||
#include <string.h>
|
#include <string.h>
|
||||||
|
|
||||||
|
|
|
@ -41,6 +41,7 @@
|
||||||
#include "sbarinfo.h"
|
#include "sbarinfo.h"
|
||||||
#include "templates.h"
|
#include "templates.h"
|
||||||
#include "r_utility.h"
|
#include "r_utility.h"
|
||||||
|
#include "actorinlines.h"
|
||||||
|
|
||||||
#define ST_RAMPAGEDELAY (2*TICRATE)
|
#define ST_RAMPAGEDELAY (2*TICRATE)
|
||||||
#define ST_MUCHPAIN 20
|
#define ST_MUCHPAIN 20
|
||||||
|
|
|
@ -840,7 +840,7 @@ int FGLRenderer::PTM_BestColor (const uint32_t *pal_in, int r, int g, int b, int
|
||||||
static float trackpowtable = 0.;
|
static float trackpowtable = 0.;
|
||||||
|
|
||||||
double fbestdist, fdist;
|
double fbestdist, fdist;
|
||||||
int bestcolor;
|
int bestcolor = 0;
|
||||||
|
|
||||||
if (firstTime || trackpowtable != gl_paltonemap_powtable)
|
if (firstTime || trackpowtable != gl_paltonemap_powtable)
|
||||||
{
|
{
|
||||||
|
|
|
@ -847,7 +847,7 @@ void GLLinePortal::PushState()
|
||||||
void GLLinePortal::PopState()
|
void GLLinePortal::PopState()
|
||||||
{
|
{
|
||||||
FStateVec4 &v = gl_RenderState.GetClipLine();
|
FStateVec4 &v = gl_RenderState.GetClipLine();
|
||||||
float e;
|
float e = 0;
|
||||||
planestack.Pop(e);
|
planestack.Pop(e);
|
||||||
planestack.Pop(v.vec[3]);
|
planestack.Pop(v.vec[3]);
|
||||||
planestack.Pop(v.vec[2]);
|
planestack.Pop(v.vec[2]);
|
||||||
|
|
|
@ -62,6 +62,7 @@
|
||||||
#include "menu/menu.h"
|
#include "menu/menu.h"
|
||||||
#include "g_levellocals.h"
|
#include "g_levellocals.h"
|
||||||
#include "virtual.h"
|
#include "virtual.h"
|
||||||
|
#include "actorinlines.h"
|
||||||
|
|
||||||
// The conversations as they exist inside a SCRIPTxx lump.
|
// The conversations as they exist inside a SCRIPTxx lump.
|
||||||
struct Response
|
struct Response
|
||||||
|
|
|
@ -40,6 +40,7 @@
|
||||||
#include "p_blockmap.h"
|
#include "p_blockmap.h"
|
||||||
#include "r_utility.h"
|
#include "r_utility.h"
|
||||||
#include "actor.h"
|
#include "actor.h"
|
||||||
|
#include "actorinlines.h"
|
||||||
|
|
||||||
// State.
|
// State.
|
||||||
#include "r_state.h"
|
#include "r_state.h"
|
||||||
|
|
|
@ -143,10 +143,11 @@ DPSprite::DPSprite(player_t *owner, AActor *caller, int id)
|
||||||
Owner(owner),
|
Owner(owner),
|
||||||
Sprite(0),
|
Sprite(0),
|
||||||
ID(id),
|
ID(id),
|
||||||
processPending(true),
|
processPending(true)
|
||||||
alpha(1),
|
|
||||||
RenderStyle(STYLE_Normal)
|
|
||||||
{
|
{
|
||||||
|
alpha = 1;
|
||||||
|
RenderStyle = STYLE_Normal;
|
||||||
|
|
||||||
DPSprite *prev = nullptr;
|
DPSprite *prev = nullptr;
|
||||||
DPSprite *next = Owner->psprites;
|
DPSprite *next = Owner->psprites;
|
||||||
while (next != nullptr && next->ID < ID)
|
while (next != nullptr && next->ID < ID)
|
||||||
|
|
|
@ -52,6 +52,7 @@
|
||||||
#include "math/cmath.h"
|
#include "math/cmath.h"
|
||||||
#include "actorptrselect.h"
|
#include "actorptrselect.h"
|
||||||
#include "g_levellocals.h"
|
#include "g_levellocals.h"
|
||||||
|
#include "actorinlines.h"
|
||||||
|
|
||||||
// Set of spawnable things for the Thing_Spawn and Thing_Projectile specials.
|
// Set of spawnable things for the Thing_Spawn and Thing_Projectile specials.
|
||||||
FClassMap SpawnableThings;
|
FClassMap SpawnableThings;
|
||||||
|
|
|
@ -1813,7 +1813,7 @@ public:
|
||||||
vd->zCeiling = vd->zFloor = vd->flags = 0;
|
vd->zCeiling = vd->zFloor = vd->flags = 0;
|
||||||
|
|
||||||
sc.MustGetToken('{');
|
sc.MustGetToken('{');
|
||||||
double x, y;
|
double x = 0, y = 0;
|
||||||
while (!sc.CheckToken('}'))
|
while (!sc.CheckToken('}'))
|
||||||
{
|
{
|
||||||
FName key = ParseKey();
|
FName key = ParseKey();
|
||||||
|
|
|
@ -59,7 +59,7 @@ void RenderPolyWallSprite::Render(const TriMatrix &worldToClip, const Vec4f &cli
|
||||||
left.X = pos.X - x1 * angcos;
|
left.X = pos.X - x1 * angcos;
|
||||||
left.Y = pos.Y - x1 * angsin;
|
left.Y = pos.Y - x1 * angsin;
|
||||||
right.X = left.X + x2 * angcos;
|
right.X = left.X + x2 * angcos;
|
||||||
right.Y = right.Y + x2 * angsin;
|
right.Y = left.Y + x2 * angsin;
|
||||||
|
|
||||||
//int scaled_to = tex->GetScaledTopOffset();
|
//int scaled_to = tex->GetScaledTopOffset();
|
||||||
//int scaled_bo = scaled_to - tex->GetScaledHeight();
|
//int scaled_bo = scaled_to - tex->GetScaledHeight();
|
||||||
|
|
|
@ -1064,7 +1064,7 @@ void FCanvasTextureInfo::Serialize(FSerializer &arc)
|
||||||
{
|
{
|
||||||
if (arc.BeginArray("canvastextures"))
|
if (arc.BeginArray("canvastextures"))
|
||||||
{
|
{
|
||||||
AActor *viewpoint;
|
AActor *viewpoint = nullptr;
|
||||||
int fov;
|
int fov;
|
||||||
FTextureID picnum;
|
FTextureID picnum;
|
||||||
while (arc.BeginObject(nullptr))
|
while (arc.BeginObject(nullptr))
|
||||||
|
|
|
@ -325,7 +325,7 @@ void AudioToolboxMIDIDevice::TimerCallback(CFRunLoopTimerRef timer, void* info)
|
||||||
|
|
||||||
#undef AT_MIDI_CHECK_ERROR
|
#undef AT_MIDI_CHECK_ERROR
|
||||||
|
|
||||||
MIDIDevice *CreateAudioToolboxMIDTDevice()
|
MIDIDevice *CreateAudioToolboxMIDIDevice()
|
||||||
{
|
{
|
||||||
return new AudioToolboxMIDIDevice();
|
return new AudioToolboxMIDIDevice();
|
||||||
}
|
}
|
||||||
|
|
|
@ -2057,7 +2057,7 @@ MIDIDevice* OpenALSoundRenderer::CreateMIDIDevice() const
|
||||||
extern unsigned mididevice;
|
extern unsigned mididevice;
|
||||||
return CreateWinMIDIDevice(mididevice);
|
return CreateWinMIDIDevice(mididevice);
|
||||||
#elif defined __APPLE__
|
#elif defined __APPLE__
|
||||||
return CreateAudioToolboxMIDIDevice;
|
return CreateAudioToolboxMIDIDevice();
|
||||||
#else
|
#else
|
||||||
return new OPLMIDIDevice(nullptr);
|
return new OPLMIDIDevice(nullptr);
|
||||||
#endif
|
#endif
|
||||||
|
|
|
@ -231,7 +231,7 @@ namespace swrenderer
|
||||||
|
|
||||||
Thread->TranslucentPass->Render();
|
Thread->TranslucentPass->Render();
|
||||||
|
|
||||||
VisiblePlane *pl;
|
VisiblePlane *pl = nullptr; // quiet, GCC!
|
||||||
visplaneStack.Pop(pl);
|
visplaneStack.Pop(pl);
|
||||||
if (pl->Alpha > 0 && pl->picnum != skyflatnum)
|
if (pl->Alpha > 0 && pl->picnum != skyflatnum)
|
||||||
{
|
{
|
||||||
|
|
|
@ -166,6 +166,10 @@ namespace swrenderer
|
||||||
// Get the top and bottom clipping arrays
|
// Get the top and bottom clipping arrays
|
||||||
switch (decal->RenderFlags & RF_CLIPMASK)
|
switch (decal->RenderFlags & RF_CLIPMASK)
|
||||||
{
|
{
|
||||||
|
default:
|
||||||
|
// keep GCC quiet.
|
||||||
|
return;
|
||||||
|
|
||||||
case RF_CLIPFULL:
|
case RF_CLIPFULL:
|
||||||
if (curline->backsector == NULL)
|
if (curline->backsector == NULL)
|
||||||
{
|
{
|
||||||
|
|
|
@ -358,6 +358,11 @@ namespace swrenderer
|
||||||
neardepth = ds->sz2, fardepth = ds->sz1;
|
neardepth = ds->sz2, fardepth = ds->sz1;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
// GCC complained about this case, is there something missing here?
|
||||||
|
fardepth = neardepth = 0;
|
||||||
|
}
|
||||||
|
|
||||||
// Check if sprite is in front of draw seg:
|
// Check if sprite is in front of draw seg:
|
||||||
if ((!spr->IsWallSprite() && neardepth > spr->depth) || ((spr->IsWallSprite() || fardepth > spr->depth) &&
|
if ((!spr->IsWallSprite() && neardepth > spr->depth) || ((spr->IsWallSprite() || fardepth > spr->depth) &&
|
||||||
|
|
|
@ -50,29 +50,29 @@ namespace swrenderer
|
||||||
|
|
||||||
int TextureFracBits() const { return dc_wall_fracbits; }
|
int TextureFracBits() const { return dc_wall_fracbits; }
|
||||||
|
|
||||||
FVector3 dc_normal;
|
FVector3 dc_normal = { 0,0,0 };
|
||||||
FVector3 dc_viewpos;
|
FVector3 dc_viewpos = { 0,0,0 };
|
||||||
FVector3 dc_viewpos_step;
|
FVector3 dc_viewpos_step = { 0,0,0 };
|
||||||
DrawerLight *dc_lights = nullptr;
|
DrawerLight *dc_lights = nullptr;
|
||||||
int dc_num_lights = 0;
|
int dc_num_lights = 0;
|
||||||
|
|
||||||
private:
|
private:
|
||||||
uint8_t *dc_dest = nullptr;
|
uint8_t *dc_dest = nullptr;
|
||||||
int dc_dest_y = 0;
|
int dc_dest_y = 0;
|
||||||
int dc_count;
|
int dc_count = 0;
|
||||||
|
|
||||||
fixed_t dc_iscale;
|
fixed_t dc_iscale = 0;
|
||||||
fixed_t dc_texturefrac;
|
fixed_t dc_texturefrac = 0;
|
||||||
uint32_t dc_texturefracx;
|
uint32_t dc_texturefracx = 0;
|
||||||
uint32_t dc_textureheight;
|
uint32_t dc_textureheight = 0;
|
||||||
const uint8_t *dc_source;
|
const uint8_t *dc_source = nullptr;
|
||||||
const uint8_t *dc_source2;
|
const uint8_t *dc_source2 = nullptr;
|
||||||
int dc_wall_fracbits;
|
int dc_wall_fracbits = 0;
|
||||||
|
|
||||||
uint32_t *dc_srcblend;
|
uint32_t *dc_srcblend = nullptr;
|
||||||
uint32_t *dc_destblend;
|
uint32_t *dc_destblend = nullptr;
|
||||||
fixed_t dc_srcalpha;
|
fixed_t dc_srcalpha = 0;
|
||||||
fixed_t dc_destalpha;
|
fixed_t dc_destalpha = 0;
|
||||||
|
|
||||||
typedef void(SWPixelFormatDrawers::*WallDrawerFunc)(const WallDrawerArgs &args);
|
typedef void(SWPixelFormatDrawers::*WallDrawerFunc)(const WallDrawerArgs &args);
|
||||||
WallDrawerFunc wallfunc = nullptr;
|
WallDrawerFunc wallfunc = nullptr;
|
||||||
|
|
Loading…
Reference in a new issue