make zapd addresses globals int64_t so they can store uint32_t addres…

…ses and -1
NEstelami · Jun 21, 2024 · 175a31f · 175a31f
1 parent afce9b2
commit 175a31f
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 6 deletions.
diff --git a/ZAPD/Globals.h b/ZAPD/Globals.h
@@ -41,9 +41,9 @@ class Globals
 	fs::path baseRomPath, inputPath, outputPath, sourceOutputPath, cfgPath;
 	TextureType texType;
 	CsFloatType floatType = CsFloatType::FloatOnly;
-	int baseAddress = -1;
-	int startOffset = -1;
-	int endOffset = -1;
+	int64_t baseAddress = -1;
+	int64_t startOffset = -1;
+	int64_t endOffset = -1;
 	ZGame game;
 	GameConfig cfg;
 	bool verboseUnaccounted = false;

diff --git a/ZAPD/Main.cpp b/ZAPD/Main.cpp
@@ -435,19 +435,25 @@ void Arg_CsFloatMode([[maybe_unused]] int& i, [[maybe_unused]] char* argv[])
 	}
 }
 
+uint32_t parse_u32_hex(char* str)
+{
+	static_assert(sizeof(uint32_t) <= sizeof(unsigned long));
+	return (uint32_t)std::stoul(str, nullptr, 16);
+}
+
 void Arg_BaseAddress(int& i, char* argv[])
 {
-	Globals::Instance->baseAddress = std::stoul(argv[++i], nullptr, 16);
+	Globals::Instance->baseAddress = parse_u32_hex(argv[++i]);
 }
 
 void Arg_StartOffset(int& i, char* argv[])
 {
-	Globals::Instance->startOffset = std::stoul(argv[++i], nullptr, 16);
+	Globals::Instance->startOffset = parse_u32_hex(argv[++i]);
 }
 
 void Arg_EndOffset(int& i, char* argv[])
 {
-	Globals::Instance->endOffset = std::stoul(argv[++i], nullptr, 16);
+	Globals::Instance->endOffset = parse_u32_hex(argv[++i]);
 }
 
 int HandleExtract(ZFileMode fileMode, ExporterSet* exporterSet)