Added a selection menu for the next spawn loadout

Sources/Client/Client.cpp

@@ -500,6 +500,9 @@ namespace spades {
 			if (team == 2)
 				team = 255;
 
+			// Reset next loadout since you manually spawn
+			this->hasNextSpawnConfig = false;
+
 			if (!world->GetLocalPlayer() || world->GetLocalPlayer()->GetTeamId() >= 2) {
 				// join
 				if (team == 255) {
@@ -520,15 +523,29 @@ namespace spades {
 		}
 
 		void Client::NextSpawnPressed() {
-			WeaponType weap = limbo->GetSelectedWeapon();
-			int team = limbo->GetSelectedTeam();
+			WeaponType selectedWeapon = limbo->GetSelectedWeapon();
+			if (!selectedWeapon)
+				selectedWeapon = RIFLE_WEAPON;
+
+			int selectedTeam = limbo->GetSelectedTeam();
 			inGameLimbo = false;
-			if (team == 2)
-				team = 255;
+			if (selectedTeam == 2)
+				selectedTeam = 255;
 
 			this->hasNextSpawnConfig = true;
-			this->nextTeam = team;
-			this->nextWeapon = weap;
+			nextSpawnConfig = SpawnConfig {selectedTeam, selectedWeapon};
+
+			std::string teamName = world ? world->GetTeam(selectedTeam).name
+			                             : "Team " + std::to_string(selectedTeam + 1);
+			std::string prefixedWeaponName;
+			switch (selectedWeapon) {
+				case RIFLE_WEAPON: prefixedWeaponName = "a Rifle"; break;
+				case SMG_WEAPON: prefixedWeaponName = "an SMG"; break;
+				case SHOTGUN_WEAPON: prefixedWeaponName = "a Shotgun"; break;
+			};
+
+			ShowAlert(_Tr("Client", "You will join {0} with {1} on your next spawn.", teamName, prefixedWeaponName),
+			          AlertType::Notice);
 		}
 
 		void Client::ShowAlert(const std::string &contents, AlertType type) {

Sources/Client/Client.h

@@ -286,9 +286,16 @@ namespace spades {
 
 			bool inGameLimbo;
 
-			bool hasNextSpawnConfig;
-			int nextTeam;
-			WeaponType nextWeapon;
+			/*
+				hasNextSpawnConfig: Boolean indicating if the Client will spawn with a new configuration (loadout) on next spawn. Gets cleared on spawn.
+				nextSpawnConfig: Indicates values for next spawn. These are only read when hasNextSpawnConfig is true
+			*/
+			bool hasNextSpawnConfig = false;
+			struct SpawnConfig {
+				int team;
+				WeaponType weapon;
+			};
+			stmp::optional<SpawnConfig> nextSpawnConfig;
 
 			float GetLocalFireVibration();
 			void CaptureColor();

Sources/Client/Client_Update.cpp

@@ -518,12 +518,11 @@ namespace spades {
 			if (player->IsAlive())
 				lastAliveTime = time;
 			else if (hasNextSpawnConfig) {
-				Player *p = world->GetLocalPlayer();
-				if (p->GetTeamId() != nextTeam) {
-					net->SendTeamChange(nextTeam);
+				if (player->GetTeamId() != (*nextSpawnConfig).team) {
+					net->SendTeamChange((*nextSpawnConfig).team);
 				}
-				if (nextTeam != 2 && p->GetWeapon()->GetWeaponType() != nextWeapon) {
-					net->SendWeaponChange(nextWeapon);
+				if ((*nextSpawnConfig).team < 2 && player->GetWeapon()->GetWeaponType() != (*nextSpawnConfig).weapon) {
+					net->SendWeaponChange((*nextSpawnConfig).weapon);
 				}
 				hasNextSpawnConfig = false;
 			}

Sources/Client/LimboView.cpp

@@ -164,7 +164,7 @@ namespace spades {
 						}
 						break;
 					case MenuNextSpawn:
-						if (client && client->GetWorld() && client->world->GetLocalPlayer() && client->world->GetLocalPlayer()->IsAlive() && client->world->GetLocalPlayer()->GetTeamId() >= 2)
+						if (client->GetWorld() && !(client->world->GetLocalPlayer() && !client->world->GetLocalPlayer()->IsSpectator()))
 							item.visible = false;
 						break;
 					default:;