Multiplayer spectate mode, added OvertimeSecs and JoinCooldownSecs

Author: deathkiller

Docs/Snippets/ServerConfiguration.json

@@ -52,6 +52,13 @@
 	"TotalKills": 10,
 	"TotalLaps": 3,
 	"TotalTreasureCollected": 0,
+	"OvertimeSecs": 0,
+	
+	/* Spectating */
+	"EnableSpectate": true,
+	"EnableFreeCamera": true,
+	"AllowJoinDuringRound": true,
+	"JoinCooldownSecs": 0,
 
 	/* Playlist can contain unlimited number of entries */
 	"Playlist":
@@ -66,7 +73,8 @@
 			"SpawnInvulnerableSecs": 4,
 			"TotalKills": 10,
 			"TotalLaps": 3,
-			"TotalTreasureCollected": 0
+			"TotalTreasureCollected": 0,
+			"OvertimeSecs": 60
 		},
 		{
 			"LevelName": "battle1",

Sources/Jazz2/Actors/Player.cpp

@@ -129,6 +129,10 @@ namespace Jazz2::Actors
 			case PlayerType::Spaz: async_await RequestMetadataAsync("Interactive/PlayerSpaz"_s); break;
 			case PlayerType::Lori: async_await RequestMetadataAsync("Interactive/PlayerLori"_s); break;
 			case PlayerType::Frog: async_await RequestMetadataAsync("Interactive/PlayerFrog"_s); break;
+			case PlayerType::Spectate:
+				// TODO: Spectate mode - load minimal metadata for fallback, but player will be invisible
+				async_await RequestMetadataAsync("Interactive/PlayerJazz"_s);
+				break;
 		}
 
 		SetAnimation(AnimState::Fall);
@@ -141,11 +145,25 @@ namespace Jazz2::Actors
 		_weaponAmmo[(std::int32_t)WeaponType::Blaster] = UINT16_MAX;
 		_weaponAmmoCheckpoint[(std::int32_t)WeaponType::Blaster] = UINT16_MAX;
 
-		SetState(ActorState::PreserveOnRollback | ActorState::CollideWithTilesetReduced | ActorState::CollideWithSolidObjects |
-			ActorState::IsSolidObject | ActorState::ExcludeSimilar, true);
+		if (_playerType == PlayerType::Spectate) {
+			// Spectate mode - no collision, no gravity, invisible
+			SetState(ActorState::PreserveOnRollback | ActorState::ExcludeSimilar, true);
+			SetState(ActorState::CollideWithTilesetReduced | ActorState::CollideWithSolidObjects | ActorState::IsSolidObject, false);
+			_health = 0;
+			_maxHealth = 0;
+			_renderer.setDrawEnabled(false);
+			
+			// Empty hitbox for spectate mode
+			AABB = {};
+			AABBInner = {};
+		} else {
+			SetState(ActorState::PreserveOnRollback | ActorState::CollideWithTilesetReduced | ActorState::CollideWithSolidObjects |
+				ActorState::IsSolidObject | ActorState::ExcludeSimilar, true);
+
+			_health = 5;
+			_maxHealth = _health;
+		}
 
-		_health = 5;
-		_maxHealth = _health;
 		_currentWeapon = WeaponType::Blaster;
 
 		_checkpointPos = Vector2f((float)details.Pos.X, (float)details.Pos.Y);
@@ -217,6 +235,11 @@ namespace Jazz2::Actors
 		}
 #endif
 
+		if DEATH_UNLIKELY(_playerType == PlayerType::Spectate) {
+			OnHandleSpectate(timeMult);
+			return;
+		}
+
 		// Delayed spawning
 		if (_lastExitType != ExitType::None) {
 			_controllableTimeout -= timeMult;
@@ -1483,6 +1506,11 @@ namespace Jazz2::Actors
 
 	void Player::OnUpdateHitbox()
 	{
+		if (_playerType == PlayerType::Spectate) {
+			AABBInner = {};
+			return;
+		}
+
 		// The sprite is always located relative to the hotspot.
 		// The coldspot is usually located at the ground level of the sprite,
 		// but for falling sprites for some reason somewhere above the hotspot instead.
@@ -2622,6 +2650,28 @@ namespace Jazz2::Actors
 		}
 	}
 
+	void Player::OnHandleSpectate(float timeMult)
+	{
+		constexpr float SpectateSpeed = 8.0f;
+
+		float playerMovement = _levelHandler->PlayerHorizontalMovement(this);
+		if (std::abs(playerMovement) > 0.5f) {
+			_speed.X = playerMovement * SpectateSpeed;
+		} else {
+			_speed.X = 0.0f;
+		}
+
+		float playerMovementVert = _levelHandler->PlayerVerticalMovement(this);
+		if (std::abs(playerMovementVert) > 0.5f) {
+			_speed.Y = playerMovementVert * SpectateSpeed;
+		} else {
+			_speed.Y = 0.0f;
+		}
+
+		_pos.X += _speed.X * timeMult;
+		_pos.Y += _speed.Y * timeMult;
+	}
+
 	std::shared_ptr<AudioBufferPlayer> Player::PlayPlayerSfx(StringView identifier, float gain, float pitch)
 	{
 		auto it = _metadata->Sounds.find(String::nullTerminatedView(identifier));

Sources/Jazz2/Actors/Player.h

@@ -414,6 +414,7 @@ namespace Jazz2::Actors
 		void OnHandleMovement(float timeMult, bool areaWeaponAllowed, bool canJumpPrev);
 		void OnHandleWater();
 		void OnHandleAreaEvents(float timeMult, bool& areaWeaponAllowed, std::int32_t& areaWaterBlock);
+		void OnHandleSpectate(float timeMult);
 		void DoWarpOut(Vector2f pos, WarpFlags flags);
 		void InitialPoleStage(bool horizontal);
 		void NextPoleStage(bool horizontal, bool positive, std::int32_t stagesLeft, float lastSpeed);

Sources/Jazz2/LevelHandler.cpp

@@ -1846,6 +1846,35 @@ namespace Jazz2
 #endif
 	}
 
+	void LevelHandler::UnassignViewport(Actors::Player* player)
+	{
+		bool success = false;
+		for (std::size_t i = 0; i < _assignedViewports.size(); i++) {
+			if (_assignedViewports[i]->_targetActor == player) {
+				_assignedViewports.eraseUnordered(i);
+				success = true;
+				break;
+			}
+		}
+		
+#if defined(WITH_AUDIO)
+		if (success) {
+			for (auto& current : _playingSounds) {
+				if (auto* currentForSplitscreen = runtime_cast<AudioBufferPlayerForSplitscreen>(current.get())) {
+					currentForSplitscreen->updateViewports(_assignedViewports);
+				}
+			}
+		}
+#endif
+	}
+
+	void LevelHandler::CommitViewports()
+	{
+		Viewport::GetChain().clear();
+		Vector2i res = theApplication().GetResolution();
+		OnInitializeViewport(res.X, res.Y);
+	}
+
 	void LevelHandler::InitializeCamera(Rendering::PlayerViewport& viewport)
 	{
 		if (viewport._targetActor == nullptr) {
@@ -2150,7 +2179,7 @@ namespace Jazz2
 		}
 
 		if (richPresence.LargeImage.empty()) {
-			richPresence.Details = "Playing as "_s;
+			richPresence.Details = "Playing"_s;
 			richPresence.LargeImage = "main-transparent"_s;
 
 			if (!_players.empty())
@@ -2161,15 +2190,15 @@ namespace Jazz2
 					case PlayerType::Lori: richPresence.SmallImage = "playing-lori"_s; break;
 				}
 		} else {
-			richPresence.Details = "Playing episode as "_s;
+			richPresence.Details = "Playing episode"_s;
 		}
 
 		if (!_players.empty()) {
 			switch (_players[0]->GetPlayerType()) {
 				default:
-				case PlayerType::Jazz: richPresence.Details += "Jazz"_s; break;
-				case PlayerType::Spaz: richPresence.Details += "Spaz"_s; break;
-				case PlayerType::Lori: richPresence.Details += "Lori"_s; break;
+				case PlayerType::Jazz: richPresence.Details += " as Jazz"_s; break;
+				case PlayerType::Spaz: richPresence.Details += " as Spaz"_s; break;
+				case PlayerType::Lori: richPresence.Details += " as Lori"_s; break;
 			}
 		}
 

Sources/Jazz2/LevelHandler.h

@@ -301,6 +301,10 @@ namespace Jazz2
 		void ResolveCollisions(float timeMult);
 		/** @brief Assigns viewport */
 		void AssignViewport(Actors::Player* player);
+		/** @brief Unassigns viewport */
+		void UnassignViewport(Actors::Player* player);
+		/** @brief Commits changes in assigned viewports */
+		void CommitViewports();
 		/** @brief Initializes camera for specified viewport */
 		void InitializeCamera(Rendering::PlayerViewport& viewport);
 		/** @brief Updates pressed actions */