zdoom/raze
0
0
Fork 0
mirror of https://github.com/ZDoom/Raze.git synced 2024-11-15 08:51:24 +00:00
Code Issues Projects Releases Packages Wiki Activity

fixed some warnings pointed out by Intellisense

Browse source
This commit is contained in:
Christoph Oelckers 2024-01-06 09:31:07 +01:00
parent fa997c27f1
commit 34ecb158b6
8 changed files with 27 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
source/common/2d/v_2ddrawer.h
View file

@ -192,7 +192,7 @@ public:
TArray<TwoDVertex> mVertices;
TArray<RenderCommand> mData;
int Width, Height;
bool isIn2D;
bool isIn2D = false;
bool locked = false; // prevents clearing of the data so it can be reused multiple times (useful for screen fades)
float screenFade = 1.f;
DVector2 offset;
@ -317,7 +317,7 @@ public:
RefCountedPtr<DShape2DBufferInfo> bufferInfo;
DrawParms* lastParms;
DrawParms* lastParms = nullptr;
void OnDestroy() override;
};

18
source/common/filesystem/include/fs_filesystem.h
View file

@ -154,20 +154,20 @@ protected:
std::vector<LumpRecord> FileInfo;
std::vector<uint32_t> Hashes; // one allocation for all hash lists.
uint32_t *FirstLumpIndex; // [RH] Hashing stuff moved out of lumpinfo structure
uint32_t *NextLumpIndex;
uint32_t *FirstLumpIndex = nullptr; // [RH] Hashing stuff moved out of lumpinfo structure
uint32_t *NextLumpIndex = nullptr;
uint32_t *FirstLumpIndex_FullName; // The same information for fully qualified paths from .zips
uint32_t *NextLumpIndex_FullName;
uint32_t *FirstLumpIndex_FullName = nullptr; // The same information for fully qualified paths from .zips
uint32_t *NextLumpIndex_FullName = nullptr;
uint32_t *FirstLumpIndex_NoExt; // The same information for fully qualified paths from .zips
uint32_t *NextLumpIndex_NoExt;
uint32_t *FirstLumpIndex_NoExt = nullptr; // The same information for fully qualified paths from .zips
uint32_t *NextLumpIndex_NoExt = nullptr;
uint32_t* FirstLumpIndex_ResId; // The same information for fully qualified paths from .zips
uint32_t* NextLumpIndex_ResId;
uint32_t* FirstLumpIndex_ResId = nullptr; // The same information for fully qualified paths from .zips
uint32_t* NextLumpIndex_ResId = nullptr;
uint32_t NumEntries = 0; // Not necessarily the same as FileInfo.Size()
uint32_t NumWads;
uint32_t NumWads = 0;
int IwadIndex = -1;
int MaxIwadIndex = -1;

5
source/common/filesystem/source/filesystem.cpp
View file

@ -40,6 +40,7 @@
#include <stdlib.h>
#include <ctype.h>
#include <string.h>
#include <inttypes.h>
#include "resourcefile.h"
#include "fs_filesystem.h"
@ -415,7 +416,7 @@ void FileSystem::AddFile (const char *filename, FileReader *filer, LumpFilterInf
snprintf(cksumout + (j * 2), 3, "%02X", cksum[j]);
}
fprintf(hashfile, "file: %s, hash: %s, size: %d\n", filename, cksumout, (int)filereader.GetLength());
fprintf(hashfile, "file: %s, hash: %s, size: %td\n", filename, cksumout, filereader.GetLength());
}
else
@ -434,7 +435,7 @@ void FileSystem::AddFile (const char *filename, FileReader *filer, LumpFilterInf
snprintf(cksumout + (j * 2), 3, "%02X", cksum[j]);
}
fprintf(hashfile, "file: %s, lump: %s, hash: %s, size: %lu\n", filename, resfile->getName(i), cksumout, (uint64_t)resfile->Length(i));
fprintf(hashfile, "file: %s, lump: %s, hash: %s, size: %zu\n", filename, resfile->getName(i), cksumout, (uint64_t)resfile->Length(i));
}
}
}

8
source/common/scripting/core/symbols.h
View file

@ -54,7 +54,7 @@ class PSymbolType : public PSymbol
{
DECLARE_CLASS(PSymbolType, PSymbol);
public:
PType *Type;
PType *Type = nullptr;
PSymbolType(FName name, class PType *ty) : PSymbol(name), Type(ty) {}
PSymbolType() : PSymbol(NAME_None) {}
@ -66,7 +66,7 @@ class PSymbolTreeNode : public PSymbol
{
DECLARE_CLASS(PSymbolTreeNode, PSymbol);
public:
struct ZCC_TreeNode *Node;
struct ZCC_TreeNode *Node = nullptr;
PSymbolTreeNode(FName name, struct ZCC_TreeNode *node) : PSymbol(name), Node(node) {}
PSymbolTreeNode() : PSymbol(NAME_None) {}
@ -147,11 +147,11 @@ public:
void *Pad;
};
PSymbolConstNumeric(FName name, PType *type=NULL) : PSymbolConst(name, type) {}
PSymbolConstNumeric(FName name, PType *type=nullptr) : PSymbolConst(name, type), Float(0) {}
PSymbolConstNumeric(FName name, PType *type, int val) : PSymbolConst(name, type), Value(val) {}
PSymbolConstNumeric(FName name, PType *type, unsigned int val) : PSymbolConst(name, type), Value((int)val) {}
PSymbolConstNumeric(FName name, PType *type, double val) : PSymbolConst(name, type), Float(val) {}
PSymbolConstNumeric() {}
PSymbolConstNumeric() : Float(0) {}
};
// A constant string value --------------------------------------------------

4
source/common/textures/textures.h
View file

@ -181,7 +181,7 @@ struct FTextureBuffer
}
FTextureBuffer(const FTextureBuffer &other) = delete;
FTextureBuffer(FTextureBuffer &&other)
FTextureBuffer(FTextureBuffer &&other) noexcept
{
mBuffer = other.mBuffer;
mWidth = other.mWidth;
@ -190,7 +190,7 @@ struct FTextureBuffer
other.mBuffer = nullptr;
}
FTextureBuffer& operator=(FTextureBuffer &&other)
FTextureBuffer& operator=(FTextureBuffer &&other) noexcept
{
mBuffer = other.mBuffer;
mWidth = other.mWidth;

8
source/common/utility/tarray.h
View file

@ -234,7 +234,7 @@ public:
{
DoCopy (other);
}
TArray (TArray<T,TT> &&other)
TArray (TArray<T,TT> &&other) noexcept
{
Array = other.Array; other.Array = NULL;
Most = other.Most; other.Most = 0;
@ -256,7 +256,7 @@ public:
}
return *this;
}
TArray<T,TT> &operator= (TArray<T,TT> &&other)
TArray<T,TT> &operator= (TArray<T,TT> &&other) noexcept
{
if (Array)
{
@ -1777,14 +1777,14 @@ public:
return *this;
}
BitArray(BitArray && arr)
BitArray(BitArray && arr) noexcept
: bytes(std::move(arr.bytes))
{
size = arr.size;
arr.size = 0;
}
BitArray &operator=(BitArray && arr)
BitArray &operator=(BitArray && arr) noexcept
{
bytes = std::move(arr.bytes);
size = arr.size;

2
source/common/utility/zstring.h
View file

@ -125,7 +125,7 @@ public:
// Copy constructors
FString (const FString &other) { AttachToOther (other); }
FString (FString &&other) : Chars(other.Chars) { other.ResetToNull(); }
FString (FString &&other) noexcept : Chars(other.Chars) { other.ResetToNull(); }
FString (const char *copyStr);
FString (const char *copyStr, size_t copyLen);
FString (char oneChar);

4
source/core/initfs.cpp
View file

@ -449,8 +449,8 @@ void InitFileSystem(TArray<GrpEntry>& groups)
FILE* f = fopen("filesystem.dir", "wb");
for (int num = 0; num < fileSystem.GetNumEntries(); num++)
{
int64_t fd = fileSystem.FileLength(num);
fprintf(f, "%.50s %60s %ld\n", fileSystem.GetFileFullName(num), fileSystem.GetResourceFileFullName(fileSystem.GetFileContainer(num)), fd);
auto fd = fileSystem.FileLength(num);
fprintf(f, "%.50s %60s %td\n", fileSystem.GetFileFullName(num), fileSystem.GetResourceFileFullName(fileSystem.GetFileContainer(num)), fd);
}
fclose(f);
}