mirror of
https://github.com/ZDoom/gzdoom.git
synced 2024-11-23 04:22:34 +00:00
- warning fixes and cleanup from old startscreen branch.
This commit is contained in:
parent
af640e9f21
commit
a8d42e44b9
9 changed files with 5 additions and 27 deletions
|
@ -340,7 +340,7 @@ public:
|
|||
FShader *Get(unsigned int eff, bool alphateston)
|
||||
{
|
||||
// indices 0-2 match the warping modes, 3 no texture, the following are custom
|
||||
if (!alphateston && eff < SHADER_NoTexture)
|
||||
if (!alphateston && eff < SHADER_NoTexture && mCompileState == -1)
|
||||
{
|
||||
return mMaterialShadersNAT[eff]; // Non-alphatest shaders are only created for default, warp1+2 and brightmap. The rest won't get used anyway
|
||||
}
|
||||
|
|
|
@ -403,7 +403,6 @@ void FBitmap::CopyPixelDataRGB(int originx, int originy, const uint8_t *patch, i
|
|||
}
|
||||
}
|
||||
|
||||
|
||||
template<class TDest, class TBlend>
|
||||
void iCopyPaletted(uint8_t *buffer, const uint8_t * patch, int srcwidth, int srcheight, int Pitch,
|
||||
int step_x, int step_y, int rotate, const PalEntry * palette, FCopyInfo *inf)
|
||||
|
|
|
@ -322,7 +322,7 @@ int FNotchTexture::CopyPixels(FBitmap *bmp, int conversion)
|
|||
const uint8_t *source = (const uint8_t *)lump.GetMem();
|
||||
|
||||
auto Work = (uint32_t*)bmp->GetPixels();
|
||||
for(int i=0; i * Width * Height / 2; i++)
|
||||
for(int i = 0; i < Width * Height / 2; i++)
|
||||
{
|
||||
Work[i * 2] = startuppalette32[source[i] >> 4];
|
||||
Work[i * 2 + 1] = startuppalette32[source[i] & 15];
|
||||
|
|
|
@ -208,20 +208,6 @@ void FWeaponSlot::Sort()
|
|||
}
|
||||
}
|
||||
|
||||
//===========================================================================
|
||||
//
|
||||
// FWeaponSlots - Copy Constructor
|
||||
//
|
||||
//===========================================================================
|
||||
|
||||
FWeaponSlots::FWeaponSlots(const FWeaponSlots &other)
|
||||
{
|
||||
for (int i = 0; i < NUM_WEAPON_SLOTS; ++i)
|
||||
{
|
||||
Slots[i] = other.Slots[i];
|
||||
}
|
||||
}
|
||||
|
||||
//===========================================================================
|
||||
//
|
||||
// FWeaponSlots :: Clear
|
||||
|
|
|
@ -51,7 +51,7 @@ enum ESlotDef
|
|||
struct FWeaponSlots
|
||||
{
|
||||
FWeaponSlots() { Clear(); }
|
||||
FWeaponSlots(const FWeaponSlots &other);
|
||||
FWeaponSlots(const FWeaponSlots &other) = default;
|
||||
|
||||
private:
|
||||
FWeaponSlot Slots[NUM_WEAPON_SLOTS];
|
||||
|
|
|
@ -1270,7 +1270,7 @@ static int PatchThing (int thingy)
|
|||
di->Amount = -1;
|
||||
info->GetInfo()->DropItems = di;
|
||||
}
|
||||
else if (val == -1)
|
||||
else if ((int)val == -1)
|
||||
{
|
||||
info->GetInfo()->DropItems = nullptr;
|
||||
}
|
||||
|
|
|
@ -101,12 +101,7 @@ struct svalue_t
|
|||
value.i = 0;
|
||||
}
|
||||
|
||||
svalue_t(const svalue_t & other)
|
||||
{
|
||||
type = other.type;
|
||||
string = other.string;
|
||||
value = other.value;
|
||||
}
|
||||
svalue_t(const svalue_t & other) = default;
|
||||
|
||||
void setInt(int ip)
|
||||
{
|
||||
|
|
|
@ -45,7 +45,6 @@
|
|||
#include "c_dispatch.h"
|
||||
#include "sc_man.h"
|
||||
#include "v_text.h"
|
||||
#include "st_start.h"
|
||||
#include "doomstat.h"
|
||||
#include "v_palette.h"
|
||||
#include "colormatcher.h"
|
||||
|
|
|
@ -46,7 +46,6 @@
|
|||
#include "v_palette.h"
|
||||
#include "po_man.h"
|
||||
#include "p_effect.h"
|
||||
#include "st_start.h"
|
||||
#include "v_font.h"
|
||||
#include "r_data/colormaps.h"
|
||||
#include "p_maputl.h"
|
||||
|
|
Loading…
Reference in a new issue