Skip to content

Commit 00c8b0f

Browse files
authored
Merge pull request scp-fs2open#7583 from Goober5000/fix/lua_secondary_bank_fields
fix Lua weapon bank setter writing primary fields for secondary banks
2 parents 11debd5 + da7e5b5 commit 00c8b0f

1 file changed

Lines changed: 6 additions & 5 deletions

File tree

code/scripting/api/objs/ship_bank.cpp

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -55,11 +55,12 @@ ADE_INDEXER(l_WeaponBankType, "number Index", "Array of weapon banks", "weaponba
5555
idx--; //Lua->FS2
5656

5757
if(ADE_SETTING_VAR && newbank && newbank->isValid()) {
58-
sb->sw->primary_bank_weapons[idx] = newbank->typeh.sw->primary_bank_weapons[idx];
59-
sb->sw->next_primary_fire_stamp[idx] = timestamp(0);
60-
sb->sw->primary_bank_ammo[idx] = newbank->typeh.sw->primary_bank_ammo[idx];
61-
sb->sw->primary_bank_start_ammo[idx] = newbank->typeh.sw->primary_bank_start_ammo[idx];
62-
sb->sw->primary_bank_capacity[idx] = newbank->typeh.sw->primary_bank_capacity[idx];
58+
sb->sw->secondary_bank_weapons[idx] = newbank->typeh.sw->secondary_bank_weapons[idx];
59+
sb->sw->next_secondary_fire_stamp[idx] = timestamp(0);
60+
sb->sw->secondary_bank_ammo[idx] = newbank->typeh.sw->secondary_bank_ammo[idx];
61+
sb->sw->secondary_bank_start_ammo[idx] = newbank->typeh.sw->secondary_bank_start_ammo[idx];
62+
sb->sw->secondary_bank_capacity[idx] = newbank->typeh.sw->secondary_bank_capacity[idx];
63+
sb->sw->secondary_bank_rearm_time[idx] = timestamp(0);
6364
}
6465
break;
6566
case SWH_TERTIARY:

0 commit comments

Comments
 (0)