Mercurial > mm7

diff mm7_2.cpp @ 591:a463d7784d33

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
missed Merge
author zipi
date Wed, 06 Mar 2013 13:42:24 +0000
parents 9e80b6e1b155
children deb559e4fe47 7bae884b7cd0
line wrap: on
line diff
--- a/mm7_2.cpp	Wed Mar 06 13:37:27 2013 +0000
+++ b/mm7_2.cpp	Wed Mar 06 13:42:24 2013 +0000
@@ -11701,12 +11701,6 @@
   pIcons_LOD->_4114F2();
 }
 
-int __stdcall pWinProc(HWND hWnd, UINT Msg, WPARAM wParam, unsigned int lParam)
-	{
-	return DefWindowProcA(hWnd, Msg, wParam, lParam);
-	}
-
-
 //----- (004637EB) --------------------------------------------------------
 int __stdcall aWinProc(HWND hWnd, UINT Msg, WPARAM wParam, unsigned int lParam)
 {
@@ -13253,9 +13247,9 @@
   pGame->pGammaController->Initialize(uGammaPos * 0.1 + 0.6);
 
   if ( ReadWindowsRegistryInt("Bloodsplats", 1) )
-    pGame->uFlags2 |= 0x20u;
+    pGame->uFlags2 |= GAME_FLAGS_2_DRAW_BLOODSPLATS;
   else
-    pGame->uFlags2 &= 0xFFFFFFDFu;
+    pGame->uFlags2 &= GAME_FLAGS_2_DRAW_BLOODSPLATS;
 
   uTurnSpeed = ReadWindowsRegistryInt("TurnDelta", 0);
   dword_6BE384_2dacceloff = ReadWindowsRegistryInt("2dacceloff", 0);