Merge branch 'TheSuperHackers:main' into main

Author: githubawn

Core/GameEngine/Include/Common/AudioRequest.h

@@ -45,6 +45,8 @@ struct AudioRequest : public MemoryPoolObject
 	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE( AudioRequest, "AudioRequest" )
 
 public:
+	AudioEventRTS* releasePendingEvent();
+
 	RequestType m_request;
 	union
 	{

Core/GameEngine/Include/Common/GameAudio.h

@@ -177,11 +177,10 @@ class AudioManager : public SubsystemInterface
 		AsciiString prevTrackName(const AsciiString& currentTrack );
 
 		// changing music tracks
-		virtual void nextMusicTrack() = 0;
-		virtual void prevMusicTrack() = 0;
+		virtual AsciiString nextMusicTrack() = 0;
+		virtual AsciiString prevMusicTrack() = 0;
 		virtual Bool isMusicPlaying() const = 0;
 		virtual Bool hasMusicTrackCompleted( const AsciiString& trackName, Int numberOfTimes ) const = 0;
-		virtual AsciiString getMusicTrackName() const = 0;
 
 		virtual void setAudioEventEnabled( AsciiString eventToAffect, Bool enable );
 		virtual void setAudioEventVolumeOverride( AsciiString eventToAffect, Real newVolume );

Core/GameEngine/Include/GameNetwork/NetCommandMsg.h

@@ -33,6 +33,7 @@
 #include "GameNetwork/NetPacketStructs.h"
 #include "Common/UnicodeString.h"
 
+class GameMessageArgument;
 class NetCommandRef;
 
 //-----------------------------------------------------------------------------
@@ -179,10 +180,8 @@ class NetGameCommandMsg : public NetCommandMsgT<NetPacketGameCommand, SmallNetPa
 	virtual Select getSmallNetPacketSelect() const override;
 
 protected:
-	Int m_numArgs;
-	Int m_argSize;
 	GameMessage::Type m_type;
-	GameMessageArgument *m_argList, *m_argTail;
+	std::vector<GameMessageArgument*> m_argList;
 };
 
 //-----------------------------------------------------------------------------

Core/GameEngine/Source/Common/Audio/AudioRequest.cpp

@@ -30,5 +30,20 @@
 
 AudioRequest::~AudioRequest()
 {
+	if (m_usePendingEvent)
+	{
+		delete m_pendingEvent;
+	}
+}
 
+AudioEventRTS* AudioRequest::releasePendingEvent()
+{
+	if (m_usePendingEvent)
+	{
+		m_usePendingEvent = false;
+		AudioEventRTS* event = m_pendingEvent;
+		m_pendingEvent = nullptr;
+		return event;
+	}
+	return nullptr;
 }