Index: code/ship/ship.cpp
===================================================================
--- code/ship/ship.cpp	(revision 9697)
+++ code/ship/ship.cpp	(working copy)
@@ -9342,6 +9342,11 @@
 			}
 		}
 	}
+
+	if (sip->uses_team_colors)
+	{
+		sp->team_name = sip->default_team_name;
+	}
 }
 
 #ifndef NDEBUG
@@ -15218,12 +15223,12 @@
 		weapon_info	*wip;
 		int bank=swp->current_secondary_bank;
 		if (swp->secondary_bank_weapons[bank] >= 0) {
-			wip = &Weapon_info[swp->secondary_bank_weapons[bank]];
-			if ( swp->secondary_bank_ammo[bank] > 0 ) {
-				srange = wip->max_speed * wip->lifetime;
-			}
+		wip = &Weapon_info[swp->secondary_bank_weapons[bank]];
+		if ( swp->secondary_bank_ammo[bank] > 0 ) {
+			srange = wip->max_speed * wip->lifetime;
 		}
 	}
+	}
 
 	return srange;
 }
@@ -15252,15 +15257,15 @@
 int get_max_ammo_count_for_bank(int ship_class, int bank, int ammo_type)
 {
 	float capacity, size;
-    
+
 	if (ship_class < 0 || bank < 0 || ammo_type < 0) {
 		return 0;
 	} else {
-		capacity = (float) Ship_info[ship_class].secondary_bank_ammo_capacity[bank];
-		size = (float) Weapon_info[ammo_type].cargo_size;
-		return (int) (capacity / size);
-	}
+	capacity = (float) Ship_info[ship_class].secondary_bank_ammo_capacity[bank];
+	size = (float) Weapon_info[ammo_type].cargo_size;
+	return (int) (capacity / size);
 }
+}
 
 /**
  * Page in bitmaps for all the ships in this level