better safety for ai_select_secondary_weapon (#5151)

Baezon · web-flow · commit a5546a5dc7b1 · 2023-01-30T01:45:13.000-05:00
diff --git a/code/ai/aicode.cpp b/code/ai/aicode.cpp
@@ -6287,6 +6287,12 @@ void ai_select_secondary_weapon(object *objp, ship_weapon *swp, flagset<Weapon::
 		}
 	}
 
+	Assertion(swp->current_secondary_bank >= 0, "ai_select_secondary_weapon assigned a -1 secondary bank to %s", Ships[objp->instance].ship_name);
+	// if we got an invalid bank somehow, just put it back and bail
+	if (swp->current_secondary_bank < 0) {
+		swp->current_secondary_bank = initial_bank;
+		return;
+	}
 
 	//	If switched banks, force reacquisition of aspect lock.
 	if (swp->current_secondary_bank != initial_bank) {

Original file line number	Diff line number	Diff line change
`@@ -6287,6 +6287,12 @@ void ai_select_secondary_weapon(object objp, ship_weapon swp, flagset<Weapon::`
`6287`	`6287`	`}`
`6288`	`6288`	`}`
`6289`	`6289`
	`6290`	`+ Assertion(swp->current_secondary_bank >= 0, "ai_select_secondary_weapon assigned a -1 secondary bank to %s", Ships[objp->instance].ship_name);`
	`6291`	`+ // if we got an invalid bank somehow, just put it back and bail`
	`6292`	`+ if (swp->current_secondary_bank < 0) {`
	`6293`	`+ swp->current_secondary_bank = initial_bank;`
	`6294`	`+ return;`
	`6295`	`+ }`
`6290`	`6296`
`6291`	`6297`	`// If switched banks, force reacquisition of aspect lock.`
`6292`	`6298`	`if (swp->current_secondary_bank != initial_bank) {`