make Carmageddon working again

FunkyFr3sh · Nov 21, 2017 · b82cffb · b82cffb
1 parent d03c82d
commit b82cffb
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 10 deletions.
diff --git a/ddraw.rc b/ddraw.rc
@@ -1,20 +1,20 @@
 1 VERSIONINFO
-FILEVERSION 1,1,3,0
-PRODUCTVERSION 1,1,3,0
+FILEVERSION 1,1,4,0
+PRODUCTVERSION 1,1,4,0
 {
     BLOCK "StringFileInfo"
     {
         BLOCK "040904B0"
         {
             VALUE "CompanyName", "cncnet.org"
             VALUE "FileDescription", "DirectDraw replacement for C&C95 and Red Alert"
-            VALUE "FileVersion", "1.1.3.0"
+            VALUE "FileVersion", "1.1.4.0"
             VALUE "InternalName", "ddraw"
             VALUE "LegalCopyright", "Copyright (c) 2010-2017"
             VALUE "LegalTrademarks", ""
             VALUE "OriginalFileName", "ddraw.dll"
             VALUE "ProductName", "DirectDraw replacement for C&C95 and Red Alert"
-            VALUE "ProductVersion", "1.1.3.0"
+            VALUE "ProductVersion", "1.1.4.0"
             VALUE "Comments", "https://cncnet.org"
         }
     }

diff --git a/src/main.c b/src/main.c
@@ -482,6 +482,8 @@ LRESULT CALLBACK WndProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
 
     switch(uMsg)
     {
+        case WM_SIZE: 
+            return DefWindowProc(hWnd, uMsg, wParam, lParam); /* Carmageddon fix */
         case WM_MOVE:
         {
             if (ddraw->windowed && ddraw->windowed_init)
@@ -495,13 +497,9 @@ LRESULT CALLBACK WndProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
                 if (y != -32000)
                     WindowPosY = y;
             }
-            break;
+
+            return DefWindowProc(hWnd, uMsg, wParam, lParam); /* Carmageddon fix */
         }
-
-        /* Carmageddon stops the main loop when it sees these, DefWindowProc is also bad */
-        //case WM_WINDOWPOSCHANGING:
-        //case WM_WINDOWPOSCHANGED:
-        //    return 0;
 
         /* C&C and RA really don't want to close down */
         case WM_SYSCOMMAND: