From 6d27dbaab3b32ccebb076895fac3cc6aa3240d6c Mon Sep 17 00:00:00 2001 From: louist103 <35883445+louist103@users.noreply.github.com> Date: Sat, 24 Apr 2021 16:42:52 -0400 Subject: Fix most -Wall warnings (#115) * started on basic type errors * Done. For now * remove libgfxd binary * Most warnings fixed * Fix conflicts and new warnings * Makefile * Sig * Clang format * destructor * Add a bunch of destructors * clear the scalars vector after freeing the elements * PR fixes (Anghelo Alf) * Fix most clang -Wall warnings --- ZAPD/ZDisplayList.h | 65 +++++++++++++++++++++++++++-------------------------- 1 file changed, 33 insertions(+), 32 deletions(-) (limited to 'ZAPD/ZDisplayList.h') diff --git a/ZAPD/ZDisplayList.h b/ZAPD/ZDisplayList.h index 89f35e6..6d401cd 100644 --- a/ZAPD/ZDisplayList.h +++ b/ZAPD/ZDisplayList.h @@ -293,7 +293,7 @@ public: Vertex(); Vertex(int16_t nX, int16_t nY, int16_t nZ, uint16_t nFlag, int16_t nS, int16_t nT, uint8_t nR, uint8_t nG, uint8_t nB, uint8_t nA); - Vertex(std::vector rawData, int rawDataIndex); + Vertex(std::vector rawData, uint32_t rawDataIndex); }; class ZDisplayList : public ZResource @@ -302,38 +302,38 @@ protected: static TextureType TexFormatToTexType(F3DZEXTexFormats fmt, F3DZEXTexSizes siz); void ParseRawData() override; - void ParseF3DZEX(F3DZEXOpcode opcode, uint64_t data, int i, std::string prefix, char* line); - void ParseF3DEX(F3DEXOpcode opcode, uint64_t data, int i, std::string prefix, char* line); + void ParseF3DZEX(F3DZEXOpcode opcode, uint64_t data, int32_t i, std::string prefix, char* line); + void ParseF3DEX(F3DEXOpcode opcode, uint64_t data, std::string prefix, char* line); // Various Instruction Optimizations - bool SequenceCheck(std::vector sequence, int startIndex); - int OptimizationChecks(int startIndex, std::string& output, std::string prefix); - int OptimizationCheck_LoadTextureBlock(int startIndex, std::string& output, std::string prefix); - // int OptimizationCheck_LoadMultiBlock(int startIndex, std::string& output, std::string + bool SequenceCheck(std::vector sequence, int32_t startIndex); + int32_t OptimizationChecks(int32_t startIndex, std::string& output, std::string prefix); + int32_t OptimizationCheck_LoadTextureBlock(int32_t startIndex, std::string& output, std::string prefix); + // int32_t OptimizationCheck_LoadMultiBlock(int32_t startIndex, std::string& output, std::string // prefix); // F3DEX Specific Opcode Values - void Opcode_F3DEX_G_SETOTHERMODE_L(uint64_t data, int i, std::string prefix, char* line); + void Opcode_F3DEX_G_SETOTHERMODE_L(uint64_t data, char* line); // Shared Opcodes between F3DZEX and F3DEX - void Opcode_G_DL(uint64_t data, int i, std::string prefix, char* line); - void Opcode_G_MODIFYVTX(uint64_t data, int i, std::string prefix, char* line); - void Opcode_G_CULLDL(uint64_t data, int i, std::string prefix, char* line); - void Opcode_G_TRI1(uint64_t data, int i, std::string prefix, char* line); - void Opcode_G_TRI2(uint64_t data, int i, std::string prefix, char* line); - void Opcode_G_MTX(uint64_t data, int i, std::string prefix, char* line); - void Opcode_G_VTX(uint64_t data, int i, std::string prefix, char* line); - void Opcode_G_TEXTURE(uint64_t data, int i, std::string prefix, char* line); - void Opcode_G_SETTIMG(uint64_t data, int i, std::string prefix, char* line); - void Opcode_G_SETTILE(uint64_t data, int i, std::string prefix, char* line); - void Opcode_G_SETTILESIZE(uint64_t data, int i, std::string prefix, char* line); - void Opcode_G_LOADBLOCK(uint64_t data, int i, std::string prefix, char* line); - void Opcode_G_SETCOMBINE(uint64_t data, int i, std::string prefix, char* line); - void Opcode_G_SETPRIMCOLOR(uint64_t data, int i, std::string prefix, char* line); - void Opcode_G_SETOTHERMODE_L(uint64_t data, int i, std::string prefix, char* line); - void Opcode_G_SETOTHERMODE_H(uint64_t data, int i, std::string prefix, char* line); - void Opcode_G_LOADTLUT(uint64_t data, int i, std::string prefix, char* line); - void Opcode_G_ENDDL(uint64_t data, int i, std::string prefix, char* line); + void Opcode_G_DL(uint64_t data, std::string prefix, char* line); + void Opcode_G_MODIFYVTX(uint64_t data, char* line); + void Opcode_G_CULLDL(uint64_t data, char* line); + void Opcode_G_TRI1(uint64_t data, char* line); + void Opcode_G_TRI2(uint64_t data, char* line); + void Opcode_G_MTX(uint64_t data, char* line); + void Opcode_G_VTX(uint64_t data, char* line); + void Opcode_G_TEXTURE(uint64_t data, char* line); + void Opcode_G_SETTIMG(uint64_t data, std::string prefix, char* line); + void Opcode_G_SETTILE(uint64_t data, char* line); + void Opcode_G_SETTILESIZE(uint64_t data, std::string prefix, char* line); + void Opcode_G_LOADBLOCK(uint64_t data, char* line); + void Opcode_G_SETCOMBINE(uint64_t data, char* line); + void Opcode_G_SETPRIMCOLOR(uint64_t data, char* line); + void Opcode_G_SETOTHERMODE_L(uint64_t data, char* line); + void Opcode_G_SETOTHERMODE_H(uint64_t data, char* line); + void Opcode_G_LOADTLUT(uint64_t data, std::string prefix, char* line); + void Opcode_G_ENDDL(std::string prefix, char* line); public: std::string sceneSegName; @@ -349,7 +349,7 @@ public: DListType dListType; - // int dListAddress; + // int32_t dListAddress; std::map> vertices; std::map vtxDeclarations; @@ -365,11 +365,12 @@ public: std::vector mtxList; ZDisplayList(ZFile* nParent); - ZDisplayList(std::vector nRawData, int rawDataIndex, int rawDataSize, ZFile* nParent); + ZDisplayList(std::vector nRawData, uint32_t rawDataIndex, int32_t rawDataSize, ZFile* nParent); + ~ZDisplayList(); static ZDisplayList* Instance; void ExtractFromXML(tinyxml2::XMLElement* reader, const std::vector& nRawData, - const int nRawDataIndex, const std::string& nRelPath) override; + const uint32_t nRawDataIndex, const std::string& nRelPath) override; // static ZDisplayList* BuildFromXML(tinyxml2::XMLElement* reader, std::string inFolder, bool // readFile, ZFile* nParent); @@ -380,10 +381,10 @@ public: int32_t texHeight, uint32_t texAddr, uint32_t texSeg, F3DZEXTexFormats texFmt, F3DZEXTexSizes texSiz, bool texLoaded, bool texIsPalette); - static int GetDListLength(std::vector rawData, int rawDataIndex, DListType dListType); + static int32_t GetDListLength(std::vector rawData, uint32_t rawDataIndex, DListType dListType); std::vector GetRawData() override; - int GetRawDataSize() override; + size_t GetRawDataSize() override; std::string GetSourceOutputHeader(const std::string& prefix) override; std::string GetSourceOutputCode(const std::string& prefix) override; std::string ProcessLegacy(const std::string& prefix); @@ -392,7 +393,7 @@ public: void Save(const std::string& outFolder) override; virtual void GenerateHLIntermediette(HLFileIntermediette& hlFile) override; bool IsExternalResource() override; - virtual std::string GetExternalExtension(); + virtual std::string GetExternalExtension() override; std::string GetSourceTypeName() override; ZResourceType GetResourceType() override; -- cgit v1.2.3