Multiplayer (part 4), minor changes

Sources/Jazz2.vcxproj

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Debug|Win32">
@@ -344,11 +344,13 @@
     <ClInclude Include="Jazz2\LevelDescriptor.h" />
     <ClInclude Include="Jazz2\LightEmitter.h" />
     <ClInclude Include="Jazz2\Multiplayer\Backends\enet.h" />
+    <ClInclude Include="Jazz2\Multiplayer\ConnectionResult.h" />
     <ClInclude Include="Jazz2\Multiplayer\INetworkHandler.h" />
     <ClInclude Include="Jazz2\Multiplayer\MultiLevelHandler.h" />
     <ClInclude Include="Jazz2\Multiplayer\NetworkManager.h" />
     <ClInclude Include="Jazz2\Multiplayer\PacketTypes.h" />
     <ClInclude Include="Jazz2\Multiplayer\Peer.h" />
+    <ClInclude Include="Jazz2\Multiplayer\Reason.h" />
     <ClInclude Include="Jazz2\PitType.h" />
     <ClInclude Include="Jazz2\PlayerActions.h" />
     <ClInclude Include="Jazz2\PlayerType.h" />
@@ -709,6 +711,7 @@
     <ClCompile Include="Jazz2\Compatibility\JJ2Level.cpp" />
     <ClCompile Include="Jazz2\Compatibility\JJ2Strings.cpp" />
     <ClCompile Include="Jazz2\Compatibility\JJ2Tileset.cpp" />
+    <ClCompile Include="Jazz2\Multiplayer\ConnectionResult.cpp" />
     <ClCompile Include="Jazz2\Multiplayer\MultiLevelHandler.cpp" />
     <ClCompile Include="Jazz2\Multiplayer\NetworkManager.cpp" />
     <ClCompile Include="Jazz2\PreferencesCache.cpp" />

Sources/Jazz2.vcxproj.filters

@@ -1380,6 +1380,9 @@
     <ClInclude Include="Jazz2\UI\Menu\MenuResources.h">
       <Filter>Header Files\Jazz2\UI\Menu</Filter>
     </ClInclude>
+    <ClInclude Include="Jazz2\Multiplayer\Reason.h">
+      <Filter>Header Files\Jazz2\Multiplayer</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="Main.cpp">

Sources/Jazz2/Actors/ActorBase.cpp

@@ -429,7 +429,7 @@ namespace Jazz2::Actors
 		auto it = _metadata->Sounds.find(String::nullTerminatedView(identifier));
 		if (it != _metadata->Sounds.end()) {
 			int idx = (it->second.Buffers.size() > 1 ? Random().Next(0, (int)it->second.Buffers.size()) : 0);
-			return _levelHandler->PlaySfx(&it->second.Buffers[idx]->Buffer, Vector3f(_pos.X, _pos.Y, 0.0f), false, gain, pitch);
+			return _levelHandler->PlaySfx(this, identifier, &it->second.Buffers[idx]->Buffer, Vector3f(_pos.X, _pos.Y, 0.0f), false, gain, pitch);
 		} else {
 			return nullptr;
 		}

Sources/Jazz2/Actors/Environment/Spring.cpp

@@ -9,8 +9,7 @@ using namespace Jazz2::Tiles;
 namespace Jazz2::Actors::Environment
 {
 	Spring::Spring()
-		:
-		_cooldown(0.0f)
+		: _cooldown(0.0f)
 	{
 	}
 

Sources/Jazz2/Actors/Explosion.cpp

@@ -6,19 +6,15 @@
 namespace Jazz2::Actors
 {
 	Explosion::Explosion()
-		:
-		_lightBrightness(0.0f),
-		_lightIntensity(0.0f),
-		_lightRadiusNear(0.0f),
-		_lightRadiusFar(0.0f)
+		: _lightBrightness(0.0f), _lightIntensity(0.0f), _lightRadiusNear(0.0f), _lightRadiusFar(0.0f)
 	{
 	}
 
 	void Explosion::Create(ILevelHandler* levelHandler, const Vector3i& pos, Type type)
 	{
 		std::shared_ptr<Explosion> explosion = std::make_shared<Explosion>();
-		uint8_t explosionParams[2];
-		*(uint16_t*)&explosionParams[0] = (uint16_t)type;
+		std::uint8_t explosionParams[2];
+		*(std::uint16_t*)&explosionParams[0] = (uint16_t)type;
 		explosion->OnActivated(ActorActivationDetails(
 			levelHandler,
 			pos,
@@ -29,7 +25,7 @@ namespace Jazz2::Actors
 
 	Task<bool> Explosion::OnActivatedAsync(const ActorActivationDetails& details)
 	{
-		_type = (Type)*(uint16_t*)&details.Params[0];
+		_type = (Type)*(std::uint16_t*)&details.Params[0];
 
 		SetState(ActorState::ForceDisableCollisions, true);
 		SetState(ActorState::CanBeFrozen | ActorState::CollideWithTileset | ActorState::CollideWithOtherActors | ActorState::ApplyGravitation, false);

Sources/Jazz2/Actors/Player.cpp

@@ -2229,7 +2229,7 @@ namespace Jazz2::Actors
 		auto it = _metadata->Sounds.find(String::nullTerminatedView(identifier));
 		if (it != _metadata->Sounds.end()) {
 			int idx = (it->second.Buffers.size() > 1 ? Random().Next(0, (int)it->second.Buffers.size()) : 0);
-			return _levelHandler->PlaySfx(&it->second.Buffers[idx]->Buffer, Vector3f(0.0f, 0.0f, 0.0f), true, gain, pitch);
+			return _levelHandler->PlaySfx(this, identifier, &it->second.Buffers[idx]->Buffer, Vector3f(0.0f, 0.0f, 0.0f), true, gain, pitch);
 		} else {
 			return nullptr;
 		}

Sources/Jazz2/Actors/RemoteActor.cpp

@@ -23,10 +23,6 @@ namespace Jazz2::Actors
 			_stateBuffer[i].Pos = Vector2f(details.Pos.X, details.Pos.Y);
 		}
 
-		async_await RequestMetadataAsync("Interactive/PlayerJazz"_s);
-
-		SetAnimation(AnimState::Idle);
-
 		async_return true;
 	}
 
@@ -71,6 +67,12 @@ namespace Jazz2::Actors
 		ActorBase::OnUpdate(timeMult);
 	}
 
+	void RemoteActor::AssignMetadata(const StringView& path, AnimState anim)
+	{
+		RequestMetadata(path);
+		SetAnimation(anim);
+	}
+
 	void RemoteActor::SyncWithServer(const Vector2f& pos, AnimState anim, bool isVisible, bool isFacingLeft)
 	{
 		Clock& c = nCine::clock();

Sources/Jazz2/Actors/RemoteActor.h

@@ -11,6 +11,7 @@ namespace Jazz2::Actors
 	public:
 		RemoteActor();
 
+		void AssignMetadata(const StringView& path, AnimState anim);
 		void SyncWithServer(const Vector2f& pos, AnimState anim, bool isVisible, bool isFacingLeft);
 
 	protected:

Sources/Jazz2/ContentResolver.cpp

@@ -56,7 +56,7 @@ namespace Jazz2
 	}
 
 	ContentResolver::ContentResolver()
-		: _isHeadless(false), _isLoading(false), _cachedMetadata(64), _cachedGraphics(128), _palettes{}
+		: _isHeadless(false), _isLoading(false), _cachedMetadata(64), _cachedGraphics(256), _cachedSounds(192), _palettes{}
 	{
 		InitializePaths();
 	}
@@ -361,8 +361,8 @@ namespace Jazz2
 
 	Metadata* ContentResolver::RequestMetadata(const StringView& path)
 	{
-		auto pathNormalized = fs::ToNativeSeparators(path);
-		auto it = _cachedMetadata.find(String::nullTerminatedView(pathNormalized));
+		String pathNormalized = fs::ToNativeSeparators(path);
+		auto it = _cachedMetadata.find(pathNormalized);
 		if (it != _cachedMetadata.end()) {
 			// Already loaded - Mark as referenced
 			it->second->Flags |= MetadataFlags::Referenced;
@@ -395,6 +395,7 @@ namespace Jazz2
 		bool multipleAnimsNoStatesWarning = false;
 
 		std::unique_ptr<Metadata> metadata = std::make_unique<Metadata>();
+		metadata->Path = std::move(pathNormalized);
 		metadata->Flags |= MetadataFlags::Referenced;
 
 		ondemand::parser parser;
@@ -555,7 +556,7 @@ namespace Jazz2
 			}
 		}
 
-		return _cachedMetadata.emplace(pathNormalized, std::move(metadata)).first->second.get();
+		return _cachedMetadata.emplace(metadata->Path, std::move(metadata)).first->second.get();
 	}
 
 	GenericGraphicResource* ContentResolver::RequestGraphics(const StringView& path, uint16_t paletteOffset)

Sources/Jazz2/ContentResolver.h

@@ -17,6 +17,7 @@
 #include "../nCine/Base/HashMap.h"
 
 #include <Containers/Pair.h>
+#include <Containers/Reference.h>
 #include <Containers/SmallVector.h>
 #include <Containers/StringView.h>
 #include <IO/FileSystem.h>
@@ -84,6 +85,13 @@ namespace Jazz2
 		}
 
 	private:
+		struct StringRefEqualTo
+		{
+			inline bool operator()(const Reference<String>& a, const Reference<String>& b) const noexcept {
+				return a.get() == b.get();
+			}
+		};
+
 		ContentResolver();
 
 		ContentResolver(const ContentResolver&) = delete;
@@ -105,7 +113,7 @@ namespace Jazz2
 		bool _isHeadless;
 		bool _isLoading;
 		uint32_t _palettes[PaletteCount * ColorsPerPalette];
-		HashMap<String, std::unique_ptr<Metadata>> _cachedMetadata;
+		HashMap<Reference<String>, std::unique_ptr<Metadata>, FNV1aHashFunc<String>, StringRefEqualTo> _cachedMetadata;
 		HashMap<Pair<String, uint16_t>, std::unique_ptr<GenericGraphicResource>> _cachedGraphics;
 		HashMap<String, std::unique_ptr<GenericSoundResource>> _cachedSounds;
 		std::unique_ptr<UI::Font> _fonts[(int32_t)FontType::Count];

Sources/Jazz2/Events/EventMap.cpp

@@ -169,7 +169,7 @@ namespace Jazz2::Events
 
 	void EventMap::ActivateEvents(std::int32_t tx1, std::int32_t ty1, std::int32_t tx2, std::int32_t ty2, bool allowAsync)
 	{
-		auto tiles = _levelHandler->TileMap();
+		auto* tiles = _levelHandler->TileMap();
 		if (tiles == nullptr) {
 			return;
 		}

Sources/Jazz2/ILevelHandler.h

@@ -55,7 +55,7 @@ namespace Jazz2
 
 		virtual void AddActor(std::shared_ptr<Actors::ActorBase> actor) = 0;
 
-		virtual std::shared_ptr<AudioBufferPlayer> PlaySfx(AudioBuffer* buffer, const Vector3f& pos, bool sourceRelative, float gain = 1.0f, float pitch = 1.0f) = 0;
+		virtual std::shared_ptr<AudioBufferPlayer> PlaySfx(Actors::ActorBase* self, const StringView& identifier, AudioBuffer* buffer, const Vector3f& pos, bool sourceRelative, float gain = 1.0f, float pitch = 1.0f) = 0;
 		virtual std::shared_ptr<AudioBufferPlayer> PlayCommonSfx(const StringView& identifier, const Vector3f& pos, float gain = 1.0f, float pitch = 1.0f) = 0;
 		virtual void WarpCameraToTarget(const std::shared_ptr<Actors::ActorBase>& actor, bool fast = false) = 0;
 		virtual bool IsPositionEmpty(Actors::ActorBase* self, const AABBf& aabb, Tiles::TileCollisionParams& params, Actors::ActorBase** collider) = 0;

Sources/Jazz2/LevelHandler.cpp

@@ -314,46 +314,7 @@ namespace Jazz2
 				}
 			}
 
-			if (/*_difficulty != GameDifficulty::Multiplayer*/true) {
-				if (!_players.empty()) {
-					auto& pos = _players[0]->GetPos();
-					int32_t tx1 = (int32_t)pos.X / Tiles::TileSet::DefaultTileSize;
-					int32_t ty1 = (int32_t)pos.Y / Tiles::TileSet::DefaultTileSize;
-					int32_t tx2 = tx1;
-					int32_t ty2 = ty1;
-
-					tx1 -= ActivateTileRange;
-					ty1 -= ActivateTileRange;
-					tx2 += ActivateTileRange;
-					ty2 += ActivateTileRange;
-
-					int32_t tx1d = tx1 - 4;
-					int32_t ty1d = ty1 - 4;
-					int32_t tx2d = tx2 + 4;
-					int32_t ty2d = ty2 + 4;
-
-					for (auto& actor : _actors) {
-						if ((actor->_state & (Actors::ActorState::IsCreatedFromEventMap | Actors::ActorState::IsFromGenerator)) != Actors::ActorState::None) {
-							Vector2i originTile = actor->_originTile;
-							if (originTile.X < tx1d || originTile.Y < ty1d || originTile.X > tx2d || originTile.Y > ty2d) {
-								if (actor->OnTileDeactivated()) {
-									if ((actor->_state & Actors::ActorState::IsFromGenerator) == Actors::ActorState::IsFromGenerator) {
-										_eventMap->ResetGenerator(originTile.X, originTile.Y);
-									}
-
-									_eventMap->Deactivate(originTile.X, originTile.Y);
-
-									actor->_state |= Actors::ActorState::IsDestroyed;
-								}
-							}
-						}
-					}
-
-					_eventMap->ActivateEvents(tx1, ty1, tx2, ty2, true);
-				}
-
-				_eventMap->ProcessGenerators(timeMult);
-			}
+			ProcessEvents(timeMult);
 
 			// Weather
 			if (_weatherType != WeatherType::None) {
@@ -472,7 +433,7 @@ namespace Jazz2
 	{
 		float timeMult = theApplication().timeMult();
 
-		if (_pauseMenu == nullptr) {
+		if (!IsPausable() || _pauseMenu == nullptr) {
 			ResolveCollisions(timeMult);
 
 			// Ambient Light Transition
@@ -702,7 +663,7 @@ namespace Jazz2
 		_actors.emplace_back(actor);
 	}
 
-	std::shared_ptr<AudioBufferPlayer> LevelHandler::PlaySfx(AudioBuffer* buffer, const Vector3f& pos, bool sourceRelative, float gain, float pitch)
+	std::shared_ptr<AudioBufferPlayer> LevelHandler::PlaySfx(Actors::ActorBase* self, const StringView& identifier, AudioBuffer* buffer, const Vector3f& pos, bool sourceRelative, float gain, float pitch)
 	{
 		auto& player = _playingSounds.emplace_back(std::make_shared<AudioBufferPlayer>(buffer));
 		player->setPosition(Vector3f(pos.X, pos.Y, 100.0f));
@@ -1279,17 +1240,68 @@ namespace Jazz2
 		}
 	}
 
+	void LevelHandler::BeforeActorDestroyed(Actors::ActorBase* actor)
+	{
+		// Nothing to do here
+	}
+
+	void LevelHandler::ProcessEvents(float timeMult)
+	{
+		if (!_players.empty()) {
+			std::size_t playerCount = _players.size();
+			SmallVector<AABBi, 2> playerZones;
+			playerZones.reserve(playerCount * 2);
+			for (std::size_t i = 0; i < playerCount; i++) {
+				auto pos = _players[i]->GetPos();
+				std::int32_t tx = (std::int32_t)pos.X / TileSet::DefaultTileSize;
+				std::int32_t ty = (std::int32_t)pos.Y / TileSet::DefaultTileSize;
+
+				const auto& activationRange = playerZones.emplace_back(tx - ActivateTileRange, ty - ActivateTileRange, tx + ActivateTileRange, ty + ActivateTileRange);
+				playerZones.emplace_back(activationRange.L - 4, activationRange.T - 4, activationRange.R + 4, activationRange.B + 4);
+			}
+
+			for (auto& actor : _actors) {
+				if ((actor->_state & (Actors::ActorState::IsCreatedFromEventMap | Actors::ActorState::IsFromGenerator)) != Actors::ActorState::None) {
+					Vector2i originTile = actor->_originTile;
+					bool isInside = false;
+					for (std::size_t i = 1; i < playerZones.size(); i += 2) {
+						if (playerZones[i].Contains(originTile)) {
+							isInside = true;
+							break;
+						}
+					}
+
+					if (!isInside && actor->OnTileDeactivated()) {
+						if ((actor->_state & Actors::ActorState::IsFromGenerator) == Actors::ActorState::IsFromGenerator) {
+							_eventMap->ResetGenerator(originTile.X, originTile.Y);
+						}
+
+						_eventMap->Deactivate(originTile.X, originTile.Y);
+						actor->_state |= Actors::ActorState::IsDestroyed;
+					}
+				}
+			}
+
+			for (std::size_t i = 0; i < playerZones.size(); i += 2) {
+				const auto& activationZone = playerZones[i];
+				_eventMap->ActivateEvents(activationZone.L, activationZone.T, activationZone.R, activationZone.B, true);
+			}
+		}
+
+		_eventMap->ProcessGenerators(timeMult);
+	}
+
 	void LevelHandler::ResolveCollisions(float timeMult)
 	{
 		auto it = _actors.begin();
 		while (it != _actors.end()) {
 			Actors::ActorBase* actor = it->get();
 			if (actor->GetState(Actors::ActorState::IsDestroyed)) {
+				BeforeActorDestroyed(actor);
 				if (actor->CollisionProxyID != Collisions::NullNode) {
 					_collisions.DestroyProxy(actor->CollisionProxyID);
 					actor->CollisionProxyID = Collisions::NullNode;
 				}
-
 				it = _actors.erase(it);
 				continue;
 			}

Sources/Jazz2/LevelHandler.h

@@ -110,7 +110,7 @@ namespace Jazz2
 
 		void AddActor(std::shared_ptr<Actors::ActorBase> actor) override;
 
-		std::shared_ptr<AudioBufferPlayer> PlaySfx(AudioBuffer* buffer, const Vector3f& pos, bool sourceRelative, float gain = 1.0f, float pitch = 1.0f) override;
+		std::shared_ptr<AudioBufferPlayer> PlaySfx(Actors::ActorBase* self, const StringView& identifier, AudioBuffer* buffer, const Vector3f& pos, bool sourceRelative, float gain, float pitch) override;
 		std::shared_ptr<AudioBufferPlayer> PlayCommonSfx(const StringView& identifier, const Vector3f& pos, float gain = 1.0f, float pitch = 1.0f) override;
 		void WarpCameraToTarget(const std::shared_ptr<Actors::ActorBase>& actor, bool fast = false) override;
 		bool IsPositionEmpty(Actors::ActorBase* self, const AABBf& aabb, Tiles::TileCollisionParams& params, Actors::ActorBase** collider) override;
@@ -309,6 +309,9 @@ namespace Jazz2
 		bool _playerFrozenEnabled;
 		uint32_t _lastPressedNumericKey;
 
+		virtual void BeforeActorDestroyed(Actors::ActorBase* actor);
+		virtual void ProcessEvents(float timeMult);
+
 		void ResolveCollisions(float timeMult);
 		void InitializeCamera();
 		void UpdateCamera(float timeMult);

Sources/Jazz2/Multiplayer/ConnectionResult.cpp

@@ -0,0 +1,25 @@
+#include "ConnectionResult.h"
+
+#if defined(WITH_MULTIPLAYER)
+
+#include "../../Common.h"
+
+namespace Jazz2::Multiplayer
+{
+	ConnectionResult::ConnectionResult(Reason reason)
+		: FailureReason(reason)
+	{
+	}
+
+	ConnectionResult::ConnectionResult(bool success)
+		: FailureReason(success ? (Reason)UINT32_MAX : Reason::Unknown)
+	{
+	}
+
+	bool ConnectionResult::IsSuccessful() const
+	{
+		return FailureReason == (Reason)UINT32_MAX;
+	}
+}
+
+#endif