diff Game.cpp @ 142:8b8fd4d83fdc

Various things here and there
author Nomad
date Tue, 12 Feb 2013 06:28:08 +0200
parents a2ddaf0e4d8a
children d92c78ab54fe
line wrap: on
line diff
--- a/Game.cpp	Tue Feb 12 03:02:13 2013 +0200
+++ b/Game.cpp	Tue Feb 12 06:28:08 2013 +0200
@@ -50,10 +50,10 @@
 //----- (0044103C) --------------------------------------------------------
 void Game::Draw()
 {
-  float v2; // ST24_4@11
+  //float v2; // ST24_4@11
   //double v3; // ST28_8@11
   int v4; // edi@26
-  int v5; // eax@35
+  //int v5; // eax@35
 
   uFlags2 &= 0xFFFFFFFDu;
   if ( pParty->_497FC5_check_party_perception_against_level() )
@@ -96,7 +96,7 @@
     {
       if ( pRenderer->pRenderD3D )
       {
-        v2 = (double)(((signed int)pMiscTimer->uTotalGameTimeElapsed >> 2) & 0x1F) * 0.032258064 * 6.0;
+        float v2 = (double)(((signed int)pMiscTimer->uTotalGameTimeElapsed >> 2) & 0x1F) * 0.032258064 * 6.0;
         //v3 = v2 + 6.7553994e15;
         //pRenderer->field_1036A8_bitmapid = LODWORD(v3);
         pRenderer->field_1036A8_bitmapid = floorf(v2 + 0.5f);
@@ -121,8 +121,8 @@
   pRenderer->BeginScene();
   if (pRenderer->pRenderD3D)
     pMouse->DrawCursorToTarget();
-  if (pOtherOverlayList->field_3EC)
-    viewparams->bRedrawGameUI = 1;
+  if (pOtherOverlayList->bRedraw)
+    viewparams->bRedrawGameUI = true;
   v4 = viewparams->bRedrawGameUI;
   GameUI_DrawStatusBar();
   if (!viewparams->bRedrawGameUI)
@@ -140,15 +140,17 @@
     GameUI_DrawMinimap(488, 16, 625, 133, viewparams->uMinimapZoom, pParty->uFlags & 2);
     if (v4)
     {
-      if ( !sub_4226C2() && pRenderer->pRenderD3D)
+      if ( !sub_4226C2() && pRenderer->pRenderD3D) // clear game viewport with transparent color
         pRenderer->FillRectFast(pViewport->uViewportX, pViewport->uViewportY, pViewport->uViewportZ - pViewport->uViewportX,
-          pViewport->uViewportW - pViewport->uViewportY + 1, pRenderer->uTargetGMask | pRenderer->uTargetBMask);//0x0000FFFF/*pRenderer->uTargetGMask | pRenderer->uTargetBMask*/ - white window
+                                pViewport->uViewportW - pViewport->uViewportY + 1,
+                                pRenderer->uTargetGMask | pRenderer->uTargetBMask);
       viewparams->field_48 = 0;
     }
   }
-  v5 = pOtherOverlayList->field_3EC;
-  pOtherOverlayList->field_3EC = 0;
-  viewparams->bRedrawGameUI = v5;
+
+  viewparams->bRedrawGameUI = pOtherOverlayList->bRedraw;
+  pOtherOverlayList->bRedraw = 0;
+
   GameUI_DrawPartySpells();
   if (v4 || pParty->pHirelings[0]._anim_end_time || pParty->pHirelings[1]._anim_end_time )
     DrawHiredNPCs();