diff options
| author | Nicholas Estelami <NEstelami@users.noreply.github.com> | 2021-01-08 17:38:31 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-01-08 17:38:31 -0500 |
| commit | fd4d53a2684871a1ac28668515d025470a45ef7f (patch) | |
| tree | 47ebf84c86c4f1b943b95029debf1d13759f456e /ZAPD/ZDisplayList.h | |
| parent | 1bacd7fdc964ad9eec9d8b56373eb10e10723d2f (diff) | |
Fixed bug with declarations at 0x0000, and fixed improperly sized palettes. (#65)
* Fixed bug with extraction of ci4 textures
* Made a bunch of declarations static
* Removed manual writes to declarations dictionary from external classes.
* Added a bunch of deconstructors, freed a bunch of stuff
* Fixed bug with declarations at 0x0000, and fixed issue with palette sizing.
* Fixed VS Lib and Include Dirs
Diffstat (limited to 'ZAPD/ZDisplayList.h')
| -rw-r--r-- | ZAPD/ZDisplayList.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/ZAPD/ZDisplayList.h b/ZAPD/ZDisplayList.h index 7954eb7..cb8a75f 100644 --- a/ZAPD/ZDisplayList.h +++ b/ZAPD/ZDisplayList.h @@ -219,6 +219,7 @@ protected: F3DZEXTexFormats lastTexFmt; F3DZEXTexSizes lastTexSiz, lastTexSizTest, lastCISiz; bool lastTexLoaded; + bool lastTexIsPalette; //void ParseXML(tinyxml2::XMLElement* reader); static TextureType TexFormatToTexType(F3DZEXTexFormats fmt, F3DZEXTexSizes siz); @@ -253,7 +254,7 @@ public: static ZDisplayList* BuildFromXML(tinyxml2::XMLElement* reader, std::string inFolder, bool readFile); void TextureGenCheck(std::string prefix); - static bool TextureGenCheck(std::vector<uint8_t> fileData, std::map<uint32_t, ZTexture*>& textures, ZRoom* scene, ZFile* parent, std::string prefix, uint32_t texWidth, uint32_t texHeight, uint32_t texAddr, uint32_t texSeg, F3DZEXTexFormats texFmt, F3DZEXTexSizes texSiz, bool texLoaded); + static bool TextureGenCheck(std::vector<uint8_t> fileData, std::map<uint32_t, ZTexture*>& textures, ZRoom* scene, ZFile* parent, std::string prefix, uint32_t texWidth, uint32_t texHeight, uint32_t texAddr, uint32_t texSeg, F3DZEXTexFormats texFmt, F3DZEXTexSizes texSiz, bool texLoaded, bool texIsPalette); static int GetDListLength(std::vector<uint8_t> rawData, int rawDataIndex); std::vector<uint8_t> GetRawData(); |