Skip to content

Commit 679f7f2

Browse files
Switch the correct ammo variable.
The previous pr was supposed to fix what ammo capacity the ship was reloaded to, but instead it was changing how much ammo was in the magazine.
1 parent a939a73 commit 679f7f2

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

code/scripting/api/objs/ship_bank.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -216,15 +216,15 @@ ADE_VIRTVAR(WeaponClass, l_WeaponBank, "weaponclass", "Class of weapon mounted i
216216
if(ADE_SETTING_VAR && weaponclass > -1) {
217217
bh->sw->primary_bank_weapons[bh->bank] = weaponclass;
218218
if (Weapon_info[weaponclass].wi_flags[Weapon::Info_Flags::Ballistic]) {
219-
bh->sw->primary_bank_ammo[bh->bank] = (int)std::lround(bh->sw->primary_bank_capacity[bh->bank] / Weapon_info[weaponclass].cargo_size);
219+
bh->sw->primary_bank_start_ammo[bh->bank] = (int)std::lround(bh->sw->primary_bank_capacity[bh->bank] / Weapon_info[weaponclass].cargo_size);
220220
}
221221
}
222222

223223
return ade_set_args(L, "o", l_Weaponclass.Set(bh->sw->primary_bank_weapons[bh->bank]));
224224
case SWH_SECONDARY:
225225
if(ADE_SETTING_VAR && weaponclass > -1) {
226226
bh->sw->secondary_bank_weapons[bh->bank] = weaponclass;
227-
bh->sw->secondary_bank_ammo[bh->bank] = (int)std::lround(bh->sw->secondary_bank_capacity[bh->bank] / Weapon_info[weaponclass].cargo_size);
227+
bh->sw->secondary_bank_start_ammo[bh->bank] = (int)std::lround(bh->sw->secondary_bank_capacity[bh->bank] / Weapon_info[weaponclass].cargo_size);
228228
}
229229

230230
return ade_set_args(L, "o", l_Weaponclass.Set(bh->sw->secondary_bank_weapons[bh->bank]));

0 commit comments

Comments
 (0)