policeweapon check addition and more removal

Tomasak · May 5, 2024 · ece5648 · ece5648
1 parent debb23a
commit ece5648
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/data/plugins/GTAIV.EFLC.FusionFix.ini b/data/plugins/GTAIV.EFLC.FusionFix.ini
@@ -37,7 +37,7 @@ EpisodicWeapons = 0                           // Support for DSR1, Pipe bomb, St
 ExplosiveAnnihilator = 0                      // Enables explosive rounds on Annihilator, requires episodic weapons
 OtherEpisodicChecks = 0                       // Disco camera bobbing, Cell Phone switching, Altimeter in helicopters and parachute
 TBoGTHelicopterHeightLimit = 0                // Raises height limit for helicopters to TBoGT level
-TBoGTWeaponRandomization = 0                  // Allows for cops to use TBoGT weapons, forces SWAT to appear in police helis. Requires ep weapons
+TBoGTPoliceWeapons = 0                        // Gives P90 and AA12 to SWAT and FIB and M249 to police in helicopters. Requires ep weapons
 RemoveSCOSignatureCheck = 0                   // Allows using any episodic SCO on all episodes
 EpisodicCheats = 0
 

diff --git a/source/episodiccontent.ixx b/source/episodiccontent.ixx
@@ -20,7 +20,7 @@ public:
             bool bEpisodicWeapons = iniReader.ReadInteger("EPISODICCONTENT", "EpisodicWeapons", 0) != 0;
             bool bExplosiveAnnihilator = iniReader.ReadInteger("EPISODICCONTENT", "ExplosiveAnnihilator", 0) != 0;
             bool bTBoGTHelicopterHeightLimit = iniReader.ReadInteger("EPISODICCONTENT", "TBoGTHelicopterHeightLimit", 0) != 0;
-            bool bTBoGTWeaponRandomization = iniReader.ReadInteger("EPISODICCONTENT", "TBoGTWeaponRandomization", 0) != 0;
+            bool bTBoGTPoliceWeapons = iniReader.ReadInteger("EPISODICCONTENT", "TBoGTPoliceWeapons", 0) != 0;
             bool bRemoveSCOSignatureCheck = iniReader.ReadInteger("EPISODICCONTENT", "RemoveSCOSignatureCheck", 0) != 0;
             bool bEpisodicCheats = iniReader.ReadInteger("EPISODICCONTENT", "EpisodicCheats", 0) != 0;
             bool bOtherEpisodicChecks = iniReader.ReadInteger("EPISODICCONTENT", "OtherEpisodicChecks", 0) != 0;
@@ -152,15 +152,15 @@ public:
                     injector::MakeNOP(pattern.get_first(7), 2, true);
             }
 
-            if (bTBoGTWeaponRandomization)
+            if (bTBoGTPoliceWeapons)
             {
                 auto pattern = hook::pattern("83 3D ? ? ? ? ? 75 3D E8"); // P90s and assault shotguns for cops
                 if (!pattern.empty())
                     injector::MakeNOP(pattern.get_first(7), 2, true);
 
-                pattern = hook::pattern("83 3D ? ? ? ? ? 7C 0A 83 7F 0C 1E"); // swat in police helis
+                pattern = hook::pattern("83 3D ? ? ? ? ? 6A 00 6A 00 6A 01"); // m249 for swat in annihilators and helicopters
                 if (!pattern.empty())
-                    injector::MakeNOP(pattern.get_first(7), 2, true);
+                    injector::MakeNOP(pattern.get_first(24), 2, true);
             }
 
             if (bRemoveSCOSignatureCheck)