Merge branch 'development' into FrameMan-Breakdown

Author: MaximDude

CHANGELOG.md

@@ -5,25 +5,65 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
 ## [Unreleased]
+
 ### Added
 
-- Lua binding for Box::IntersectsBox(otherBox), that returns true if 2 boxes intersect.
+- Lua binding for `Box::IntersectsBox(otherBox)`, that returns true if 2 boxes intersect.
+
+- Command line arguments for launching directly into editors using `-editor "EditorName"`.
+Valid editor names are: `ActorEditor`, `GibEditor`, `SceneEditor`, `AreaEditor` and `AssemblyEditor`.
+
+- Added handling for custom number and string values in INI.
+	```
+	AddCustomValue = NumberValue
+		YourKeyName = YourNumberValue // Integer or floating point number.
+	
+	AddCustomValue = StringValue
+		YourKeyName = YourStringValue
+	```
+	`YourKeyName` is a string value and is not limited to just numbers.
 
 ### Changed
 
+- Codebase now uses the C++14 standard.
+
+- Major cleanup and reformatting in the `System` folder.
+
 - Upgraded to new, modern FMOD audio library. Sounds now play in 3D space, so they pan to the left and right, and attenuate automatically based on the player's viewpoint. ([Issue #72](https://github.com/cortex-command-community/Cortex-Command-Community-Project-Source/issues/72))
 
-- Sounds have been renamed to SoundContainers, and are able to handle multiple sounds playing at once. INI definitions have changed accordingly. They must be added using `... = SoundContainer`, and individual sounds for them must be added using `AddSound = ContentFile...`
+- `Sound`s have been renamed to `SoundContainer`s, and are able to handle multiple sounds playing at once. INI definitions have changed accordingly. 
+They must be added using `... = SoundContainer`, and individual sounds for them must be added using `AddSound = ContentFile...`
 
 - Various lua bindings around audio have been upgraded, changed or fixed, giving modders a lot more control over sounds. See documentation for more details.
 
-### Removed
+- Centered the loading splash screen image when `DisableLoadingScreen` is true.
+
+- `Box:WithinBox` lua bindings have been renamed.
+`Box:WithinBox` is now `Box:IsWithinBox`.
+`Box:WithinBoxX` is now `Box:IsWithinBoxX`.
+`Box:WithinBoxY` is now `Box:IsWithinBoxY`.
+
+- Made `AHuman` show both weapon ammo states when 2 one-handed weapons are equipped.
 
 ### Fixed
 
+- Fixed LuaBind being all sorts of messed up. All lua bindings now work properly like they were before updating to the v141 toolset.
+
 - Explosives (and other thrown devices) will no longer reset their explosion triggering timer when they're picked up. ([Issue #71](https://github.com/cortex-command-community/Cortex-Command-Community-Project-Source/issues/71))
 
-- Sprite Animation Mode ALWAYSPINGPONG now works properly. Sprite animation has also been moved to MOSprite instead of MOSRotating, they they'll be able to properly animate now. ([Issue#77](https://github.com/cortex-command-community/Cortex-Command-Community-Project-Source/issues/77))
+- Sprite Animation Mode `ALWAYSPINGPONG` now works properly. Sprite animation has also been moved to `MOSprite` instead of `MOSRotating`, they they'll be able to properly animate now. ([Issue#77](https://github.com/cortex-command-community/Cortex-Command-Community-Project-Source/issues/77))
+
+- Fixed `BG Arm` flailing when reloading one-handed weapon, so shields are no longer so useless.
+
+### Removed
+
+- Removed all Gorilla Audio and SDL Mixer related code and files.
+
+- Removed all Steam Workshop and Achievement related code.
+
+- Removed a bunch of outdated/unused sources in the repo.
+
+- Removed all OSX/Linux related code and files because we don't care. See [Liberated Cortex](https://github.com/liberated-cortex) for working Linux port.
 
 ***
 
@@ -78,16 +118,6 @@ Removing wounds remains the same as before.
 
 - Built-in Actor angular velocity reduction on death has been lessened.
 
-### Removed
-
-- All licensing-related code has been removed since it's no longer needed.
-
-- Wounds can no longer be added via ini, as used to be doable buggily through ini `AddEmitter`.
-
-- All usage of the outdated Slick Profiler has been removed.
-
-- `TDExplosive.ParticleNumberToAdd` property has been removed.
-
 ### Fixed
 
 - SFX slider now works properly.
@@ -104,6 +134,17 @@ Removing wounds remains the same as before.
 
 - Various minor other things that have gotten lost in the shuffle.
 
+
+### Removed
+
+- All licensing-related code has been removed since it's no longer needed.
+
+- Wounds can no longer be added via ini, as used to be doable buggily through ini `AddEmitter`.
+
+- All usage of the outdated Slick Profiler has been removed.
+
+- `TDExplosive.ParticleNumberToAdd` property has been removed.
+
 ***
 
 Note: For a log of changes made prior to the commencement of the open source community project, look [here.](https://github.com/cortex-command-community/Cortex-Command-Community-Project-Source/wiki/Previous-Closed-Source-Changelog)

Entities/AHuman.cpp

@@ -3410,8 +3410,9 @@ void AHuman::Update()
             if (!pDevice->IsFull() && m_Controller.IsState(WEAPON_RELOAD) && !m_pItemInReach)
             {
                 pDevice->Reload();
-                if (m_pBGArm && m_pBGArm->IsAttached())
+                if (m_pBGArm && m_pBGArm->IsAttached() && GetEquippedBGItem() == NULL) {
                     m_pBGArm->SetHandPos(m_Pos + m_HolsterOffset.GetXFlipped(m_HFlipped));
+                }
                 m_DeviceSwitchSound.Play(m_Pos);
 
                 // Interrupt sharp aiming
@@ -3422,15 +3423,17 @@ void AHuman::Update()
             // Detect reloading and move hand accordingly
             if (pDevice->IsReloading())
             {
-                if (m_pBGArm && m_pBGArm->IsAttached())
+                if (m_pBGArm && m_pBGArm->IsAttached() && GetEquippedBGItem() == NULL) {
                     m_pBGArm->SetHandPos(m_Pos + m_HolsterOffset.GetXFlipped(m_HFlipped));
+                }
             }
 
             // Detect reloading being completed and move hand accordingly
             if (pDevice->DoneReloading())
             {
-                if (m_pBGArm && m_pBGArm->IsAttached())
+                if (m_pBGArm && m_pBGArm->IsAttached() && GetEquippedBGItem() == NULL) {
                     m_pBGArm->SetHandPos(pDevice->GetMagazinePos());
+                }
             }
         }
     }
@@ -4905,16 +4908,20 @@ void AHuman::DrawHUD(BITMAP *pTargetBitmap, const Vector &targetPos, int whichSc
             // Ammo
             if (pHeldFirearm)
             {
+                MovableObject *bgHeldItem = GetEquippedBGItem();
+                HDFirearm const *bgHeldFirearm = bgHeldItem == NULL ? NULL : dynamic_cast<HDFirearm *>(bgHeldItem);
+
                 str[0] = -56; str[1] = 0;
                 pSymbolFont->DrawAligned(&allegroBitmap, drawPos.m_X - 10, drawPos.m_Y + m_HUDStack, str, GUIFont::Left);
-                if (pHeldFirearm->IsReloading())
-                    sprintf_s(str, sizeof(str), "%s", "Reloading...");
-                else
-                {
-                    if (pHeldFirearm->GetRoundInMagCount() < 0)
-                        sprintf_s(str, sizeof(str), "%s", "Infinite");
-                    else
-                        sprintf_s(str, sizeof(str), "%i", pHeldFirearm->GetRoundInMagCount());
+                std::string fgWeaponString = pHeldFirearm->GetRoundInMagCount() < 0 ? "Infinite" : std::to_string(pHeldFirearm->GetRoundInMagCount());
+                fgWeaponString = pHeldFirearm->IsReloading() ? "Reloading" : fgWeaponString;
+
+                if (bgHeldItem && bgHeldFirearm) {
+                    std::string bgWeaponString = bgHeldFirearm->GetRoundInMagCount() < 0 ? "Infinite" : std::to_string(bgHeldFirearm->GetRoundInMagCount());
+                    bgWeaponString = bgHeldFirearm->IsReloading() ? "Reloading" : bgWeaponString;
+                    sprintf_s(str, sizeof(str), "%s | %s", fgWeaponString.c_str(), bgWeaponString.c_str());
+                } else {
+                    sprintf_s(str, sizeof(str), "%s", fgWeaponString.c_str());
                 }
                 pSmallFont->DrawAligned(&allegroBitmap, drawPos.m_X - 0, drawPos.m_Y + m_HUDStack + 3, str, GUIFont::Left);
 

Entities/HDFirearm.h

@@ -587,7 +587,7 @@ ENTITYALLOCATION(HDFirearm)
 // Arguments:       None.
 // Return value:    Whetehr being reloaded.
 
-    virtual bool IsReloading() { return m_Reloading; }
+    virtual bool IsReloading() const { return m_Reloading; }
 
 
 //////////////////////////////////////////////////////////////////////////////////////////

Entities/MOSRotating.cpp

@@ -475,18 +475,38 @@ int MOSRotating::ReadProperty(std::string propName, Reader &reader)
         reader >> m_EffectOnGib;
     else if (propName == "LoudnessOnGib")
         reader >> m_LoudnessOnGib;
-	else if (propName == "DamageMultiplier")
-	{
+	else if (propName == "DamageMultiplier") {
 		reader >> m_DamageMultiplier;
 		m_DamageMultiplierRedefined = true;
-	}
-    else
+    } else if (propName == "AddCustomValue") {
+        ReadCustomValueProperty(reader);
+    } else
         // See if the base class(es) can find a match instead
         return MOSprite::ReadProperty(propName, reader);
 
     return 0;
 }
 
+void MOSRotating::ReadCustomValueProperty(Reader &reader) {
+    std::string customValueType;
+    reader >> customValueType;
+    std::string customKey = reader.ReadPropName();
+    std::string customValue = reader.ReadPropValue();
+    if (customValueType == "NumberValue") {
+        try {
+            SetNumberValue(customKey, std::stod(customValue));
+        } catch (const std::invalid_argument) {
+            reader.ReportError("Tried to read a non-number value for SetNumberValue.");
+        }
+    } else if (customValueType == "StringValue") {
+        SetStringValue(customKey, customValue);
+    } else {
+        reader.ReportError("Invalid CustomValue type " + customValueType);
+    }
+    // Artificially end reading this property since we got all we needed
+    reader.NextProperty();
+}
+
 
 //////////////////////////////////////////////////////////////////////////////////////////
 // Virtual method:  Save

Entities/MOSRotating.h

@@ -1219,6 +1219,12 @@ ENTITYALLOCATION(MOSRotating)
 
     void Clear();
 
+    /// <summary>
+    /// Handles reading for custom values, dealing with the various types of custom values.
+    /// </summary>
+    /// <param name="reader">A Reader lined up to the custom value type to be read.</param>
+    void ReadCustomValueProperty(Reader &reader);
+
 
     // Disallow the use of some implicit methods.
     MOSRotating(const MOSRotating &reference);

System/Controller.cpp

@@ -336,7 +336,7 @@ namespace RTE {
 		}
 
 		// Translate analog aim input into sharp aim control state
-		m_ControlStates[AIM_SHARP] = m_AnalogAim.GetMagnitude() > 0.1 && !m_ControlStates[PIE_MENU_ACTIVE];
+		if (m_AnalogAim.GetMagnitude() > 0.1 && !m_ControlStates[PIE_MENU_ACTIVE]) { m_ControlStates[AIM_SHARP] = true; }	
 
 		// Disable sharp aim while moving - this also helps with keyboard vs mouse fighting when moving and aiming in opposite directions
 		if (m_ControlStates[PRESS_RIGHT] || m_ControlStates[PRESS_LEFT] || m_ControlStates[BODY_JUMPSTART] || (m_ControlStates[PIE_MENU_ACTIVE] && !m_ControlStates[SECONDARY_ACTION])) {