Merge branch 'development' into tracy-fixes

HeliumAnt · HeliumAnt · commit 49f1ca350a12 · 2023-11-07T13:56:09.000+01:00
diff --git a/Entities/Arm.cpp b/Entities/Arm.cpp
@@ -361,8 +361,8 @@ namespace RTE {
 
 	void Arm::UpdateArmFrame() {
 		float halfMaxLength = m_MaxLength / 2.0F;
-		int newFrame = static_cast<unsigned int>((m_HandCurrentOffset.GetMagnitude() - halfMaxLength) / halfMaxLength) * static_cast<float>(m_FrameCount);
-		m_Frame = std::clamp<int>(newFrame, 0, m_FrameCount - 1);
+		float newFrame = std::floor(((m_HandCurrentOffset.GetMagnitude() - halfMaxLength) / halfMaxLength) * static_cast<float>(m_FrameCount));
+		m_Frame = static_cast<unsigned int>(std::clamp(newFrame, 0.0F, static_cast<float>(m_FrameCount - 1)));
 	}
 
 /////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
diff --git a/Lua/LuaAdapterDefinitions.h b/Lua/LuaAdapterDefinitions.h
@@ -360,6 +360,12 @@ namespace RTE {
 	};
 #pragma endregion
 
+#pragma region BuyMenuGUI Lua Adapters
+	struct LuaAdaptersBuyMenuGUI {
+		static std::list<const SceneObject *> * GetOrderList(const BuyMenuGUI *luaSelfObject);
+	};
+#pragma endregion
+
 #pragma region PieMenu Lua Adapters
 	struct LuaAdaptersPieMenu {
 		static bool AddPieSlice(PieMenu *luaSelfObject, PieSlice *pieSliceToAdd, const Entity *pieSliceOriginalSource);
diff --git a/Lua/LuaAdapters.cpp b/Lua/LuaAdapters.cpp
@@ -422,6 +422,14 @@ namespace RTE {
 		}
 	}
 
+/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+
+	std::list<const SceneObject *> * LuaAdaptersBuyMenuGUI::GetOrderList(const BuyMenuGUI *luaSelfObject) {
+		auto* orderList = new std::list<const SceneObject *>();
+		luaSelfObject->GetOrderList(*orderList);
+		return orderList;
+	}
+
 /////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 
 	Attachable * LuaAdaptersAttachable::RemoveFromParent1(Attachable *luaSelfObject) {
diff --git a/Lua/LuaBindingsGUI.cpp b/Lua/LuaBindingsGUI.cpp
@@ -67,7 +67,12 @@ namespace RTE {
 		.def("SetBannerImage", &BuyMenuGUI::SetBannerImage)
 		.def("SetLogoImage", &BuyMenuGUI::SetLogoImage)
 		.def("ClearCartList", &BuyMenuGUI::ClearCartList)
-		.def("LoadDefaultLoadoutToCart", &BuyMenuGUI::LoadDefaultLoadoutToCart);
+		.def("LoadDefaultLoadoutToCart", &BuyMenuGUI::LoadDefaultLoadoutToCart)
+		.def("GetOrderList", &LuaAdaptersBuyMenuGUI::GetOrderList, luabind::adopt(luabind::return_value) + luabind::return_stl_iterator)
+		.def("GetTotalCartCost", &BuyMenuGUI::GetTotalCartCost)
+		.def("GetTotalOrderCost", &BuyMenuGUI::GetTotalOrderCost)
+		.def("GetTotalOrderMass", &BuyMenuGUI::GetTotalOrderMass)
+		.def("GetTotalOrderPassengers", &BuyMenuGUI::GetTotalOrderPassengers);
 	}
 
 /////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
diff --git a/Main.cpp b/Main.cpp
@@ -130,6 +130,7 @@ namespace RTE {
 		g_LuaMan.Destroy();
 		ContentFile::FreeAllLoaded();
 		g_ConsoleMan.Destroy();
+		g_WindowMan.Destroy();
 
 #ifdef DEBUG_BUILD
 		Entity::ClassInfo::DumpPoolMemoryInfo(Writer("MemCleanupInfo.txt"));
diff --git a/Managers/ConsoleMan.cpp b/Managers/ConsoleMan.cpp
@@ -255,7 +255,7 @@ namespace RTE {
 			SetReadOnly();
 		}
 
-		if (!g_UInputMan.FlagShiftState() && (!g_UInputMan.FlagCtrlState() && g_UInputMan.KeyPressed(SDL_SCANCODE_GRAVE))) {
+		if (!g_UInputMan.FlagShiftState() && (!g_UInputMan.FlagCtrlState() && (g_UInputMan.KeyPressed(SDL_SCANCODE_GRAVE) || (IsEnabled() && g_UInputMan.KeyPressed(SDL_SCANCODE_ESCAPE))))) {
 			if (IsEnabled()) {
 				if (!m_ReadOnly) {
 					m_InputTextBox->SetEnabled(false);
diff --git a/Managers/FrameMan.cpp b/Managers/FrameMan.cpp
@@ -510,7 +510,7 @@ namespace RTE {
 		}
 
 		// TODO: Remove this once GCC13 is released and switched to. std::format and std::chrono::time_zone are not part of latest libstdc++.
-#if _LINUX_OR_MACOSX_
+#if defined(__GNUC__) && __GNUC__ < 13
 		std::chrono::time_point now = std::chrono::system_clock::now();
 		time_t currentTime = std::chrono::system_clock::to_time_t(now);
 		tm *localCurrentTime = std::localtime(&currentTime);
@@ -540,7 +540,7 @@ namespace RTE {
 					SaveScreenToBitmap();
 
 					// Make a copy of the buffer because it may be overwritten mid thread and everything will be on fire.
-					BITMAP *outputBitmap = create_bitmap_ex(bitmap_color_depth(m_ScreenDumpBuffer.get()), m_ScreenDumpBuffer->w * g_WindowMan.GetResMultiplier(), m_ScreenDumpBuffer->h * g_WindowMan.GetResMultiplier());
+					BITMAP *outputBitmap = create_bitmap_ex(bitmap_color_depth(m_ScreenDumpBuffer.get()), m_ScreenDumpBuffer->w, m_ScreenDumpBuffer->h);
 					stretch_blit(m_ScreenDumpBuffer.get(), outputBitmap, 0, 0, m_ScreenDumpBuffer->w, m_ScreenDumpBuffer->h, 0, 0, outputBitmap->w, outputBitmap->h);
 
 					auto saveScreenDump = [fullFileName](BITMAP *bitmapToSaveCopy) {
@@ -604,26 +604,10 @@ namespace RTE {
 		if (!m_ScreenDumpBuffer) {
 			return;
 		}
-		int drawSizeX, drawSizeY;
-		SDL_GL_GetDrawableSize(g_WindowMan.GetWindow(), &drawSizeX, &drawSizeY);
-		BITMAP* screenBitmap = create_bitmap_ex(32, drawSizeX, drawSizeY);
-		GL_CHECK(glBindTexture(GL_TEXTURE_2D, 0));
-		GL_CHECK(glBindFramebuffer(GL_FRAMEBUFFER, 0));
-		GL_CHECK(glReadBuffer(GL_FRONT));
-		GL_CHECK(glPixelStorei(GL_PACK_ALIGNMENT, 1));
-		GL_CHECK(glReadPixels(0, 0, screenBitmap->w, screenBitmap->h, GL_RGBA, GL_UNSIGNED_BYTE, screenBitmap->line[0]));
-		GL_CHECK(glReadBuffer(GL_BACK));
-
-		BITMAP* depthBitmap = create_bitmap_ex(bitmap_color_depth(m_ScreenDumpBuffer.get()), screenBitmap->w, screenBitmap->h);
-		blit(screenBitmap, depthBitmap, 0, 0, 0, 0, screenBitmap->w, screenBitmap->h);
-
-		BITMAP* flipBitmap = create_bitmap_ex(bitmap_color_depth(depthBitmap), depthBitmap->w, depthBitmap->h);
-		draw_sprite_v_flip(flipBitmap, depthBitmap, 0, 0);
-
-		stretch_blit(flipBitmap, m_ScreenDumpBuffer.get(), 0, 0, screenBitmap->w, screenBitmap->h, 0, 0, m_ScreenDumpBuffer->w, m_ScreenDumpBuffer->h);
-		destroy_bitmap(screenBitmap);
-		destroy_bitmap(depthBitmap);
-		destroy_bitmap(flipBitmap);
+
+		glBindTexture(GL_TEXTURE_2D, g_WindowMan.GetScreenBufferTexture());
+		glGetTexImage(GL_TEXTURE_2D, 0, GL_RGB, GL_UNSIGNED_BYTE, m_ScreenDumpBuffer->line[0]);
+
 	}
 
 /////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
diff --git a/Managers/PostProcessMan.cpp b/Managers/PostProcessMan.cpp
@@ -534,12 +534,12 @@ namespace RTE {
 				effectStrength = postEffect.m_Strength / 255.f;
 				effectPosX = postEffect.m_Pos.m_X;
 				effectPosY = postEffect.m_Pos.m_Y;
-				m_PostProcessShader->SetVector4f(m_PostProcessShader->GetColorUniform(), glm::vec4(effectStrength));
+				m_PostProcessShader->SetVector4f(m_PostProcessShader->GetColorUniform(), glm::vec4(effectStrength, effectStrength, effectStrength, 1.0f));
 
 				glm::mat4 transformMatrix(1);
 				transformMatrix = glm::translate(transformMatrix, glm::vec3(effectPosX, effectPosY, 0));
-				transformMatrix = glm::scale(transformMatrix, glm::vec3(effectBitmap->w * 0.5f, effectBitmap->h * 0.5f, 1.0));
 				transformMatrix = glm::rotate(transformMatrix, -postEffect.m_Angle, glm::vec3(0, 0, 1));
+				transformMatrix = glm::scale(transformMatrix, glm::vec3(effectBitmap->w * 0.5f, effectBitmap->h * 0.5f, 1.0));
 
 				glBindTexture(GL_TEXTURE_2D, reinterpret_cast<GLBitmapInfo*>(postEffect.m_Bitmap->extra)->m_Texture);
 				m_PostProcessShader->SetMatrix4f(m_PostProcessShader->GetTransformUniform(), transformMatrix);
diff --git a/Managers/PresetMan.cpp b/Managers/PresetMan.cpp
@@ -334,8 +334,12 @@ bool PresetMan::IsModuleUserdata(const std::string &moduleName) const {
 /////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 
 std::string PresetMan::GetFullModulePath(const std::string &modulePath) const {
-	const std::string modulePathGeneric = std::filesystem::path(modulePath).generic_string();
-	const std::string pathTopDir = modulePathGeneric.substr(0, modulePathGeneric.find_first_of("/\\") + 1);
+	// Note: Mods may use mixed path separators, which aren't supported on non Windows systems.
+	// Since Windows supports both forward and backslash separators it's safe to replace all backslashes with forward slashes.
+	std::string modulePathGeneric = std::filesystem::path(modulePath).generic_string();
+	std::replace(modulePathGeneric.begin(), modulePathGeneric.end(), '\\', '/');
+
+	const std::string pathTopDir = modulePathGeneric.substr(0, modulePathGeneric.find_first_of("/") + 1);
 	const std::string moduleName = GetModuleNameFromPath(modulePathGeneric);
 
 	std::string moduleTopDir = System::GetModDirectory();
diff --git a/Managers/UInputMan.cpp b/Managers/UInputMan.cpp
@@ -903,7 +903,6 @@ namespace RTE {
 			}
 			// Ctrl+R or Back button for controllers to reset activity.
 			if (!g_MetaMan.GameInProgress() && !g_ActivityMan.ActivitySetToRestart()) {
-				g_ActivityMan.SetRestartActivity(FlagCtrlState() && KeyPressed(SDLK_r) || AnyBackPress());
 				g_ActivityMan.SetRestartActivity((FlagCtrlState() && KeyPressed(SDLK_r)) || AnyBackPress());
 			}
 			if (g_ActivityMan.ActivitySetToRestart()) {
diff --git a/Managers/WindowMan.cpp b/Managers/WindowMan.cpp
@@ -84,6 +84,14 @@ namespace RTE {
 
 	WindowMan::~WindowMan() = default;
 
+	void WindowMan::Destroy() {
+		glDeleteTextures(1, &m_BackBuffer32Texture);
+		glDeleteBuffers(1, &m_ScreenVBO);
+		glDeleteVertexArrays(1, &m_ScreenVAO);
+		glDeleteTextures(1, &m_ScreenBufferTexture);
+		glDeleteFramebuffers(1, &m_ScreenBufferFBO);
+	}
+
 /////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 
 	void WindowMan::Initialize() {
@@ -205,17 +213,22 @@ namespace RTE {
 		glVertexAttribPointer(1, 2, GL_FLOAT, GL_FALSE, 4 * sizeof(float), (void *)(2 * sizeof(float)));
 		glEnableVertexAttribArray(1);
 		glBindVertexArray(0);
+		glGenTextures(1, &m_BackBuffer32Texture);
+		glGenTextures(1, &m_ScreenBufferTexture);
+		glGenFramebuffers(1, &m_ScreenBufferFBO);
 	}
 
 /////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 
 	void WindowMan::CreateBackBufferTexture() {
-		glDeleteTextures(1, &m_BackBuffer32Texture);
-		glGenTextures(1, &m_BackBuffer32Texture);
 		glBindTexture(GL_TEXTURE_2D, m_BackBuffer32Texture);
 		glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, m_ResX, m_ResY, 0, GL_RGBA, GL_UNSIGNED_BYTE, nullptr);
 		glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
 		glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
+		glBindTexture(GL_TEXTURE_2D, m_ScreenBufferTexture);
+		glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, m_ResX, m_ResY, 0, GL_RGBA, GL_UNSIGNED_BYTE, nullptr);
+		glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
+		glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
 	}
 
 /////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
@@ -724,12 +737,13 @@ namespace RTE {
 
 	void WindowMan::UploadFrame() {
 		glDisable(GL_DEPTH_TEST);
-		GL_CHECK(glBindFramebuffer(GL_FRAMEBUFFER, 0));
-		GL_CHECK(glActiveTexture(GL_TEXTURE0));
 
-		int windowW, windowH;
-		SDL_GL_GetDrawableSize(m_PrimaryWindow.get(), &windowW, &windowH);
-		GL_CHECK(glViewport(0, 0, windowW, windowH));
+		GL_CHECK(glBindFramebuffer(GL_FRAMEBUFFER, m_ScreenBufferFBO));
+		GL_CHECK(glFramebufferTexture2D(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, GL_TEXTURE_2D, m_ScreenBufferTexture, 0));
+		GL_CHECK(glClearColor(0.0f, 0.0f, 0.0f, 1.0f));
+		GL_CHECK(glClear(GL_COLOR_BUFFER_BIT));
+		GL_CHECK(glActiveTexture(GL_TEXTURE0));
+		glViewport(0, 0, m_ResX, m_ResY);
 
 		glEnable(GL_BLEND);
 		if (m_DrawPostProcessBuffer) {
@@ -750,9 +764,16 @@ namespace RTE {
 		m_ScreenBlitShader->Use();
 		m_ScreenBlitShader->SetInt(m_ScreenBlitShader->GetTextureUniform(), 0);
 		m_ScreenBlitShader->SetInt(m_ScreenBlitShader->GetUniformLocation("rteGUITexture"), 1);
+		m_ScreenBlitShader->SetMatrix4f(m_ScreenBlitShader->GetProjectionUniform(), glm::mat4(1.0f));
+		m_ScreenBlitShader->SetMatrix4f(m_ScreenBlitShader->GetTransformUniform(), glm::scale(glm::mat4(1.0f), {1.0f, -1.0f, 1.0f}));
+		GL_CHECK(glDrawArrays(GL_TRIANGLE_STRIP, 0, 4));
+		GL_CHECK(glBindFramebuffer(GL_FRAMEBUFFER, 0));
+		GL_CHECK(glActiveTexture(GL_TEXTURE0));
+		GL_CHECK(glBindTexture(GL_TEXTURE_2D, 0));
+		GL_CHECK(glActiveTexture(GL_TEXTURE1));
+		GL_CHECK(glBindTexture(GL_TEXTURE_2D, m_ScreenBufferTexture));
 		if (m_MultiDisplayWindows.empty()) {
 			glViewport(m_PrimaryWindowViewport->x, m_PrimaryWindowViewport->y, m_PrimaryWindowViewport->w, m_PrimaryWindowViewport->h);
-			m_ScreenBlitShader->SetMatrix4f(m_ScreenBlitShader->GetProjectionUniform(), glm::mat4(1.0f));
 			m_ScreenBlitShader->SetMatrix4f(m_ScreenBlitShader->GetTransformUniform(), glm::mat4(1.0f));
 			GL_CHECK(glDrawArrays(GL_TRIANGLE_STRIP, 0, 4));
 			SDL_GL_SwapWindow(m_PrimaryWindow.get());
diff --git a/Managers/WindowMan.h b/Managers/WindowMan.h
@@ -59,6 +59,11 @@ namespace RTE {
 		/// Destructor method used to clean up a WindowMan object before deletion from system memory.
 		/// </summary>
 		~WindowMan();
+
+		/// <summary>
+		/// Clean up GL pointers.
+		/// </summary>
+		void Destroy();
 #pragma endregion
 
 #pragma region Getters and Setters
@@ -164,6 +169,12 @@ namespace RTE {
 		/// </summary>
 		/// <returns>The absolute top-most position in the OS display arrangement.</returns>
 		int GetDisplayArrangementAbsOffsetY() const { return std::abs(m_DisplayArrangementTopMostOffset); }
+
+		/// <summary>
+		/// Get the screen buffer texture.
+		/// </summary>
+		/// <returns>The screen buffer texture.</returns>
+		GLuint GetScreenBufferTexture() const { return m_ScreenBufferTexture; }
 #pragma endregion
 
 #pragma region Resolution Change Handling
@@ -247,7 +258,9 @@ namespace RTE {
 		bool m_FocusEventsDispatchedByDisplaySwitchIn; //!< Whether queued events were dispatched due to raising windows when taking focus of any game window in the previous update.
 
 		std::shared_ptr<SDL_Window> m_PrimaryWindow; //!< The main window.
-		GLuint m_BackBuffer32Texture; //!< The main window renderer's drawing surface.
+		GLuint m_BackBuffer32Texture; //!< Streaming texture for the software rendered stuff.
+		GLuint m_ScreenBufferTexture; //!< Internal backbuffer for the final blit and sceenshots, only clear immediately before drawing.
+		GLuint m_ScreenBufferFBO; //!< Framebuffer object for the screen buffer texture.
 		glm::mat4 m_PrimaryWindowProjection; //!< Projection Matrix for the main window.
 		std::unique_ptr<SDL_Rect> m_PrimaryWindowViewport; //!< Viewport for the main window.
 
diff --git a/Menus/BuyMenuGUI.cpp b/Menus/BuyMenuGUI.cpp
@@ -706,7 +706,7 @@ void BuyMenuGUI::SetModuleExpanded(int whichModule, bool expanded)
 //////////////////////////////////////////////////////////////////////////////////////////
 // Description:     Return the list of things currently in the purchase order list box.
 
-bool BuyMenuGUI::GetOrderList(std::list<const SceneObject *> &listToFill)
+bool BuyMenuGUI::GetOrderList(std::list<const SceneObject *> &listToFill) const
 {
     if (m_pCartList->GetItemList()->empty())
         return false;
@@ -736,12 +736,7 @@ bool BuyMenuGUI::CommitPurchase(std::string presetName)
 	return false;
 }
 
-//////////////////////////////////////////////////////////////////////////////////////////
-// Method:          GetTotalOrderCost
-//////////////////////////////////////////////////////////////////////////////////////////
-// Description:     Return teh total cost of everything listed in the order box.
-
-float BuyMenuGUI::GetTotalOrderCost()
+float BuyMenuGUI::GetTotalCost(bool includeDelivery) const
 {
 	float totalCost = 0;
 
@@ -759,7 +754,8 @@ float BuyMenuGUI::GetTotalOrderCost()
 			else
 				orderedItems[presetName] += 1;
 
-			if (m_OwnedItems.find(presetName) != m_OwnedItems.end() && m_OwnedItems[presetName] >= orderedItems[presetName])
+            auto itrFound = m_OwnedItems.find(presetName);
+			if (itrFound != m_OwnedItems.end() && itrFound->second >= orderedItems[presetName])
 				needsToBePaid = false;
 
 			if (needsToBePaid)
@@ -768,7 +764,7 @@ float BuyMenuGUI::GetTotalOrderCost()
 			}
 		}
 
-		if (m_pSelectedCraft)
+		if (m_pSelectedCraft && includeDelivery)
 		{
 			bool needsToBePaid = true;
             std::string presetName = m_pSelectedCraft->GetModuleAndPresetName();
@@ -778,7 +774,8 @@ float BuyMenuGUI::GetTotalOrderCost()
 			else
 				orderedItems[presetName] += 1;
 
-			if (m_OwnedItems.find(presetName) != m_OwnedItems.end() && m_OwnedItems[presetName] >= orderedItems[presetName])
+            auto itrFound = m_OwnedItems.find(presetName);
+			if (itrFound != m_OwnedItems.end() && itrFound->second >= orderedItems[presetName])
 				needsToBePaid = false;
 
 			if (needsToBePaid)
@@ -793,7 +790,7 @@ float BuyMenuGUI::GetTotalOrderCost()
 			totalCost += dynamic_cast<const MOSprite *>((*itr)->m_pEntity)->GetGoldValue(m_NativeTechModule, m_ForeignCostMult);
 
 		// Add the delivery craft's cost
-		if (m_pSelectedCraft)
+		if (m_pSelectedCraft && includeDelivery)
 		{
 			totalCost += dynamic_cast<const MOSprite *>(m_pSelectedCraft)->GetGoldValue(m_NativeTechModule, m_ForeignCostMult);
 		}
diff --git a/Menus/BuyMenuGUI.h b/Menus/BuyMenuGUI.h
@@ -261,7 +261,7 @@ class BuyMenuGUI {
 // Return value:    Whetehr any items were put in the list at all. false if there are no
 //                  items in the order listbox.
 
-    bool GetOrderList(std::list<const SceneObject *> &listToFill);
+    bool GetOrderList(std::list<const SceneObject *> &listToFill) const;
 
 
 //////////////////////////////////////////////////////////////////////////////////////////
@@ -295,14 +295,32 @@ class BuyMenuGUI {
     const SceneObject * GetDeliveryCraftPreset() { return m_pSelectedCraft; }
 
 
+//////////////////////////////////////////////////////////////////////////////////////////
+// Method:          GetTotalCost
+//////////////////////////////////////////////////////////////////////////////////////////
+// Description:     Return the total cost of everything listed in the order box.
+// Arguments:       Whether or not to include delivery cost.
+// Return value:    The total cost in ounces of gold.
+
+    float GetTotalCost(bool includeDelivery = true) const;
+
 //////////////////////////////////////////////////////////////////////////////////////////
 // Method:          GetTotalOrderCost
 //////////////////////////////////////////////////////////////////////////////////////////
-// Description:     Return teh total cost of everything listed in the order box.
+// Description:     Return the total cost of everything listed in the order box, including delivery costs.
+// Arguments:       None.
+// Return value:    The total cost in ounces of gold.
+
+    float GetTotalOrderCost() const { return GetTotalCost(true); };
+
+//////////////////////////////////////////////////////////////////////////////////////////
+// Method:          GetTotalCartCost
+//////////////////////////////////////////////////////////////////////////////////////////
+// Description:     Return the total cost of everything listed in the order box, excluding delivery costs.
 // Arguments:       None.
 // Return value:    The total cost in ounces of gold.
 
-    float GetTotalOrderCost();
+    float GetTotalCartCost() const { return GetTotalCost(false); }
 
 
 	/// <summary>
diff --git a/System/RTEError.cpp b/System/RTEError.cpp

Original file line number	Diff line number	Diff line change
`@@ -361,8 +361,8 @@ namespace RTE {`
`361`	`361`
`362`	`362`	`void Arm::UpdateArmFrame() {`
`363`	`363`	`float halfMaxLength = m_MaxLength / 2.0F;`
`364`		`- int newFrame = static_cast<unsigned int>((m_HandCurrentOffset.GetMagnitude() - halfMaxLength) / halfMaxLength) * static_cast<float>(m_FrameCount);`
`365`		`- m_Frame = std::clamp<int>(newFrame, 0, m_FrameCount - 1);`
	`364`	`+ float newFrame = std::floor(((m_HandCurrentOffset.GetMagnitude() - halfMaxLength) / halfMaxLength) * static_cast<float>(m_FrameCount));`
	`365`	`+ m_Frame = static_cast<unsigned int>(std::clamp(newFrame, 0.0F, static_cast<float>(m_FrameCount - 1)));`
`366`	`366`	`}`
`367`	`367`
`368`	`368`	`/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////`
Original file line number	Diff line number	Diff line change
`@@ -422,6 +422,14 @@ namespace RTE {`
`422`	`422`	`}`
`423`	`423`	`}`
`424`	`424`
	`425`	`+/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////`
	`426`	`+`
	`427`	`+ std::list<const SceneObject > LuaAdaptersBuyMenuGUI::GetOrderList(const BuyMenuGUI *luaSelfObject) {`
	`428`	`+ auto* orderList = new std::list<const SceneObject *>();`
	`429`	`+ luaSelfObject->GetOrderList(*orderList);`
	`430`	`+ return orderList;`
	`431`	`+ }`
	`432`	`+`
`425`	`433`	`/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////`
`426`	`434`
`427`	`435`	`Attachable * LuaAdaptersAttachable::RemoveFromParent1(Attachable *luaSelfObject) {`
Original file line number	Diff line number	Diff line change
`@@ -255,7 +255,7 @@ namespace RTE {`
`255`	`255`	`SetReadOnly();`
`256`	`256`	`}`
`257`	`257`
`258`		`- if (!g_UInputMan.FlagShiftState() && (!g_UInputMan.FlagCtrlState() && g_UInputMan.KeyPressed(SDL_SCANCODE_GRAVE))) {`
	`258`	`+ if (!g_UInputMan.FlagShiftState() && (!g_UInputMan.FlagCtrlState() && (g_UInputMan.KeyPressed(SDL_SCANCODE_GRAVE) \|\| (IsEnabled() && g_UInputMan.KeyPressed(SDL_SCANCODE_ESCAPE))))) {`
`259`	`259`	`if (IsEnabled()) {`
`260`	`260`	`if (!m_ReadOnly) {`
`261`	`261`	`m_InputTextBox->SetEnabled(false);`
Original file line number	Diff line number	Diff line change
`@@ -903,7 +903,6 @@ namespace RTE {`
`903`	`903`	`}`
`904`	`904`	`// Ctrl+R or Back button for controllers to reset activity.`
`905`	`905`	`if (!g_MetaMan.GameInProgress() && !g_ActivityMan.ActivitySetToRestart()) {`
`906`		`- g_ActivityMan.SetRestartActivity(FlagCtrlState() && KeyPressed(SDLK_r) \|\| AnyBackPress());`
`907`	`906`	`g_ActivityMan.SetRestartActivity((FlagCtrlState() && KeyPressed(SDLK_r)) \|\| AnyBackPress());`
`908`	`907`	`}`
`909`	`908`	`if (g_ActivityMan.ActivitySetToRestart()) {`