diff options
| author | robojumper <robojumper@gmail.com> | 2026-01-29 23:52:23 +0100 |
|---|---|---|
| committer | robojumper <robojumper@gmail.com> | 2026-01-30 00:05:51 +0100 |
| commit | 9a4a557a1add01e30d62a8906b90e4b4993e22fe (patch) | |
| tree | b54bd868c75330e5c1ac5667577207eefc59f038 /tools | |
| parent | 734ec3aef89402766b82c14f876cb5c3e0769ed4 (diff) | |
Fix some REL setup mistakes
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/custom/file_setup.py | 5 | ||||
| -rw-r--r-- | tools/custom/rel_setup.py | 5 |
2 files changed, 4 insertions, 6 deletions
diff --git a/tools/custom/file_setup.py b/tools/custom/file_setup.py index 9cd6acfe..00a8ab0e 100644 --- a/tools/custom/file_setup.py +++ b/tools/custom/file_setup.py @@ -521,7 +521,6 @@ def process_file(file_name, data_blocks: List[DataObj], fns: List[Function], sym includes = [include] if uses_state_system: includes.append("s/s_State.hpp") - includes.append("s/s_StateMgr.hpp") state_names = find_state_names(strings) # Since find_state_candidates uses ptmfs for state funcs, a hint may need to be applied. # This is done by finding the vtable, since most of the time (?) the funcs appear after the vtable. @@ -579,7 +578,7 @@ def process_file(file_name, data_blocks: List[DataObj], fns: List[Function], sym if has_inline_ctor: f.write(f"\t{name}()") if uses_state_system: - f.write(" : mStateMgr(*this, sStateID::null)") + f.write(" : mStateMgr(*this)") f.write(" {}\n") f.write(f"\tvirtual ~{name}() {{}}\n\n") else: @@ -612,7 +611,7 @@ def process_file(file_name, data_blocks: List[DataObj], fns: List[Function], sym if not has_inline_ctor: f.write(f"{name}::{name}()") if uses_state_system: - f.write(" : mStateMgr(*this, sStateID::null)") + f.write(" : mStateMgr(*this)") f.write(" {}\n") f.write(f"{name}::~{name}() {{}}\n\n") diff --git a/tools/custom/rel_setup.py b/tools/custom/rel_setup.py index 87c1b4bf..f3492b28 100644 --- a/tools/custom/rel_setup.py +++ b/tools/custom/rel_setup.py @@ -368,7 +368,6 @@ def process_file(file_name, data_blocks: List[DataObj], fns: List[Function]): includes = [include] if uses_state_system: includes.append("s/s_State.hpp") - includes.append("s/s_StateMgr.hpp") state_names = find_state_names(strings) state_candidates = find_state_candidates(data_blocks, len(state_names)) if state_candidates: @@ -414,7 +413,7 @@ def process_file(file_name, data_blocks: List[DataObj], fns: List[Function]): if has_inline_ctor: f.write(f"\t{name}()") if uses_state_system: - f.write(" : mStateMgr(*this, sStateID::null)") + f.write(" : mStateMgr(*this)") f.write(" {}\n") f.write(f"\tvirtual ~{name}() {{}}\n\n") else: @@ -447,7 +446,7 @@ def process_file(file_name, data_blocks: List[DataObj], fns: List[Function]): if not has_inline_ctor: f.write(f"{name}::{name}()") if uses_state_system: - f.write(" : mStateMgr(*this, sStateID::null)") + f.write(" : mStateMgr(*this)") f.write(" {}\n") f.write(f"{name}::~{name}() {{}}\n\n") |