diff --git a/YRpp b/YRpp index 6aa702acd4..00d2b12069 160000 --- a/YRpp +++ b/YRpp @@ -1 +1 @@ -Subproject commit 6aa702acd40d9b166644e4e0b6a3b510130493fc +Subproject commit 00d2b12069dacf5bafe39a56c8f19ccad755bf46 diff --git a/src/Ext/Rules/Body.cpp b/src/Ext/Rules/Body.cpp index 228b0415ca..6850ce6ee1 100644 --- a/src/Ext/Rules/Body.cpp +++ b/src/Ext/Rules/Body.cpp @@ -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