Mercurial > mm7

diff UI/UIPopup.cpp @ 2369:bddcaf5d5db2

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
removing non-nullptr conditions before frees, chaning 0 and NULL assignmnets to pointers to nullptr assignments
author Grumpy7
date Mon, 12 May 2014 01:50:32 +0200
parents a574a80e7012
children bcd7fadbf7d2
line wrap: on
line diff
--- a/UI/UIPopup.cpp	Mon May 12 00:13:39 2014 +0200
+++ b/UI/UIPopup.cpp	Mon May 12 01:50:32 2014 +0200
@@ -132,7 +132,7 @@
 
   if (!inspect_item->uItemID)
     return;
-  iteminfo_window.Hint = 0;
+  iteminfo_window.Hint = nullptr;
   iteminfo_window.uFrameWidth = 384;
   iteminfo_window.uFrameHeight = 180;
   iteminfo_window.uFrameY = 40;
@@ -1256,7 +1256,7 @@
   spell_info_window.uFrameX = 90;
   spell_info_window.uFrameZ = 417;
   spell_info_window.uFrameW = v3 + 67;
-  spell_info_window.Hint = 0;
+  spell_info_window.Hint = nullptr;
   v5 = pFontSmallnum->GetLineWidth(pGlobalTXT_LocalizationStrings[LOCSTR_NORMAL]);
   if ( pFontSmallnum->GetLineWidth(pGlobalTXT_LocalizationStrings[LOCSTR_MASTER]) > v5 )
     v5 = pFontSmallnum->GetLineWidth(pGlobalTXT_LocalizationStrings[LOCSTR_MASTER]);
@@ -1378,7 +1378,7 @@
         popup_window.ptr_1C = (void *)((signed int)pX / 118);
         if ( (signed int)pX / 118 < 4 )//portaits zone
         {
-          popup_window.Hint = 0;
+          popup_window.Hint = nullptr;
           popup_window.uFrameWidth = 400;
           popup_window.uFrameHeight = 200;
           popup_window.uFrameX = 38;
@@ -1393,7 +1393,7 @@
         {
           if ( (signed int)pX >= 476 && (signed int)pX <= 636 && (signed int)pY >= 240 && (signed int)pY <= 300 )//buff_tooltip zone
           {
-            popup_window.Hint = 0;
+            popup_window.Hint = nullptr;
             popup_window.uFrameWidth = 400;
             popup_window.uFrameHeight = 200;
             popup_window.uFrameX = 38;
@@ -1428,7 +1428,7 @@
       }
       else//game zone
       {
-        popup_window.Hint = 0;
+        popup_window.Hint = nullptr;
         popup_window.uFrameWidth = 320;
         popup_window.uFrameHeight = 320;
         popup_window.uFrameX = pX - 350;
@@ -1509,7 +1509,7 @@
     }
     case SCREEN_PARTY_CREATION:
     {
-      popup_window.Hint = 0;
+      popup_window.Hint = nullptr;
       pStr = 0;
       for ( pButton = pGUIWindow_CurrentMenu->pControlsHead; pButton; pButton = pButton->pNext)
       {
@@ -1566,7 +1566,7 @@
       if ( popup_window.Hint )
       {
         pHint = popup_window.Hint;
-        popup_window.Hint = 0;
+        popup_window.Hint = nullptr;
         popup_window.uFrameWidth = 384;
         popup_window.uFrameHeight = 256;
         popup_window.uFrameX = 128;