Skip to content

Fix the bug where warhead flags are read twice #2128

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Coronia merged 6 commits into from
Mar 16, 2026
Merged

Fix the bug where warhead flags are read twice #2128

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
d2caba5
Initial
DeathFishAtEase Mar 4, 2026
f1f55fa
Revert "Initial"
DeathFishAtEase Mar 14, 2026
376cf61
Merge remote-tracking branch 'Phobos-developers/develop' into duplica…
DeathFishAtEase Mar 14, 2026
7208b22
Hook
DeathFishAtEase Mar 14, 2026
b37633f
Update YRpp
DeathFishAtEase Mar 14, 2026
aa8b816
update YRpp
Coronia Mar 16, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion YRpp
Open in desktop
Submodule YRpp updated 2 files
+11 −1 AITriggerTypeClass.h
+77 −74 RulesClass.h
12 changes: 12 additions & 0 deletions src/Ext/Rules/Body.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -860,5 +860,17 @@ DEFINE_HOOK(0x6744E4, RulesClass_ReadJumpjetControls_Extra, 0x7)
return 0;
}

DEFINE_JUMP(LJMP, 0x66919B, 0x6691B7) // Don't read warhead here!
DEFINE_JUMP(LJMP, 0x668EED, 0x668EF5) // Load types later
DEFINE_HOOK(0x668F6A, RulesClass_Read_File_LoadTypes, 0x5)
{
GET(RulesClass*, pRules, EDI);
GET(CCINIClass*, pINI, ESI);

pRules->LoadTypesFromINI(pINI);

return 0;
}

// skip vanilla JumpjetControls and make it earlier load
// DEFINE_JUMP(LJMP, 0x668EB5, 0x668EBD); // RulesClass_Process_SkipJumpjetControls // Really necessary? won't hurt to read again
Loading