bugfix(battleplan): Battle plans are now transferred to the new owner on capture (TheSuperHackers#2257)

Author: Stubbjax

GeneralsMD/Code/GameEngine/Include/GameClient/Display.h

@@ -113,6 +113,10 @@ class Display : public SubsystemInterface
 	virtual	Bool isClippingEnabled() = 0;
 	virtual	void enableClipping( Bool onoff ) = 0;
 
+	virtual void beginBatch() { }
+	virtual void endBatch() { }
+	virtual Bool isBatching() { return m_isBatching; }
+
 	virtual void step() {}; ///< Do one fixed time step
 	virtual void draw() override;																		///< Redraw the entire display
 	virtual void setTimeOfDay( TimeOfDay tod ) = 0;								///< Set the time of day for this display
@@ -187,6 +191,7 @@ class Display : public SubsystemInterface
 	UnsignedInt m_width, m_height;			///< Dimensions of the display
 	UnsignedInt m_bitDepth;							///< bit depth of the display
 	Bool m_windowed;										///< TRUE when windowed, FALSE when fullscreen
+	Bool m_isBatching;
 	View *m_viewList;										///< All of the views into the world
 
 	// Cinematic text data

GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GameWindowManager.cpp

@@ -1269,6 +1269,8 @@ void GameWindowManager::winRepaint()
 {
 	GameWindow *window, *next;
 
+	TheDisplay->beginBatch();
+
 	// draw below windows
 	for( window = m_windowTail; window; window = next )
 	{
@@ -1299,6 +1301,8 @@ void GameWindowManager::winRepaint()
 
 	if(TheTransitionHandler)
 		TheTransitionHandler->draw();
+
+	TheDisplay->endBatch();
 }
 
 //-------------------------------------------------------------------------------------------------

GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DDisplay.h

@@ -45,6 +45,7 @@ class Render2DClass;
 class RTS3DScene;
 class RTS2DScene;
 class RTS3DInterfaceScene;
+class TextureClass;
 
 
 //=============================================================================
@@ -81,6 +82,9 @@ class W3DDisplay : public Display
 	virtual void step() override; ///< Do one fixed time step
 	virtual void draw() override;  ///< redraw the entire display
 
+	virtual void beginBatch();
+	virtual void endBatch();
+
 	/// @todo Replace these light management routines with a LightManager singleton
 	virtual void createLightPulse( const Coord3D *pos, const RGBColor *color, Real innerRadius,Real outerRadius,
 																 UnsignedInt increaseFrameTime, UnsignedInt decayFrameTime//, Bool donut = FALSE
@@ -168,6 +172,11 @@ class W3DDisplay : public Display
 	Bool m_isClippedEnabled;	///<used by 2D drawing operations to define clip re
 	Real m_averageFPS;		///<average fps over the last 30 frames.
 	Real m_currentFPS;		///<current fps value.
+
+	TextureClass *m_batchTexture;
+	DrawImageMode m_batchMode;
+	Bool m_batchGrayscale;
+
 #if defined(RTS_DEBUG)
 	Int64 m_timerAtCumuFPSStart;
 #endif