From 5c641bcc04162512c2efdaa1e30cac1cc5d6f9ee Mon Sep 17 00:00:00 2001 From: lzwdgc Date: Sat, 3 Feb 2024 05:51:36 +0300 Subject: [PATCH] Misc. --- src/common/types.h | 11 +++++++++++ src/script2txt2/script2txt2.cpp | 12 ++---------- 2 files changed, 13 insertions(+), 10 deletions(-) diff --git a/src/common/types.h b/src/common/types.h index 5bd57e1..2a93aff 100644 --- a/src/common/types.h +++ b/src/common/types.h @@ -349,3 +349,14 @@ struct pak { uint32_t unk1; }; #pragma pack(pop) + +#pragma pack(push, 1) +struct script { + static constexpr uint32_t default_block_size = 16000; + + uint32_t file_size; + uint32_t unk0{default_block_size}; // stack size? always 16000? // section bits? + uint32_t raw_text_size; + uint32_t nlines; +}; +#pragma pack(pop) diff --git a/src/script2txt2/script2txt2.cpp b/src/script2txt2/script2txt2.cpp index 7512f81..d6c2eb4 100644 --- a/src/script2txt2/script2txt2.cpp +++ b/src/script2txt2/script2txt2.cpp @@ -17,6 +17,7 @@ */ #include +#include #include #include @@ -24,15 +25,6 @@ #include -#pragma pack(push, 1) -struct script { - uint32_t file_size; - uint32_t unk0; // stack size? always 16000? // section bits? - uint32_t raw_text_size; - uint32_t nlines; -}; -#pragma pack(pop) - int main(int argc, char *argv[]) { cl::opt p(cl::Positional, cl::desc(""), cl::Required); @@ -52,7 +44,7 @@ int main(int argc, char *argv[]) { { filename += ".txt"; if (std::ofstream ofile(filename); ofile) { - std::string indent, space = " "s; + std::string indent, space = " "s; auto inc = [&]() { indent += space; };