Merge branch 'development' into CF112-FMOD-Fixes

# Conflicts:
#	System/ContentFile.h - No real conflict I guess

Author: garethyr

.gitignore

@@ -17,3 +17,4 @@ compile_commands.json
 /NATPunchServer/Server/NATCompleteServer/Release
 /Documentation/Doxygen/Output
 MemCleanupInfo.txt
+RTEA.vcxproj.user

Activities/MultiplayerServerLobby.cpp

@@ -342,7 +342,7 @@ namespace RTE {
 		m_pScenePreviewBitmap = create_bitmap_ex(8, Scene::PREVIEW_WIDTH, Scene::PREVIEW_HEIGHT);
 
 		ContentFile defaultPreview("Base.rte/GUIs/DefaultPreview.png");
-		m_pDefaultPreviewBitmap = defaultPreview.LoadAndReleaseBitmap();
+		m_pDefaultPreviewBitmap = defaultPreview.GetAsBitmap(COLORCONV_NONE, false);
 
 		clear_to_color(m_pScenePreviewBitmap, g_MaskColor);
 

CHANGELOG.md

@@ -141,6 +141,8 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 
 - `FLAC` audio files can now be loaded through lua and ini.
 
+- Added new lua `Vector` functions: `GetRadRotated(angle)` and `GetDegRotated(angle)`. They return a rotated copy of the vector without modifying it.
+
 ### Changed
 
 - Codebase now uses the C++17 standard.
@@ -256,6 +258,8 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 
 - The "woosh" sound played when switching actors from a distance will now take scene wrapping into account. Additionally, attempting to switch to previous or next actor with only one actor will play the more correct "error" sound.
 
+- Pressing escape at the options, mod manager, game editors and credits screens no longer quits the game.
+
 ### Removed
 
 - Removed the ability to remove scripts from objects with Lua. This is no longer needed cause of code efficiency increases.

Entities/AtomGroup.cpp

@@ -1008,7 +1008,10 @@ namespace RTE {
 							if (hitMOID != g_NoMOID) {
 								hitData.Body[HITOR] = m_OwnerMOSR;
 								hitData.Body[HITEE] = g_MovableMan.GetMOFromID(hitMOID);
+
+#ifndef RELEASE_BUILD
 								RTEAssert(hitData.Body[HITEE], "Hitee MO is 0 in AtomGroup::PushTravel!");
+#endif
 
 								hitData.Body[HITEE]->CollideAtPoint(hitData);
 

Entities/Attachable.cpp

@@ -300,7 +300,7 @@ void Attachable::Detach()
 	// Since it's no longer atteched it should belong to itself
 	m_RootMOID = m_MOID;
 
-#if defined DEBUG_BUILD || defined MIN_DEBUG_BUILD
+#ifndef RELEASE_BUILD
 	RTEAssert(m_RootMOID == g_NoMOID || (m_RootMOID >= 0 && m_RootMOID < g_MovableMan.GetMOIDCount()), "MOID out of bounds!");
 	RTEAssert(m_MOID == g_NoMOID || (m_MOID >= 0 && m_MOID < g_MovableMan.GetMOIDCount()), "MOID out of bounds!");
 #endif

Entities/HDFirearm.cpp

@@ -800,7 +800,7 @@ void HDFirearm::Update()
                         (m_Supported ? 1.0F : m_NoSupportFactor) * RandomNormalNum();
                 tempNozzle = m_MuzzleOff.GetYFlipped(m_HFlipped);
                 tempNozzle.DegRotate(degAimAngle + shake);
-                roundVel.SetIntXY(pRound->GetFireVel(), 0);
+                roundVel.SetXY(pRound->GetFireVel(), 0);
                 roundVel.DegRotate(degAimAngle + shake);
 
                 Vector particlePos;
@@ -864,7 +864,7 @@ void HDFirearm::Update()
                     pShell->SetPos(m_Pos + tempEject);
 
                     // ##@#@@$ TEMP
-                    shellVel.SetIntXY(pRound->GetShellVel(), 0);
+                    shellVel.SetXY(pRound->GetShellVel(), 0);
                     shellVel.DegRotate(degAimAngle + 150 * (m_HFlipped ? -1 : 1) + shellSpread);
                     pShell->SetVel(m_Vel + shellVel);
                     pShell->SetRotAngle(m_Rotation.GetRadAngle());

Entities/MOSRotating.cpp

@@ -1497,7 +1497,7 @@ void MOSRotating::PostTravel()
 void MOSRotating::Update()
 {
 
-#if defined DEBUG_BUILD || defined MIN_DEBUG_BUILD
+#ifndef RELEASE_BUILD
 	RTEAssert(m_MOID == g_NoMOID || (m_MOID >= 0 && m_MOID < g_MovableMan.GetMOIDCount()), "MOID out of bounds!");
 #endif
 

Entities/MovableObject.h

@@ -1093,8 +1093,12 @@ friend class Atom;
 // Return value:    None.
 
 	void AddImpulseForce(const Vector &impulse, const Vector &offset = Vector()) {
+
+#ifndef RELEASE_BUILD
 		RTEAssert(impulse.GetLargest() < 500000, "HUEG IMPULSE FORCE");
 		RTEAssert(offset.GetLargest() < 5000, "HUEG IMPULSE FORCE OFFSET");
+#endif
+
 		m_ImpulseForces.push_back(std::make_pair(impulse, offset));
 	}
 
@@ -1111,7 +1115,11 @@ friend class Atom;
 // Return value:    None.
 
 	void AddAbsImpulseForce(const Vector &impulse, const Vector &absPos) {
+
+#ifndef RELEASE_BUILD
 		RTEAssert(impulse.GetLargest() < 500000, "HUEG IMPULSE FORCE");
+#endif
+
 		m_ImpulseForces.push_back(std::make_pair(impulse, g_SceneMan.ShortestDistance(m_Pos, absPos) * c_MPP));
 	}
 

Entities/SLTerrain.cpp

@@ -1120,7 +1120,7 @@ void SLTerrain::ApplyMovableObject(MovableObject *pMObject)
             pTempBitmap = m_spTempBitmap16;
 
         // The position of the upper left corner of the temporary bitmap in the scene
-        Vector bitmapScroll = pMOSprite->GetPos().GetFloored() - (pTempBitmap->w / 2);
+        Vector bitmapScroll = pMOSprite->GetPos().GetFloored() - Vector(pTempBitmap->w / 2, pTempBitmap->w / 2);
 
 		Box notUsed;
 

Entities/Scene.cpp

@@ -1309,7 +1309,7 @@ int Scene::ReadProperty(std::string propName, Reader &reader)
     else if (propName == "PreviewBitmapFile")
 	{
         reader >> m_PreviewBitmapFile;
-		m_pPreviewBitmap = m_PreviewBitmapFile.LoadAndReleaseBitmap();
+		m_pPreviewBitmap = m_PreviewBitmapFile.GetAsBitmap(COLORCONV_NONE, false);
 	}
     else if (propName == "Terrain")
     {