diff options
| author | Anghelo Carvajal <angheloalf95@gmail.com> | 2021-04-15 07:49:28 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-04-15 07:49:28 -0400 |
| commit | 179af7d11fd27b046edfb1bbadade865033583d7 (patch) | |
| tree | 316a55e5c0857e26184d6758a324483e029e8849 /ZAPD/Globals.h | |
| parent | 96ffc1e62720f0f43eb4885e6e7dbaf76a2f6cd2 (diff) | |
Rename "Prerender" to "Background", properly extract PolygonType1 multi format and change some structs used. (#107)
* Extract BgImage
Signed-off-by: angie <angheloalf95@gmail.com>
* improve the output a bit
Signed-off-by: angie <angheloalf95@gmail.com>
* extract backgrounds for multipoly
Signed-off-by: angie <angheloalf95@gmail.com>
* Extract the dlists of PolygonDlist
Signed-off-by: angie <angheloalf95@gmail.com>
* commands in the next line
Signed-off-by: angie <angheloalf95@gmail.com>
* Move a lot of repeated code into a class
Signed-off-by: angie <angheloalf95@gmail.com>
* Use PolygonDlist instead of MeshEntry0
Signed-off-by: angie <angheloalf95@gmail.com>
* Rename prerender to background
Signed-off-by: angie <angheloalf95@gmail.com>
* format
Signed-off-by: angie <angheloalf95@gmail.com>
* last cleanup
Signed-off-by: angie <angheloalf95@gmail.com>
* Handle jpg padding
Signed-off-by: angie <angheloalf95@gmail.com>
* Add a few checks and warnings for jpeg validity
Signed-off-by: Angie <angheloalf95@gmail.com>
* typo
Signed-off-by: Angie <angheloalf95@gmail.com>
* fix merge error
Signed-off-by: angie <angheloalf95@gmail.com>
* Fix background extraction that somehow was broken
Signed-off-by: angie <angheloalf95@gmail.com>
* re-add the trailling line feed
Signed-off-by: angie <angheloalf95@gmail.com>
* add trailing line feed again
Signed-off-by: angie <angheloalf95@gmail.com>
* fix an already fixed warning
Signed-off-by: angie <angheloalf95@gmail.com>
* fix crash when no config file is provided
* run format
Diffstat (limited to 'ZAPD/Globals.h')
| -rw-r--r-- | ZAPD/Globals.h | 30 |
1 files changed, 13 insertions, 17 deletions
diff --git a/ZAPD/Globals.h b/ZAPD/Globals.h index c7a30b5..ab52d75 100644 --- a/ZAPD/Globals.h +++ b/ZAPD/Globals.h @@ -14,7 +14,18 @@ enum VerbosityLevel VERBOSITY_DEBUG }; -class GameConfig; +class GameConfig +{ +public: + std::map<int, std::string> segmentRefs; + std::map<int, ZFile*> segmentRefFiles; + std::map<uint32_t, std::string> symbolMap; + std::vector<std::string> actorList; + std::vector<std::string> objectList; + std::map<uint32_t, std::string> texturePool; // Key = CRC, Value = Path to Shared Texture + + GameConfig() = default; +}; class Globals { @@ -32,7 +43,7 @@ public: std::string baseRomPath, inputPath, outputPath, sourceOutputPath, cfgPath; TextureType texType; ZGame game; - GameConfig* cfg; + GameConfig cfg; std::vector<ZFile*> files; std::vector<int> segments; @@ -50,21 +61,6 @@ public: bool HasSegment(int segment); }; -class GameConfig -{ -public: - std::map<int, std::string> segmentRefs; - std::map<int, ZFile*> segmentRefFiles; - std::map<uint32_t, std::string> symbolMap; - std::vector<std::string> actorList; - std::vector<std::string> objectList; - std::map<uint32_t, std::string> texturePool; // Key = CRC, Value = Path to Shared Texture - - GameConfig(); - -private: -}; - /* * Note: In being able to track references across files, there are a few major files that make use * of segments... |