Mercurial > mm7

diff UI/UiGame.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 4100fb5c4913
children 6a7309a847ea eff78dab2142
line wrap: on
line diff
--- a/UI/UiGame.cpp	Mon May 12 00:13:39 2014 +0200
+++ b/UI/UiGame.cpp	Mon May 12 01:50:32 2014 +0200
@@ -209,7 +209,7 @@
           if ( !lpsz )
             lpsz = "";
         }
-        popup_window.Hint = 0;
+        popup_window.Hint = nullptr;
         popup_window.uFrameX = 38;
         popup_window.uFrameY = 60;
         popup_window.uFrameWidth = 276;
@@ -363,7 +363,7 @@
   unsigned __int16 pTextColor; // ax@104
   GUIWindow window; // [sp+ACh] [bp-68h]@42
 //  GUIFont *pOutString; // [sp+10Ch] [bp-8h]@39
-  const char *pInString=NULL; // [sp+110h] [bp-4h]@32
+  const char *pInString=nullptr; // [sp+110h] [bp-4h]@32
 
   if ( !pDialogueWindow )
     return;
@@ -577,7 +577,7 @@
     if (pParty->field_7B5_in_arena_quest && pParty->field_7B5_in_arena_quest != -1)
     {
       int num_dead_actors = 0;
-      pInString = 0;
+      pInString = nullptr;
       for ( uint i = 0; i < uNumActors; ++i )
       {
         if (pActors[i].uAIState == Dead || pActors[i].uAIState == Removed || pActors[i].uAIState  == Disabled)