Added IsPausable, InitialState and game version to cache descript…

…or, improved console on Windows, refactoring

Sources/Jazz2.vcxproj

@@ -384,6 +384,7 @@
     <ClInclude Include="Jazz2\UI\Menu\InGameMenu.h" />
     <ClInclude Include="Jazz2\UI\Menu\InputDiagnosticsSection.h" />
     <ClInclude Include="Jazz2\UI\Menu\LanguageSelectSection.h" />
+    <ClInclude Include="Jazz2\UI\Menu\LoadingSection.h" />
     <ClInclude Include="Jazz2\UI\Menu\MainMenu.h" />
     <ClInclude Include="Jazz2\UI\Menu\MenuSection.h" />
     <ClInclude Include="Jazz2\UI\Menu\OptionsSection.h" />
@@ -730,6 +731,7 @@
     <ClCompile Include="Jazz2\UI\Menu\InGameMenu.cpp" />
     <ClCompile Include="Jazz2\UI\Menu\InputDiagnosticsSection.cpp" />
     <ClCompile Include="Jazz2\UI\Menu\LanguageSelectSection.cpp" />
+    <ClCompile Include="Jazz2\UI\Menu\LoadingSection.cpp" />
     <ClCompile Include="Jazz2\UI\Menu\MainMenu.cpp" />
     <ClCompile Include="Jazz2\UI\Menu\OptionsSection.cpp" />
     <ClCompile Include="Jazz2\UI\Menu\PauseSection.cpp" />

Sources/Jazz2.vcxproj.filters

@@ -1353,6 +1353,9 @@
     <ClInclude Include="$(ExtensionLibraryPath)\Threading\Interlocked.h">
       <Filter>Header Files\Shared\Threading</Filter>
     </ClInclude>
+    <ClInclude Include="Jazz2\UI\Menu\LoadingSection.h">
+      <Filter>Header Files\Jazz2\UI\Menu</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="Main.cpp">
@@ -2252,6 +2255,9 @@
     <ClCompile Include="Jazz2\Actors\RemoteActor.cpp">
       <Filter>Source Files\Jazz2\Actors</Filter>
     </ClCompile>
+    <ClCompile Include="Jazz2\UI\Menu\LoadingSection.cpp">
+      <Filter>Source Files\Jazz2\UI\Menu</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ResourceCompile Include="Resources.rc">

Sources/Jazz2/Actors/Player.cpp

@@ -161,7 +161,7 @@ namespace Jazz2::Actors
 	void Player::OnUpdate(float timeMult)
 	{
 #if defined(DEATH_DEBUG)
-		if (_levelHandler->PlayerActionPressed(_playerIndex, PlayerActions::ChangeWeapon)) {
+		if (PreferencesCache::AllowCheats && _levelHandler->PlayerActionPressed(_playerIndex, PlayerActions::ChangeWeapon)) {
 			float moveDistance = (_levelHandler->PlayerActionPressed(_playerIndex, PlayerActions::Run) ? 400.0f : 100.0f);
 			if (_levelHandler->PlayerActionHit(_playerIndex, PlayerActions::Left)) {
 				MoveInstantly(Vector2f(-moveDistance, 0.0f), MoveType::Relative | MoveType::Force);

Sources/Jazz2/ILevelHandler.h

@@ -39,6 +39,7 @@ namespace Jazz2
 		virtual Tiles::TileMap* TileMap() = 0;
 
 		virtual GameDifficulty Difficulty() const = 0;
+		virtual bool IsPausable() const = 0;
 		virtual bool IsReforged() const = 0;
 		virtual Recti LevelBounds() const = 0;
 		virtual float ElapsedFrames() const = 0;

Sources/Jazz2/IRootController.h

@@ -33,7 +33,7 @@ namespace Jazz2
 		virtual void ChangeLevel(LevelInitialization&& levelInit) = 0;
 
 #if defined(WITH_MULTIPLAYER)
-		virtual bool ConnectToServer(const char* address, std::uint16_t port) = 0;
+		virtual bool ConnectToServer(const StringView& address, std::uint16_t port) = 0;
 		virtual bool CreateServer(std::uint16_t port) = 0;
 #endif
 

Sources/Jazz2/LevelHandler.cpp

@@ -216,17 +216,20 @@ namespace Jazz2
 	{
 		float timeMult = theApplication().timeMult();
 
-		UpdatePressedActions();
+		if (_pauseMenu == nullptr) {
+			UpdatePressedActions();
 
-		if (PlayerActionHit(0, PlayerActions::Menu) && _pauseMenu == nullptr && _nextLevelType == ExitType::None) {
-			PauseGame();
-		}
+			if (PlayerActionHit(0, PlayerActions::Menu) && _nextLevelType == ExitType::None) {
+				PauseGame();
+			}
 #if defined(DEATH_DEBUG)
-		if (PlayerActionPressed(0, PlayerActions::ChangeWeapon) && PlayerActionHit(0, PlayerActions::Jump)) {
-			_cheatsUsed = true;
-			BeginLevelChange(ExitType::Warp | ExitType::FastTransition, nullptr);
-		}
+			if (PreferencesCache::AllowCheats && PlayerActionPressed(0, PlayerActions::ChangeWeapon) && PlayerActionHit(0, PlayerActions::Jump)) {
+				_cheatsUsed = true;
+				BeginLevelChange(ExitType::Warp | ExitType::FastTransition, nullptr);
+			}
 #endif
+		}
+
 #if defined(WITH_AUDIO)
 		// Destroy stopped players and resume music after Sugar Rush
 		if (_sugarRushMusic != nullptr && _sugarRushMusic->isStopped()) {
@@ -245,7 +248,7 @@ namespace Jazz2
 		}
 #endif
 
-		if (_pauseMenu == nullptr) {
+		if (!IsPausable() || _pauseMenu == nullptr) {
 			if (_nextLevelType != ExitType::None) {
 				_nextLevelTime -= timeMult;
 
@@ -291,7 +294,7 @@ namespace Jazz2
 				}
 			}
 
-			if (_difficulty != GameDifficulty::Multiplayer) {
+			if (/*_difficulty != GameDifficulty::Multiplayer*/true) {
 				if (!_players.empty()) {
 					auto& pos = _players[0]->GetPos();
 					int32_t tx1 = (int32_t)pos.X / Tiles::TileSet::DefaultTileSize;
@@ -1613,22 +1616,26 @@ namespace Jazz2
 	{
 		// Show in-game pause menu
 		_pauseMenu = std::make_shared<UI::Menu::InGameMenu>(this);
-		// Prevent updating of all level objects
-		_rootNode->setUpdateEnabled(false);
+		if (IsPausable()) {
+			// Prevent updating of all level objects
+			_rootNode->setUpdateEnabled(false);
+		}
 
 #if defined(WITH_AUDIO)
 		// Use low-pass filter on music and pause all SFX
 		if (_music != nullptr) {
 			_music->setLowPass(0.1f);
 		}
-		for (auto& sound : _playingSounds) {
-			if (sound->isPlaying()) {
-				sound->pause();
+		if (IsPausable()) {
+			for (auto& sound : _playingSounds) {
+				if (sound->isPlaying()) {
+					sound->pause();
+				}
+			}
+			// If Sugar Rush music is playing, pause it and play normal music instead
+			if (_sugarRushMusic != nullptr && _music != nullptr) {
+				_music->play();
 			}
-		}
-		// If Sugar Rush music is playing, pause it and play normal music instead
-		if (_sugarRushMusic != nullptr && _music != nullptr) {
-			_music->play();
 		}
 #endif
 	}

Sources/Jazz2/LevelHandler.h

@@ -80,6 +80,10 @@ namespace Jazz2
 			return _difficulty;
 		}
 
+		bool IsPausable() const override {
+			return true;
+		}
+
 		bool IsReforged() const override {
 			return _isReforged;
 		}

Sources/Jazz2/Multiplayer/MultiLevelHandler.h

@@ -35,6 +35,10 @@ namespace Jazz2::Multiplayer
 		MultiLevelHandler(IRootController* root, NetworkManager* networkManager, const LevelInitialization& levelInit);
 		~MultiLevelHandler() override;
 
+		bool IsPausable() const override {
+			return false;
+		}
+
 		float GetAmbientLight() const override;
 		void SetAmbientLight(float value) override;
 

Sources/Jazz2/Multiplayer/NetworkManager.cpp

@@ -18,6 +18,8 @@
 // Undefine it again after include
 #undef far
 
+#include <Containers/String.h>
+
 #define MAX_CLIENTS 64
 
 namespace Jazz2::Multiplayer
@@ -39,7 +41,7 @@ namespace Jazz2::Multiplayer
 		}
 	}
 
-	bool NetworkManager::CreateClient(INetworkHandler* handler, const char* address, std::uint16_t port, std::uint32_t clientData)
+	bool NetworkManager::CreateClient(INetworkHandler* handler, const StringView& address, std::uint16_t port, std::uint32_t clientData)
 	{
 		if (!_initialized || _host != nullptr) {
 			return false;
@@ -53,7 +55,7 @@ namespace Jazz2::Multiplayer
 		_state = NetworkState::Connecting;
 
 		ENetAddress addr = { };
-		enet_address_set_host(&addr, address);
+		enet_address_set_host(&addr, String::nullTerminatedView(address).data());
 		addr.port = port;
 
 		ENetPeer* peer = enet_host_connect(_host, &addr, (std::size_t)NetworkChannel::Count, clientData);

Sources/Jazz2/Multiplayer/NetworkManager.h

@@ -8,6 +8,7 @@
 #include "../../nCine/Threading/ThreadSync.h"
 
 #include <Containers/SmallVector.h>
+#include <Containers/StringView.h>
 
 struct _ENetHost;
 
@@ -39,7 +40,7 @@ namespace Jazz2::Multiplayer
 		NetworkManager();
 		~NetworkManager();
 
-		bool CreateClient(INetworkHandler* handler, const char* address, std::uint16_t port, std::uint32_t clientData);
+		bool CreateClient(INetworkHandler* handler, const StringView& address, std::uint16_t port, std::uint32_t clientData);
 		bool CreateServer(INetworkHandler* handler, std::uint16_t port);
 		void Dispose();
 

Sources/Jazz2/PreferencesCache.cpp

@@ -14,6 +14,9 @@ using namespace Death::IO;
 
 namespace Jazz2
 {
+#if defined(WITH_MULTIPLAYER)
+	String PreferencesCache::InitialState;
+#endif
 	UnlockableEpisodes PreferencesCache::UnlockedEpisodes = UnlockableEpisodes::None;
 	RescaleMode PreferencesCache::ActiveRescaleMode = RescaleMode::None;
 	bool PreferencesCache::EnableFullscreen = false;
@@ -296,6 +299,11 @@ namespace Jazz2
 			} else if (arg == "/mute"_s) {
 				MasterVolume = 0.0f;
 			}
+#if defined(WITH_MULTIPLAYER)
+			else if (InitialState.empty() && (arg == "/server"_s || arg.hasPrefix("/connect:"_s))) {
+				InitialState = arg;
+			}
+#endif
 		}
 	}
 

Sources/Jazz2/PreferencesCache.h

@@ -79,6 +79,9 @@ namespace Jazz2
 		static constexpr std::int32_t UnlimitedFps = 0;
 		static constexpr std::int32_t UseVsync = -1;
 
+#if defined(WITH_MULTIPLAYER)
+		static String InitialState;
+#endif
 		static UnlockableEpisodes UnlockedEpisodes;
 
 		// Graphics
@@ -148,9 +151,7 @@ namespace Jazz2
 
 		static constexpr float TouchPaddingMultiplier = 0.003f;
 
-		/// Deleted copy constructor
 		PreferencesCache(const PreferencesCache&) = delete;
-		/// Deleted assignment operator
 		PreferencesCache& operator=(const PreferencesCache&) = delete;
 
 		static String _configPath;

Sources/Jazz2/UI/Menu/BeginSection.cpp

@@ -333,7 +333,7 @@ namespace Jazz2::UI::Menu
 			// TODO: Multiplayer
 			case (int32_t)Item::TODO_ConnectTo:
 				// TODO: Hardcoded address and port
-				_root->ConnectToServer("127.0.0.1", 10666);
+				_root->ConnectToServer("127.0.0.1"_s, 7438);
 				break;
 			case (int32_t)Item::TODO_CreateServer:
 				// TODO: Hardcoded address and port

Sources/Jazz2/UI/Menu/IMenuContainer.h

@@ -42,7 +42,7 @@ namespace Jazz2::UI::Menu
 		virtual void LeaveSection() = 0;
 		virtual void ChangeLevel(Jazz2::LevelInitialization&& levelInit) = 0;
 #if defined(WITH_MULTIPLAYER)
-		virtual bool ConnectToServer(const char* address, std::uint16_t port) = 0;
+		virtual bool ConnectToServer(const StringView& address, std::uint16_t port) = 0;
 		virtual bool CreateServer(std::uint16_t port) = 0;
 #endif
 		virtual void ApplyPreferencesChanges(ChangedPreferencesType type) = 0;

Sources/Jazz2/UI/Menu/InGameMenu.cpp

@@ -235,7 +235,7 @@ namespace Jazz2::UI::Menu
 	}
 
 #if defined(WITH_MULTIPLAYER)
-	bool InGameMenu::ConnectToServer(const char* address, std::uint16_t port)
+	bool InGameMenu::ConnectToServer(const StringView& address, std::uint16_t port)
 	{
 		return _root->_root->ConnectToServer(address, port);
 	}
@@ -264,6 +264,7 @@ namespace Jazz2::UI::Menu
 		}
 
 		if ((type & ChangedPreferencesType::Language) == ChangedPreferencesType::Language) {
+			// All sections have to be recreated to load new language
 			_sections.clear();
 			SwitchToSection<PauseSection>();
 		}

Sources/Jazz2/UI/Menu/InGameMenu.h

@@ -31,7 +31,7 @@ namespace Jazz2::UI::Menu
 		void LeaveSection() override;
 		void ChangeLevel(Jazz2::LevelInitialization&& levelInit) override;
 #if defined(WITH_MULTIPLAYER)
-		bool ConnectToServer(const char* address, std::uint16_t port) override;
+		bool ConnectToServer(const StringView& address, std::uint16_t port) override;
 		bool CreateServer(std::uint16_t port) override;
 #endif
 		void ApplyPreferencesChanges(ChangedPreferencesType type) override;

Sources/Jazz2/UI/Menu/LoadingSection.cpp

@@ -0,0 +1,35 @@
+#include "LoadingSection.h"
+
+namespace Jazz2::UI::Menu
+{
+	LoadingSection::LoadingSection(const StringView& message)
+		: _message(message)
+	{
+	}
+
+	LoadingSection::LoadingSection(String&& message)
+		: _message(std::move(message))
+	{
+
+	}
+
+	void LoadingSection::OnUpdate(float timeMult)
+	{
+	}
+
+	void LoadingSection::OnDraw(Canvas* canvas)
+	{
+		Vector2i viewSize = canvas->ViewSize;
+		Vector2f center = Vector2f(viewSize.X * 0.5f, viewSize.Y * 0.5f);
+
+		constexpr float topLine = 131.0f;
+		std::int32_t charOffset = 0;
+
+		_root->DrawStringShadow(_message, charOffset, center.X, topLine + 40.0f, IMenuContainer::FontLayer,
+			Alignment::Top, Font::DefaultColor, 1.2f, 0.4f, 0.6f, 0.6f, 0.6f, 0.9f, 1.2f);
+	}
+
+	void LoadingSection::OnTouchEvent(const nCine::TouchEvent& event, const Vector2i& viewSize)
+	{
+	}
+}

Sources/Jazz2/UI/Menu/LoadingSection.h

@@ -0,0 +1,20 @@
+#pragma once
+
+#include "MenuSection.h"
+
+namespace Jazz2::UI::Menu
+{
+	class LoadingSection : public MenuSection
+	{
+	public:
+		LoadingSection(const StringView& message);
+		LoadingSection(String&& message);
+
+		void OnUpdate(float timeMult) override;
+		void OnDraw(Canvas* canvas) override;
+		void OnTouchEvent(const nCine::TouchEvent& event, const Vector2i& viewSize) override;
+
+	private:
+		String _message;
+	};
+}