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) {
@@ -519,6 +522,32 @@ namespace spades {
  }
  }
 
+ void Client::NextSpawnPressed() {
+ WeaponType selectedWeapon = limbo->GetSelectedWeapon();
+ if (!selectedWeapon)
+ selectedWeapon = RIFLE_WEAPON;
+
+ int selectedTeam = limbo->GetSelectedTeam();
+ inGameLimbo = false;
+ if (selectedTeam == 2)
+ selectedTeam = 255;
+
+ this->hasNextSpawnConfig = true;
+ 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) {
  float timeout;
  switch (type) {

Sources/Client/Client.h

@@ -286,10 +286,22 @@ namespace spades {
 
  bool inGameLimbo;
 
+ /*
+ 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();
  bool IsLimboViewActive();
  void SpawnPressed();
+ void NextSpawnPressed();
 
  Player *HotTrackedPlayer(hitTag_t *hitFlag);
 

Sources/Client/Client_Update.cpp

@@ -517,6 +517,15 @@ namespace spades {
 
  if (player->IsAlive())
  lastAliveTime = time;
+ else if (hasNextSpawnConfig) {
+ if (player->GetTeamId() != (*nextSpawnConfig).team) {
+ net->SendTeamChange((*nextSpawnConfig).team);
+ }
+ if ((*nextSpawnConfig).team < 2 && player->GetWeapon()->GetWeaponType() != (*nextSpawnConfig).weapon) {
+ net->SendWeaponChange((*nextSpawnConfig).weapon);
+ }
+ hasNextSpawnConfig = false;
+ }
 
  if (player->GetHealth() < lastHealth) {
  // ouch!

Sources/Client/LimboView.cpp

@@ -75,9 +75,14 @@ namespace spades {
 
  //! The "Spawn" button that you press when you're ready to "spawn".
  items.push_back(MenuItem(MenuSpawn,
- AABB2(left + contentsWidth - 266.f, firstY + 4.f, 256.f, 64.f),
+ AABB2(left + contentsWidth - 266.f, firstY, 256.f, 48.f),
  _Tr("Client", "Spawn")));
 
+ //! The next spawn button to activate the settings the next time you spawn
+ items.push_back(MenuItem(MenuNextSpawn,
+ AABB2(left + contentsWidth - 266.f, firstY + 52.f, 256.f, 48.f),
+ _Tr("Client", "Set For Next Spawn")));
+
  cursorPos = MakeVector2(renderer->ScreenWidth() * .5f, renderer->ScreenHeight() * .5f);
 
  selectedTeam = 2;
@@ -116,6 +121,7 @@ namespace spades {
  case MenuWeaponSMG: selectedWeapon = SMG_WEAPON; break;
  case MenuWeaponShotgun: selectedWeapon = SHOTGUN_WEAPON; break;
  case MenuSpawn: client->SpawnPressed(); break;
+ case MenuNextSpawn: client->NextSpawnPressed(); break;
  }
  }
  }
@@ -156,6 +162,11 @@ namespace spades {
  if (selectedTeam == 2) {
  item.visible = false;
  }
+ break;
+ case MenuNextSpawn:
+ if (client->GetWorld() && !(client->world->GetLocalPlayer() && !client->world->GetLocalPlayer()->IsSpectator()))
+ item.visible = false;
+ break;
  default:;
  }
 

Sources/Client/LimboView.h

@@ -38,7 +38,8 @@ namespace spades {
  MenuWeaponRifle,
  MenuWeaponSMG,
  MenuWeaponShotgun,
- MenuSpawn
+ MenuSpawn,
+ MenuNextSpawn
  };
  struct MenuItem {
  MenuType type;