Merge branch 'smartcmd:main' into main

1 files changed, 9 insertions, 3 deletions

diff --git a/Minecraft.Client/Windows64/Windows64_UIController.cpp b/Minecraft.Client/Windows64/Windows64_UIController.cpp
index 10ae20af..3929aa04 100644
--- a/Minecraft.Client/Windows64/Windows64_UIController.cpp
+++ b/Minecraft.Client/Windows64/Windows64_UIController.cpp
@@ -82,7 +82,7 @@ void ConsoleUIController::render()
 	example, no resolve targets are required. */
 	gdraw_D3D11_SetTileOrigin( m_pRenderTargetView,
 		m_pDepthStencilView,
-		NULL,
+		nullptr,
 		0,
 		0 );
 
@@ -143,11 +143,17 @@ void ConsoleUIController::endCustomDraw(IggyCustomDrawCallbackRegion *region)
 	PIXEndNamedEvent();
 }
 
+void ConsoleUIController::updateRenderTargets(ID3D11RenderTargetView* rtv, ID3D11DepthStencilView* dsv)
+{
+	m_pRenderTargetView = rtv;
+	m_pDepthStencilView = dsv;
+}
+
 void ConsoleUIController::setTileOrigin(S32 xPos, S32 yPos)
 {
 	gdraw_D3D11_SetTileOrigin( m_pRenderTargetView,
 		m_pDepthStencilView,
-		NULL,
+		nullptr,
 		xPos,
 		yPos );
 }
@@ -163,7 +169,7 @@ GDrawTexture *ConsoleUIController::getSubstitutionTexture(int textureId)
 	ID3D11ShaderResourceView *tex = RenderManager.TextureGetTexture(textureId);
 	ID3D11Resource *resource;
 	tex->GetResource(&resource);
-	ID3D11Texture2D  *tex2d = (ID3D11Texture2D *)resource;
+	ID3D11Texture2D  *tex2d = static_cast<ID3D11Texture2D *>(resource);
 	D3D11_TEXTURE2D_DESC desc;
 	tex2d->GetDesc(&desc);
 	GDrawTexture *gdrawTex = gdraw_D3D11_WrappedTextureCreate(tex);