From 87d3fb169adebdaf2a3365ae7ec887d832e1da8b Mon Sep 17 00:00:00 2001
From: FunkyFr3sh <cc.red.alert.1@googlemail.com>
Date: Mon, 8 Nov 2021 02:36:28 +0100
Subject: [PATCH] center in windowed mode + clear

---
 src/render_d3d9.c  |  2 ++
 src/render_ogl.c   |  2 ++
 src/winapi_hooks.c | 10 ++++++++--
 3 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/src/render_d3d9.c b/src/render_d3d9.c
index c6e3b95..cd8c9e7 100644
--- a/src/render_d3d9.c
+++ b/src/render_d3d9.c
@@ -445,6 +445,8 @@ DWORD WINAPI d3d9_render_main(void)
 
             if (g_ddraw->bnet_active)
             {
+                IDirect3DDevice9_Clear(g_d3d9.device, 0, NULL, D3DCLEAR_TARGET, D3DCOLOR_XRGB(0, 0, 0), 1.0f, 0);
+
                 RECT rc = { 0,0,g_ddraw->width,g_ddraw->height };
 
                 if (SUCCEEDED(IDirect3DTexture9_LockRect(g_d3d9.surface_tex[tex_index], 0, &lock_rc, &rc, 0)))
diff --git a/src/render_ogl.c b/src/render_ogl.c
index 1c5336c..f267a97 100644
--- a/src/render_ogl.c
+++ b/src/render_ogl.c
@@ -704,6 +704,8 @@ static void ogl_render()
 
             if (g_ddraw->bnet_active)
             {
+                glClear(GL_COLOR_BUFFER_BIT);
+
                 glBindTexture(GL_TEXTURE_2D, g_ogl.surface_tex_ids[tex_index]);
 
                 if (g_ogl.adjust_alignment)
diff --git a/src/winapi_hooks.c b/src/winapi_hooks.c
index 8f3c9c0..01c3ef6 100644
--- a/src/winapi_hooks.c
+++ b/src/winapi_hooks.c
@@ -693,8 +693,14 @@ HWND WINAPI fake_CreateWindowExA(
         int align_y = added_height > 0 ? added_height / 2 : 0;
         int align_x = added_width > 0 ? added_width / 2 : 0;
 
-        X += pt.x;// +align_x;
-        Y += pt.y;// +align_y;
+        if (g_ddraw->windowed)
+        {
+            X += align_x;
+            Y += align_y;
+        }
+
+        X += pt.x;
+        Y += pt.y;
 
         dwStyle |= WS_CLIPCHILDREN;
     }