bugfix

xensik · Nov 13, 2024 · d5bed62 · d5bed62
1 parent 3a06635
commit d5bed62
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/src/gsc/disassembler.cpp b/src/gsc/disassembler.cpp
@@ -371,7 +371,7 @@ auto disassembler::disassemble_call_far(instruction& inst, bool thread) -> void
 
 auto disassembler::disassemble_call_far2(instruction& inst, bool thread) -> void
 {
-    auto offs = script_.read<u32>();
+    auto offs = script_.read<i32>();
     auto file = stack_.read<u64>();
     auto name = stack_.read<u64>();
 
@@ -577,7 +577,7 @@ auto disassembler::resolve_functions() -> void
 
 auto disassembler::resolve_function(std::string const& index) -> std::string
 {
-    auto addr = std::stoul(index);
+    auto addr = static_cast<usize>(std::stoul(index));
 
     for (auto const& func : assembly_->functions)
     {

diff --git a/src/gsc/engine/s2.cpp b/src/gsc/engine/s2.cpp
@@ -13,7 +13,7 @@ extern std::array<std::pair<u16, char const*>, func_count> const func_list;
 extern std::array<std::pair<u16, char const*>, meth_count> const meth_list;
 extern std::array<std::pair<u32, char const*>, token_count> const token_list;
 
-context::context() : gsc::context(props::str4 | props::tok4 | props::waitframe | props::boolnotand | props::offs8,
+context::context() : gsc::context(props::str4 | props::waitframe | props::boolnotand | props::offs8,
     engine::s2, endian::little, system::pc, max_string_id)
 {
     code_map_.reserve(code_list.size());