Changed FrameMan methods that took strings to take const string references

Made PerformanceMan global pitch setting pass no parameters so it won't affect immobile sounds or music
Snuck in a little change to default settings so loading screen defaults to off for speed purposes

Author: garethyr

Managers/FrameMan.cpp

@@ -438,13 +438,13 @@ namespace RTE {
 
 /////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 
-	unsigned short FrameMan::CalculateTextHeight(std::string text, unsigned short maxWidth, bool isSmall) {
+	unsigned short FrameMan::CalculateTextHeight(const std::string &text, unsigned short maxWidth, bool isSmall) {
 		return isSmall ? GetSmallFont()->CalculateHeight(text, maxWidth) : GetLargeFont()->CalculateHeight(text, maxWidth);
 	}
 
 /////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 
-	unsigned short FrameMan::CalculateTextWidth(std::string text, bool isSmall) {
+	unsigned short FrameMan::CalculateTextWidth(const std::string &text, bool isSmall) {
 		return isSmall ? GetSmallFont()->CalculateWidth(text) : GetLargeFont()->CalculateWidth(text);
 	}
 
@@ -522,7 +522,7 @@ namespace RTE {
 
 /////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 
-	bool FrameMan::LoadPalette(std::string palettePath) {
+	bool FrameMan::LoadPalette(const std::string &palettePath) {
 		PALETTE newPalette;
 		BITMAP *tempBitmap = load_bitmap(palettePath.c_str(), newPalette);
 		RTEAssert(tempBitmap, ("Failed to load palette from bitmap with following path:\n\n" + palettePath).c_str());

Managers/FrameMan.h

@@ -279,7 +279,7 @@ namespace RTE {
 		/// <param name="text">Text string.</param>
 		/// <param name="isSmall">Whether to use small or large font.</param>
 		/// <returns>Width of the text string.</returns>
-		unsigned short CalculateTextWidth(std::string text, bool isSmall);
+		unsigned short CalculateTextWidth(const std::string &text, bool isSmall);
 
 		/// <summary>
 		/// Calculates the height of a text string using the given font size.
@@ -288,7 +288,7 @@ namespace RTE {
 		/// <param name="maxWidth">Maximum width of the text string.</param>
 		/// <param name="isSmall">Whether to use small or large font.</param>
 		/// <returns>Height of the text string.</returns>
-		unsigned short CalculateTextHeight(std::string text, unsigned short maxWidth, bool isSmall);
+		unsigned short CalculateTextHeight(const std::string &text, unsigned short maxWidth, bool isSmall);
 
 		/// <summary>
 		/// Gets the message to be displayed on top of each player's screen.
@@ -486,7 +486,7 @@ namespace RTE {
 		/// </summary>
 		/// <param name="palettePath">String with the path to the palette bitmap file.</param>
 		/// <returns>Whether palette loaded successfully or not.</returns>
-		bool LoadPalette(std::string palettePath);
+		bool LoadPalette(const std::string &palettePath);
 
 		/// <summary>
 		/// Gets the ContentFile describing the location of the color palette.

Managers/PerformanceMan.cpp

@@ -83,7 +83,7 @@ namespace RTE {
 			// Soften the ratio of the pitch adjustment so it's not such an extreme effect on the audio
 			// TODO: This coefficient should probably move to SettingsMan and be loaded from ini. That way this effect can be lessened or even turned off entirely by users. 0.35 is a good default value though.
 			float pitch = m_SimSpeed + (1.0F - m_SimSpeed) * 0.35;
-			g_AudioMan.SetGlobalPitch(pitch, true);
+			g_AudioMan.SetGlobalPitch(pitch);
 		} else {
 			m_SimSpeed = 1.0;
 		}

Managers/SettingsMan.cpp

@@ -80,7 +80,7 @@ void SettingsMan::Clear()
 	m_ServerBoxHeight = 44;
 
 	m_UseNATService = false;
-	m_DisableLoadingScreen = false;
+	m_DisableLoadingScreen = true;
 }