Mercurial > mm7

changeset 2210:7d5c05264a0d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
m
author Ritor1
date Wed, 12 Feb 2014 20:51:31 +0600
parents 15a327be07e2
children b4bb8296ecfa
files Game.cpp
diffstat 1 files changed, 7 insertions(+), 49 deletions(-) [+]
line wrap: on
line diff
--- a/Game.cpp	Thu Feb 06 00:38:03 2014 +0600
+++ b/Game.cpp	Wed Feb 12 20:51:31 2014 +0600
@@ -154,9 +154,7 @@
   v4 = viewparams->bRedrawGameUI;
   GameUI_Footer();
   if (!viewparams->bRedrawGameUI)
-  {
     GameUI_DrawRightPanelItems();
-  }
   else
   {
     GameUI_DrawRightPanelFrames();
@@ -526,14 +524,8 @@
 {
   for (uint i = 0; i < uNumBloodsplats; ++i)
   {
-    pBloodsplatContainer->AddBloodsplat(
-        pBloodsplats[i].x,
-        pBloodsplats[i].y,
-        pBloodsplats[i].z,
-        pBloodsplats[i].radius,
-        pBloodsplats[i].r,
-        pBloodsplats[i].g,
-        pBloodsplats[i].b);
+    pBloodsplatContainer->AddBloodsplat(pBloodsplats[i].x, pBloodsplats[i].y, pBloodsplats[i].z,
+        pBloodsplats[i].radius, pBloodsplats[i].r, pBloodsplats[i].g, pBloodsplats[i].b);
    }
 }
 
@@ -546,15 +538,8 @@
   for( int i=0; i<uNumStationaryLights; ++i ) 
       {
        pLight=&pStationaryLights[i];
-       pStationaryLightsStack->AddLight(
-           pLight->vPosition.x, 
-           pLight->vPosition.y,
-           pLight->vPosition.z,
-           pLight->flt_18,
-           pLight->vRGBColor.x,
-           pLight->vRGBColor.y,
-           pLight->vRGBColor.z,
-           _4E94D0_light_type);
+       pStationaryLightsStack->AddLight(pLight->vPosition.x, pLight->vPosition.y, pLight->vPosition.z,
+           pLight->flt_18, pLight->vRGBColor.x, pLight->vRGBColor.y, pLight->vRGBColor.z, _4E94D0_light_type);
       }
 }
 // 4E94D0: using guessed type char _4E94D0_light_type;
@@ -584,11 +569,8 @@
 //----- (0044F07B) --------------------------------------------------------
 bool Game::_44F07B()
 {
-  if (!pKeyboardInstance->IsKeyBeingHeld(VK_SHIFT) &&
-      !pKeyboardInstance->IsKeyBeingHeld(VK_LSHIFT) &&
-      !pKeyboardInstance->IsKeyBeingHeld(VK_LSHIFT) ||
-
-      (pKeyboardInstance->WasKeyPressed(VK_F11) == 0 &&
+  if (!pKeyboardInstance->IsKeyBeingHeld(VK_SHIFT) && !pKeyboardInstance->IsKeyBeingHeld(VK_LSHIFT) &&
+      !pKeyboardInstance->IsKeyBeingHeld(VK_LSHIFT) || (pKeyboardInstance->WasKeyPressed(VK_F11) == 0 &&
        pKeyboardInstance->WasKeyPressed(VK_F11)))
     return true;
   return false;
@@ -665,7 +647,7 @@
       uFlags2 |= v6;
     if (uNumStationaryLights_in_pStationaryLightsStack != pStationaryLightsStack->uNumLightsActive )
     {
-      uFlags2 |= 1u;
+      uFlags2 |= 1;
       uNumStationaryLights_in_pStationaryLightsStack = pStationaryLightsStack->uNumLightsActive;
     }
     _44E904();
@@ -767,9 +749,7 @@
       v6 = floorf(a3b + 0.5f);
     }
     else
-    {
       v6 = 0;
-    }
     if ( a4 >= v6 )
     {
       a4a = (1.0 - fSaturation) * a2a;
@@ -783,19 +763,13 @@
         result = floorf(a4b + 0.5f);
       }
       else
-      {
         result = 0;
-      }
     }
     else
-    {
       result = a4;
-    }
   }
   else
-  {
     result = -1;
-  }
   return result;
 }
 
@@ -846,9 +820,7 @@
       v6 = floorf(v13 + 0.5f);
     }
     else
-    {
       v6 = 0;
-    }
     if ( a4 >= v6 )
     {
       v14 = (1.0 - fSaturation) * v11;
@@ -861,19 +833,13 @@
         result = floorf(v15 + 0.5f);
       }
       else
-      {
         result = 0;
-      }
     }
     else
-    {
       result = a4;
-    }
   }
   else
-  {
     result = -1;
-  }
   return result;
 }
 
@@ -1008,9 +974,7 @@
       v7 = 0.0;
   }
   else
-  {
     v7 = 1.0;
-  }
   //if ( pRenderer->pRenderD3D )
     fSaturation = v7;
   //else
@@ -2082,9 +2046,7 @@
                   if ( pGUIWindow_Settings )
                   {
                     if ( pCurrentScreen == SCREEN_CHARACTERS )
-                    {
                       pMouse->SetCursorBitmap("MICON2");
-                    }
                     else
                     {
                       pGUIWindow_Settings->Release();
@@ -2136,9 +2098,7 @@
                       if ( pGUIWindow_Settings )
                       {
                        if ( pCurrentScreen == SCREEN_CHARACTERS )
-                       {
                         pMouse->SetCursorBitmap("MICON2");
-                       }
                        else
                        {
                          pGUIWindow_Settings->Release();
@@ -2168,9 +2128,7 @@
                       if ( pGUIWindow_Settings )
                       {
                         if ( pCurrentScreen == SCREEN_CHARACTERS )
-                        {
                          pMouse->SetCursorBitmap("MICON2");
-                        }
                         else
                         {
                          pGUIWindow_Settings->Release();