Mercurial > mm7

changeset 574:f90753ebabe3

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge
author Nomad
date Wed, 06 Mar 2013 06:41:36 +0200
parents 7c0763248a87 (diff) cdf3afa8db74 (current diff)
children 88dd54e6e44a 96f48cfdd657
files mm7_2.cpp mm7_5.cpp mm7_6.cpp
diffstat 6 files changed, 16 insertions(+), 18 deletions(-) [+]
line wrap: on
line diff
--- a/Game.h	Tue Mar 05 23:48:32 2013 +0000
+++ b/Game.h	Wed Mar 06 06:41:36 2013 +0200
@@ -16,6 +16,8 @@
 
 
 
+#define GAME_FLAGS_2_DRAW_BLOODSPLATS 0x20
+
 
 
 /*  320 */
--- a/ParticleEngine.cpp	Tue Mar 05 23:48:32 2013 +0000
+++ b/ParticleEngine.cpp	Wed Mar 06 06:41:36 2013 +0200
@@ -93,10 +93,10 @@
   uTimeElapsed += pEventTimer->uTimeElapsed;
   pLines.uNumLines = 0;
 
-  //if (uCurrentlyLoadedLevelType == LEVEL_Indoor)
-    //DrawParticles_BLV();
-  //else
-    //DrawParticles_ODM();
+  if (uCurrentlyLoadedLevelType == LEVEL_Indoor)
+    DrawParticles_BLV();
+  else
+    DrawParticles_ODM();
 
   if (pRenderer->pRenderD3D)
   {
--- a/mm7_2.cpp	Tue Mar 05 23:48:32 2013 +0000
+++ b/mm7_2.cpp	Wed Mar 06 06:41:36 2013 +0200
@@ -11616,10 +11616,6 @@
   pIcons_LOD->_4114F2();
 }
 
-int __stdcall pWinProc(HWND hWnd, UINT Msg, WPARAM wParam, unsigned int lParam)
-	{
-	return DefWindowProcA(hWnd, Msg, wParam, lParam);
-	}
 
 
 //----- (004637EB) --------------------------------------------------------
@@ -13168,9 +13164,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);
--- a/mm7_5.cpp	Tue Mar 05 23:48:32 2013 +0000
+++ b/mm7_5.cpp	Wed Mar 06 06:41:36 2013 +0200
@@ -5271,7 +5271,7 @@
       //v55 = v33;
       if ( pRenderer->pRenderD3D )
       {
-        if ( pGame->uFlags2 & 0x20 )
+        if ( pGame->uFlags2 & GAME_FLAGS_2_DRAW_BLOODSPLATS )
         {
           v50 = 0;
           pMonsterName = 0;
@@ -5594,7 +5594,7 @@
                   v74 = v27;
                   if ( pRenderer->pRenderD3D )
                   {
-                    if ( pGame->uFlags2 & 0x20 )
+                    if ( pGame->uFlags2 & GAME_FLAGS_2_DRAW_BLOODSPLATS )
                     {
                       v28 = (double)v74;
                       v74 = v7->vPosition.z;
@@ -5780,7 +5780,7 @@
                         v75 = v57;
                         if ( pRenderer->pRenderD3D )
                         {
-                          if ( pGame->uFlags2 & 0x20 )
+                          if ( pGame->uFlags2 & GAME_FLAGS_2_DRAW_BLOODSPLATS )
                           {
                             v58 = (double)(signed int)v75;
                             v75 = v44->vPosition.z;
@@ -14794,7 +14794,7 @@
     v2 = uTextureID_507C58;
     goto LABEL_12;
   }
-  if ( pGame->uFlags2 & 0x20 )
+  if ( pGame->uFlags2 & GAME_FLAGS_2_DRAW_BLOODSPLATS )
     pRenderer->DrawTextureIndexed(
       0x14u,
       0x119u,
@@ -14970,7 +14970,7 @@
 
 
 //----- (00415485) --------------------------------------------------------
-char *__cdecl DrawCopyrightWindow()
+void DrawCopyrightWindow()
 {
   GUIWindow Dst; // [sp+8h] [bp-54h]@1
 
@@ -14992,7 +14992,7 @@
   Dst.uFrameHeight -= 12;
   Dst.uFrameZ = Dst.uFrameX + Dst.uFrameWidth - 1;
   Dst.uFrameW = Dst.uFrameY + Dst.uFrameHeight - 1;
-  return Dst.DrawTitleText(pFontSmallnum, 0, 0xCu, 0, pGlobalTXT_LocalizationStrings[157], 3u);
+  Dst.DrawTitleText(pFontSmallnum, 0, 0xCu, 0, pGlobalTXT_LocalizationStrings[157], 3u);
 }
 
 
--- a/mm7_6.cpp	Tue Mar 05 23:48:32 2013 +0000
+++ b/mm7_6.cpp	Wed Mar 06 06:41:36 2013 +0200
@@ -3756,7 +3756,7 @@
 LABEL_139:
         DamageMonsterFromParty(8 * v42 | 2, v47, v670);
         goto LABEL_1056;
-      case 2:
+      case SPELL_FIRE_FIRE_BOLT:
       case 6:
       case 11:
       case 18:
--- a/mm7_data.h	Tue Mar 05 23:48:32 2013 +0000
+++ b/mm7_data.h	Wed Mar 06 06:41:36 2013 +0200
@@ -1852,7 +1852,7 @@
 void __cdecl GameMenuUI_DrawVideoOptions();
 void __cdecl DrawGameOptions();
 void __fastcall DrawPopupWindow(unsigned int uX, unsigned int uY, unsigned int uWidth, unsigned int uHeight); // idb
-char *__cdecl DrawCopyrightWindow();
+void DrawCopyrightWindow();
 void __cdecl GUI_UpdateWindows();
 void __cdecl identify_item();
 void __thiscall sub_416B01(void *_this);