Merge pull request #3159 from Baezon/previous-bank-fix

asarium · web-flow · commit 373dbeb63f69 · 2021-01-21T22:06:30.000+01:00
Fix a bug with previous_bank and ship class swapping
diff --git a/code/ship/ship.cpp b/code/ship/ship.cpp
@@ -10657,10 +10657,12 @@ void change_ship_type(int n, int ship_type, int by_sexp)
 	if ( by_sexp ) {
 		if (sip_orig->num_primary_banks > sip->num_primary_banks) {
 			sp->weapons.current_primary_bank = 0;
+			sp->weapons.previous_primary_bank = 0;
 		}
 
 		if (sip_orig->num_secondary_banks > sip->num_secondary_banks) {
 			sp->weapons.current_secondary_bank = 0;
+			sp->weapons.previous_secondary_bank = 0;
 		}
 
 		// While we're at it, let's copy over the ETS settings too

Original file line number	Diff line number	Diff line change
`@@ -10657,10 +10657,12 @@ void change_ship_type(int n, int ship_type, int by_sexp)`
`10657`	`10657`	`if ( by_sexp ) {`
`10658`	`10658`	`if (sip_orig->num_primary_banks > sip->num_primary_banks) {`
`10659`	`10659`	`sp->weapons.current_primary_bank = 0;`
	`10660`	`+ sp->weapons.previous_primary_bank = 0;`
`10660`	`10661`	`}`
`10661`	`10662`
`10662`	`10663`	`if (sip_orig->num_secondary_banks > sip->num_secondary_banks) {`
`10663`	`10664`	`sp->weapons.current_secondary_bank = 0;`
	`10665`	`+ sp->weapons.previous_secondary_bank = 0;`
`10664`	`10666`	`}`
`10665`	`10667`
`10666`	`10668`	`// While we're at it, let's copy over the ETS settings too`