Added consts to a bunch methods - if any of them are wrong please remove them

Author: MaximDude

Entities/SoundContainer.cpp

@@ -171,7 +171,7 @@ namespace RTE {
 
 /////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 
-	std::vector<size_t> SoundContainer::GetSelectedSoundHashes() {
+	std::vector<size_t> SoundContainer::GetSelectedSoundHashes() const {
 		std::vector<size_t> soundHashes;
 		for (SoundData selectedSoundData : m_SoundSets[m_SelectedSoundSet]) {
 			soundHashes.push_back(selectedSoundData.SoundFile.GetHash());

Entities/SoundContainer.h

@@ -187,7 +187,7 @@ namespace RTE {
 		/// Indicates whether any sound in this SoundContainer is currently being played.
 		/// </summary>
 		/// <returns>Whether any sounds are playing.</returns>
-		bool IsBeingPlayed() { return m_PlayingChannels.size() > 0; }
+		bool IsBeingPlayed() const { return m_PlayingChannels.size() > 0; }
 
 		/// <summary>
 		/// Adds a channel index to the SoundContainer's collection of playing channels.
@@ -205,7 +205,7 @@ namespace RTE {
 		/// Gets the current sound selection cycle mode, which is used to determine what SoundSet to select next time SelectNextSoundSet is called.
 		/// </summary>
 		/// <returns>The current sound selection cycle mode.</returns>
-		SoundCycleMode GetSoundSelectionCycleMode() { return m_SoundSelectionCycleMode; }
+		SoundCycleMode GetSoundSelectionCycleMode() const { return m_SoundSelectionCycleMode; }
 
 		/// <summary>
 		/// Sets the current sound selection cycle mode, which is used to determine what SoundSet to select next time SelectNextSoundSet is called.
@@ -217,13 +217,13 @@ namespace RTE {
 		/// Gets the selected SoundSet for this SoundContainer. The selected SoundSet is changed with SelectNextSoundSet.
 		/// </summary>
 		/// <returns>The selected SoundSet.</returns>
-		std::vector<SoundData> GetSelectedSoundSet() { return m_SoundSets[m_SelectedSoundSet]; }
+		std::vector<SoundData> GetSelectedSoundSet() const { return m_SoundSets[m_SelectedSoundSet]; }
 
 		/// <summary>
 		/// Gets a vector of hashes of the sounds selected to be played next in this SoundContainer.
 		/// </summary>
 		/// <returns>The currently playing sounds hashes.</returns>
-		std::vector<size_t> GetSelectedSoundHashes();
+		std::vector<size_t> GetSelectedSoundHashes() const;
 
 		/// <summary>
 		/// Gets the SoundData object that corresponds to the given FMOD::Sound. If the sound can't be found, it returns a null pointer.
@@ -306,7 +306,7 @@ namespace RTE {
 		/// Gets whether the sounds in this SoundContainer have all had all their properties set appropriately. Used to account for issues with ordering in INI loading.
 		/// </summary>
 		/// <returns>Whether or not the sounds in this SoundContainer have their properties set appropriately.</returns>
-		bool AllSoundPropertiesUpToDate() { return m_AllSoundPropertiesUpToDate; }
+		bool AllSoundPropertiesUpToDate() const { return m_AllSoundPropertiesUpToDate; }
 #pragma endregion
 
 #pragma region Playback Controls

Managers/AudioMan.cpp

@@ -186,7 +186,7 @@ namespace RTE {
 
 /////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 
-	double AudioMan::GetMusicPosition() {
+	double AudioMan::GetMusicPosition() const {
 		if (m_AudioEnabled || IsMusicPlaying()) {
 			FMOD_RESULT result;
 			FMOD::Channel *musicChannel;
@@ -745,14 +745,14 @@ namespace RTE {
 
 /////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 
-	FMOD_VECTOR AudioMan::GetAsFMODVector(const Vector &vector, float zValue) {
+	FMOD_VECTOR AudioMan::GetAsFMODVector(const Vector &vector, float zValue) const {
 		Vector sceneDimensions = g_SceneMan.GetScene() ? g_SceneMan.GetSceneDim() : Vector();
 		return sceneDimensions.IsZero() ? FMOD_VECTOR{0, 0, zValue} : FMOD_VECTOR{vector.m_X, sceneDimensions.m_Y - vector.m_Y, zValue};
 	}
 
 /////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 
-	Vector AudioMan::GetAsVector(FMOD_VECTOR fmodVector) {
+	Vector AudioMan::GetAsVector(FMOD_VECTOR fmodVector) const {
 		Vector sceneDimensions = g_SceneMan.GetScene() ? g_SceneMan.GetSceneDim() : Vector();
 		return sceneDimensions.IsZero() ? Vector() : Vector(fmodVector.x, sceneDimensions.m_Y - fmodVector.y);
 	}

Managers/AudioMan.h

@@ -111,25 +111,25 @@ namespace RTE {
 		/// Gets the audio management system object used for playing all audio.
 		/// </summary>
 		/// <returns>The audio management system object used by AudioMan for playing audio.</returns>
-		FMOD::System *GetAudioSystem() { return m_AudioSystem; }
+		FMOD::System *GetAudioSystem() const { return m_AudioSystem; }
 
 		/// <summary>
 		/// Reports whether audio is enabled.
 		/// </summary>
 		/// <returns>Whether audio is enabled.</returns>
-		bool IsAudioEnabled() { return m_AudioEnabled; }
+		bool IsAudioEnabled() const { return m_AudioEnabled; }
 
 		/// <summary>
 		/// Returns the number of audio channels currently used.
 		/// </summary>
 		/// <returns>The number of audio channels currently used.</returns>
-		int GetPlayingChannelCount() { int channelCount; return m_AudioSystem->getChannelsPlaying(&channelCount, NULL) == FMOD_OK ? channelCount : 0; }
+		int GetPlayingChannelCount() const { int channelCount; return m_AudioSystem->getChannelsPlaying(&channelCount, NULL) == FMOD_OK ? channelCount : 0; }
 
 		/// <summary>
 		/// Returns the number of audio channels available in total.
 		/// </summary>
 		/// <returns>The number of audio channels available in total.</returns>
-		int GetTotalChannelCount() { int channelCount; return m_AudioSystem->getSoftwareChannels(&channelCount) == FMOD_OK ? channelCount : 0; }
+		int GetTotalChannelCount() const { int channelCount; return m_AudioSystem->getSoftwareChannels(&channelCount) == FMOD_OK ? channelCount : 0; }
 
 		/// <summary>
 		/// Gets the global pitch scalar value for all sounds and music.
@@ -151,7 +151,7 @@ namespace RTE {
 		/// Reports whether any music stream is currently playing.
 		/// </summary>
 		/// <returns>Whether any music stream is currently playing.</returns>
-		bool IsMusicPlaying() { bool isPlayingMusic; return m_AudioEnabled && m_MusicChannelGroup->isPlaying(&isPlayingMusic) == FMOD_OK ? isPlayingMusic : false; }
+		bool IsMusicPlaying() const { bool isPlayingMusic; return m_AudioEnabled && m_MusicChannelGroup->isPlaying(&isPlayingMusic) == FMOD_OK ? isPlayingMusic : false; }
 
 		/// <summary>
 		/// Gets the volume of music. Does not get volume of sounds.
@@ -188,7 +188,7 @@ namespace RTE {
 		/// Gets the position of playback of the current music stream, in seconds.
 		/// </summary>
 		/// <returns>The current position of the current stream playing, in seconds.</returns>
-		double GetMusicPosition();
+		double GetMusicPosition() const;
 
 		/// <summary>
 		/// Sets the music to a specific position in the song.
@@ -352,7 +352,7 @@ namespace RTE {
 		/// Returns true if manager is in multiplayer mode.
 		/// </summary>
 		/// <returns>True if in multiplayer mode.</returns>
-		bool IsInMultiplayerMode() { return m_IsInMultiplayerMode; }
+		bool IsInMultiplayerMode() const { return m_IsInMultiplayerMode; }
 
 		/// <summary>
 		/// Sets the multiplayer mode flag.
@@ -468,14 +468,14 @@ namespace RTE {
 		/// </summary>
 		/// <param name="vector">The RTE Vector to get as an FMOD_VECTOR.</param>
 		/// <returns>The FMOD_VECTOR that corresponds to the given RTE Vector.</returns>
-		FMOD_VECTOR GetAsFMODVector(const Vector &vector, float zValue = 0);
+		FMOD_VECTOR GetAsFMODVector(const Vector &vector, float zValue = 0) const;
 
 		/// <summary>
 		/// Gets the corresponding RTE Vector for a given FMOD_VECTOR.
 		/// </summary>
 		/// <param name="fmodVector">The FMOD_VECTOR to get as an RTE Vector.</param>
 		/// <returns>The RTE Vector that corresponds to the given FMOD_VECTOR.</returns>
-		Vector GetAsVector(FMOD_VECTOR fmodVector);
+		Vector GetAsVector(FMOD_VECTOR fmodVector) const;
 
 		/// <summary>
 		/// Clears all the member variables of this AudioMan, effectively resetting the members of this abstraction level only.