Merge branch 'development' into vector-update

Author: orengg

Activities/GAScripted.cpp

@@ -107,9 +107,10 @@ int GAScripted::Create(const GAScripted &reference)
 
 int GAScripted::ReadProperty(std::string propName, Reader &reader)
 {
-    if (propName == "ScriptFile")
-        reader >> m_ScriptPath;
-    else if (propName == "LuaClassName")
+	if (propName == "ScriptFile") {
+		reader >> m_ScriptPath;
+		CorrectBackslashesInPaths(m_ScriptPath);
+	} else if (propName == "LuaClassName")
         reader >> m_LuaClassName;
 	else if (propName == "AddPieSlice")
 	{

CHANGELOG.md

@@ -137,7 +137,9 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 
 - GUI sliders (like for music volume) can now be adjusted with the mouse scroll wheel.
 
-- Exposed PEmitter to lua. Bindings are identical to AEmitter's bindings, except that damage-related bindings don't exist for PEmitter.
+- Exposed `PEmitter` to lua. Bindings are identical to `AEmitter` bindings, except that damage-related bindings don't exist for `PEmitter`.
+
+- `FLAC` audio files can now be loaded through lua and ini.
 
 ### Changed
 
@@ -221,17 +223,16 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 
 	**Note:** Changing the game window resolution while an Activity is active requires ending the Activity. A dialog box will appear asking to confirm the change.
 
-- Moved from C-style random number generation to C++ standard. This includes usage of an mt19937 random number generator.  
-	For C++ coders the functions SelectRand, PosRand and RangeRand have been replaced by the function template RandomNum() and its overload RandomNum(T min, T max). The function NormalRand has been replaced by the function template RandomNormalNum(). For lua coders there is no change.
+- Moved from C-style random number generation to C++ standard. This includes usage of a `mt19937` random number generator.
 
 - Resolution validation changed to support multiple screens. Incompatible/bad resolution settings will be overridden at startup with messages explaining the issue.  
 	**Note:** For multi-screen to work properly, the left-most screen MUST be set as primary. Screens having different resolutions does not actually matter but different heights will still be warned about and overridden due to the likeliness of GUI elementes being cropped on the shortest screen.  
 	Resolution validation can be disabled for multi-screen setups with `Settings.ini` property `DisableMultiScreenResolutionValidation`. Bad settings are likely to crash, use at own risk.  
 	For setups with more than 3 screens `DisableMultiScreenResolutionValidation` must be set true.
 
-- Damage to actors from impulses is now relative to their max health instead of being on a scale from 0 to 100.
+- Damage to `Actors` from impulses is now relative to their max health instead of being on a scale from 0 to 100.
 
-- Scenes with a PresetName containing the strings "Test", "Editor" and "Tutorial" are no longer excluded from the scenarios screen and from the metagame.
+- `Scenes` with a `PresetName` containing the strings "Test", "Editor" and "Tutorial" are no longer excluded from the scenarios screen and from the MetaGame.
 
 ### Fixed
 

Entities/GlobalScript.cpp

@@ -61,9 +61,10 @@ int GlobalScript::Create(const GlobalScript &reference)
 
 int GlobalScript::ReadProperty(std::string propName, Reader &reader)
 {
-    if (propName == "ScriptPath")
-        reader >> m_ScriptPath;
-    else if (propName == "LuaClassName")
+	if (propName == "ScriptPath") {
+		reader >> m_ScriptPath;
+		CorrectBackslashesInPaths(m_ScriptPath);
+	} else if (propName == "LuaClassName")
         reader >> m_LuaClassName;
 	else if (propName == "LateUpdate")
 		reader >> m_LateUpdate;

Entities/MovableObject.cpp

@@ -331,13 +331,11 @@ int MovableObject::ReadProperty(std::string propName, Reader &reader)
 		reader >> newSlice;
 		PieMenuGUI::AddAvailableSlice(newSlice);
 	}
-	else if (propName == "ScriptPath")
-    {
-        std::string scriptPath = reader.ReadPropValue();
-        if (LoadScript(scriptPath) == -2) { reader.ReportError("Duplicate script path " + scriptPath); }
-    }
-    else if (propName == "ScreenEffect")
-    {
+	else if (propName == "ScriptPath") {
+		std::string scriptPath = reader.ReadPropValue();
+		CorrectBackslashesInPaths(scriptPath);
+		if (LoadScript(scriptPath) == -2) { reader.ReportError("Duplicate script path " + scriptPath); }
+	} else if (propName == "ScreenEffect") {
         reader >> m_ScreenEffectFile;
         m_pScreenEffect = m_ScreenEffectFile.GetAsBitmap();
 		m_ScreenEffectHash = m_ScreenEffectFile.GetHash();

Main.cpp

@@ -186,6 +186,9 @@ void ReinitMainMenu() {
 	g_pScenarioGUI->Destroy();
 	g_MetaMan.GetGUI()->Destroy();
 
+	g_ConsoleMan.Destroy();
+	g_ConsoleMan.Create();
+
 	InitMainMenu();
 	g_FrameMan.DestroyTempBackBuffers();
 	g_HadResolutionChange = true;

Managers/ConsoleMan.cpp

@@ -33,6 +33,7 @@ namespace RTE {
 		m_InputLogPosition = m_InputLog.begin();
 		m_LastInputString.clear();
 		m_LastLogMove = 0;
+		m_ConsoleTextBackup.clear();
 	}
 
 /////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
@@ -65,24 +66,40 @@ namespace RTE {
 		m_ParentBox->SetEnabled(false);
 		m_ParentBox->SetVisible(false);
 
-		m_ConsoleText->SetText("- RTE Lua Console -\nSee the Data Realms Wiki for commands: http://www.datarealms.com/wiki/\nPress F1 for a list of helpful shortcuts\n-------------------------------------");
+		if (!g_FrameMan.ResolutionChanged()) {
+			m_ConsoleText->SetText("- RTE Lua Console -\nSee the Data Realms Wiki for commands: http://www.datarealms.com/wiki/\nPress F1 for a list of helpful shortcuts\n-------------------------------------");
 
-		m_InputLogPosition = m_InputLog.begin();
-		m_LastLogMove = 0;
+			m_InputLogPosition = m_InputLog.begin();
+			m_LastLogMove = 0;
+		} else {
+			m_ConsoleText->SetText(m_ConsoleTextBackup);
+			m_ConsoleTextBackup.clear();
+		}
 
 		return 0;
 	}
 
 /////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 
 	void ConsoleMan::Destroy() {
-		SaveAllText("LogConsole.txt");
+		if (g_FrameMan.ResolutionChanged()) {
+			m_ConsoleTextBackup = m_ConsoleText->GetText();
+		} else {
+			SaveAllText("LogConsole.txt");
+		}
 
 		delete m_GUIControlManager;
 		delete m_GUIInput;
 		delete m_GUIScreen;
 
-		Clear();
+		if (g_FrameMan.ResolutionChanged()) {
+			m_GUIScreen = nullptr;
+			m_GUIInput = nullptr;
+			m_GUIControlManager = nullptr;
+			m_ParentBox = nullptr;
+		} else {
+			Clear();
+		}
 	}
 
 /////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////

Managers/ConsoleMan.h

@@ -176,6 +176,8 @@ namespace RTE {
 		std::string m_LastInputString; //!< Place to save the last worked on input string before deactivating the console.
 		short m_LastLogMove; //!< The last direction the log marker was moved. Needed so that changing directions won't need double tapping.
 
+		std::string m_ConsoleTextBackup; //!< A copy of the whole console text at the time of destruction. Used to restore console text when ConsoleMan is re-created after a resolution change.
+
 	private:
 
 		/// <summary>

Managers/SceneMan.cpp

@@ -437,9 +437,10 @@ void SceneMan::Destroy()
 
 Vector SceneMan::GetSceneDim() const
 {
-    if (m_pCurrentScene)
-        RTEAssert(m_pCurrentScene->GetTerrain() && m_pCurrentScene->GetTerrain()->GetBitmap(), "Trying to get terrain info before there is a scene or terrain!");
-        return m_pCurrentScene->GetDimensions();
+	if (m_pCurrentScene) {
+		RTEAssert(m_pCurrentScene->GetTerrain() && m_pCurrentScene->GetTerrain()->GetBitmap(), "Trying to get terrain info before there is a scene or terrain!");
+		return m_pCurrentScene->GetDimensions();
+	}
     return Vector();
 }
 

Menus/PieMenuGUI.cpp

@@ -191,9 +191,10 @@ int PieMenuGUI::Slice::ReadProperty(std::string propName, Reader &reader)
         reader >> m_Icon;
     else if (propName == "Direction")
         reader >> m_Direction;
-    else if (propName == "ScriptPath")
-        reader >> m_ScriptPath;
-    else if (propName == "FunctionName")
+	else if (propName == "ScriptPath") {
+		reader >> m_ScriptPath;
+		CorrectBackslashesInPaths(m_ScriptPath);
+	} else if (propName == "FunctionName")
         reader >> m_FunctionName;
     else
         return Serializable::ReadProperty(propName, reader);

README.md

@@ -39,7 +39,7 @@ The Linux build uses the meson build system, and builds against system libraries
 
 Dependencies:
 
-* `g++>=8.1` (needs to support c++17)
+* `g++>=8.1` (needs to support c++17 filesystem)
 * `allegro4`
 * `loadpng`
 * `flac`
@@ -48,41 +48,44 @@ Dependencies:
 * `lz4`
 * `libpng`
 * `libX11`
-* `meson>=0.49`
+* `meson>=0.43`
 * `boost>=1.55`
 * `xorg-misc-fonts`
 
 Building:
 
 1. Install Dependencies (see below for some distro-specific instructions)
 
-2. Clone this Source Repository and the [Data Respository](https://github.com/cortex-command-community/Cortex-Command-Community-Project-Data), folder structure doesn't really matter here
+2. Clone this Source Repository and the [Data Respository](https://github.com/cortex-command-community/Cortex-Command-Community-Project-Data)
 
 3. open a terminal in the Source Repository
 
 4. `meson builddir`
 
 5. `cd builddir`
 
-6. `meson compile` or `meson [-j<num of threads>] compile CCCP` if you want a release build
-  If the build fails because of memory shortage you may need to reduce the number of build threads (meson will use all available threads by default) using the `-j<number of threads>` option
+For `meson` versions `>=0.54` (check `meson --version`):
+
+6. `meson compile` for debug build, or `meson compile CCCP` for a release build. If the build fails because of memory shortage you may need to reduce the number of build threads (meson will use all available threads by default) using the `-j<number of threads>` option, if this doesn't help increase your swap size to at least 6Gb
+
+For `meson` versions `<0.54`
+
+6. `ninja` for debug builds, or `ninja CCCP.x86_64` for release builds. Using the `-j<number of threads>` option will also work here.
 
 
 Running:
 
-1. Copy (or link, preferable for quick debug builds) `builddir/CCCP_debug.x86_64` or `builddir/CCCP.x86_64` (depending on if you made a release build) into the **Data Repository**
+1. Copy (or link, might be preferable for testing builds) `builddir/CCCP_debug.x86_64` or `builddir/CCCP.x86_64` (depending on if you made a release build) into the **Data Repository**
 
 2. Copy `Scenes.rte` and `Metagames.rte` from your purchased copy of Cortex Command into **Data Repository**
 
-3. Copy (or link) `libfmod.so.11` from `<Source Repository Root>/external/lib/linux/x86_64` into the **Data Repository**
-
-4. Run `env LD_LIBRARY_PATH=. ./CCCP.x86_64` or `./CCCP_debug.x86_64` in the **Data Repository**
+3. Run `./CCCP.x86_64` or `./CCCP_debug.x86_64` in the **Data Repository**
 
 ### Arch Linux ###
 `# pacman -S allegro4 flac luajit minizip lz4 libpng libx11 meson xorg-fonts-misc`
 
 ### Ubuntu ###
-`# apt-get install liballegro4.4 libloadpng4-dev libflac++-dev luajit-5.1-dev libminizip-dev liblz4-dev libpng++-dev libx11-dev meson`
+`# apt-get install liballegro4-dev libloadpng4-dev libflac++-dev luajit-5.1-dev libminizip-dev liblz4-dev libpng++-dev libx11-dev meson`
 
 ### Troubleshooting ###
 Until borderless windows are implemented, you might seem get stuck in fullscreen mode. Try Alt-Return, or if that doesn't work kill CC with ctrl-alt-end.