Skip to content

ASD/ARC: Fix Error by One in gasCan Vector #472

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
rftrdev merged 3 commits into from
Aug 16, 2025
Merged

ASD/ARC: Fix Error by One in gasCan Vector #472

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ef3a7e4
ASD/ARC: Fix Error by One in gasCan Vector
BeatAroundTheBuscher Jul 29, 2025
4f9efbc
Add size check for the gasCan vector as part of ARC
BeatAroundTheBuscher Aug 15, 2025
6303509
Remove unused Vectors for ARC
BeatAroundTheBuscher Aug 15, 2025
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
34 changes: 4 additions & 30 deletions Strategic/Rebel Command.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,21 +129,10 @@ namespace ItemIdCache
{
// cache these values on load so that we don't need to search for them every time something happens
std::vector<UINT16> gasCans;
std::vector<UINT16> firstAidKits;
std::vector<UINT16> medKits;
std::vector<UINT16> toolKits;
std::vector<UINT16> ammo[10]; // coolness

void Clear()
{
gasCans.clear();
firstAidKits.clear();
medKits.clear();
toolKits.clear();
for (int i = 0; i < 10; ++i)
{
ammo[i].clear();
}
}
}

Expand Down Expand Up @@ -4418,23 +4407,6 @@ void SetupInfo()
for (UINT16 i = 0; i < MAXITEMS; ++i)
{
if (ItemIsGascan(i)) ItemIdCache::gasCans.push_back(i);
else if (ItemIsFirstAidKit(i)) ItemIdCache::firstAidKits.push_back(i);
else if (ItemIsMedicalKit(i)) ItemIdCache::medKits.push_back(i);
else if (ItemIsToolkit(i)) ItemIdCache::toolKits.push_back(i);
else if (Item[i].usItemClass & IC_AMMO)
{
if (Magazine[Item[i].ubClassIndex].ubMagType == AMMO_BOX)
{
if ((gGameOptions.fGunNut || !ItemIsOnlyInTonsOfGuns(i))
&& (gGameOptions.ubGameStyle == STYLE_SCIFI || !ItemIsOnlyInScifi(i)))
{
// coolness runs from 1-10, so apply offset
const UINT8 coolness = min(max(1, Item[i].ubCoolness), 10);
ItemIdCache::ammo[coolness-1].push_back(i);
}
}
}

}
}

Expand Down Expand Up @@ -4772,8 +4744,10 @@ void ApplyAdditionalASDEffects()
{
case MissionHelpers::DISRUPT_ASD_STEAL_FUEL:
{
// spawn a gas can
CreateItemAtAirport(ItemIdCache::gasCans.at(ItemIdCache::gasCans.size()), 75 + Random(26));
// only spawn a gas can if at least one gas can is known by the game (ItemIsGascan)
if (ItemIdCache::gasCans.size() > 0)
// The gas can is spawned like a Bobby Ray delivery (you need to open the crate)
CreateItemAtAirport(ItemIdCache::gasCans.at(ItemIdCache::gasCans.size() -1), 75 + Random(26));

// say it came from the ASD's reserves
AddStrategicAIResources(ASD_FUEL, -(gGameExternalOptions.gASDResource_Fuel_Jeep + Random(gGameExternalOptions.gASDResource_Fuel_Jeep)));
Expand Down