diff GUIWindow.cpp @ 59:5159d2e6f559

BLV render
author Nomad
date Fri, 26 Oct 2012 02:38:26 +0200
parents 25fabc49627b
children 30ec77bbd018
line wrap: on
line diff
--- a/GUIWindow.cpp	Thu Oct 25 02:05:16 2012 +0200
+++ b/GUIWindow.cpp	Fri Oct 26 02:38:26 2012 +0200
@@ -312,7 +312,7 @@
     v41 = v31;
   }
   while ( (signed int)v46 < (signed int)&dword_506978 );
-  v39 = nullstring;
+  v39 = "";
   if ( uFramesetIDa == v30 )
     v39 = pGlobalTXT_LocalizationStrings[153];
   sprintfex(pTmpBuf, pGlobalTXT_LocalizationStrings[450], v39);
@@ -589,7 +589,7 @@
           0xB3u,
           v19,
           0,
-          nullstring,
+          "",
           0);
         ++v19;
       }
@@ -632,7 +632,7 @@
           0xB7u,
           v16,
           0,
-          nullstring,
+          "",
           0);
         ++v16;
       }
@@ -887,7 +887,7 @@
                             2u,
                             0,
                             pGlobalTXT_LocalizationStrings[192],// Scroll Up
-                            (Texture *)nullstring,
+                            (Texture *)"",
                             0);
             pBtn_Book_4 = v1->CreateButton(
                             pViewport->uViewportX + 397,
@@ -900,7 +900,7 @@
                             3u,
                             0,
                             pGlobalTXT_LocalizationStrings[193],// Scroll Down
-                            (Texture *)nullstring,
+                            (Texture *)"",
                             0);
             pBtn_Book_5 = v1->CreateButton(
                             pViewport->uViewportX + 397,
@@ -913,7 +913,7 @@
                             4u,
                             0,
                             pGlobalTXT_LocalizationStrings[573],// "Scroll Right"
-                            (Texture *)nullstring,
+                            (Texture *)"",
                             0);
             pBtn_Book_6 = v1->CreateButton(
                             pViewport->uViewportX + 397,
@@ -926,7 +926,7 @@
                             5u,
                             0,
                             pGlobalTXT_LocalizationStrings[572],// "Scroll Left"
-                            (Texture *)nullstring,
+                            (Texture *)"",
                             0);
             return;
           }
@@ -1257,14 +1257,14 @@
         0x56u,
         v3,
         0,
-        nullstring,
+        "",
         0);
       ++a2;
     }
     ++v3;
   }
   while ( (signed int)v3 < 11 );
-  v2->CreateButton(0, 0, 0, 0, 1, 0, 0x33u, 0, 9u, nullstring, 0);
+  v2->CreateButton(0, 0, 0, 0, 1, 0, 0x33u, 0, 9u, "", 0);
   if ( a2 )
     v2->_41D08F(a2, 0, 0, 0);
   if ( v1->pActiveSkills[12] )
@@ -1295,7 +1295,7 @@
     0x58u,
     0,
     0,
-    nullstring,
+    "",
     0);
   ptr_5064F8 = v2->CreateButton(
                  0x1DCu,
@@ -1307,7 +1307,7 @@
                  0x58u,
                  0,
                  0,
-                 nullstring,
+                 "",
                  pTexture_506444,
                  0);
   v2->CreateButton(
@@ -2229,7 +2229,7 @@
                       0x88u,
                       0x13u,
                       0,
-                      nullstring,
+                      "",
                       0);
                 }
               }
@@ -2250,7 +2250,7 @@
                       0x88u,
                       0x14u,
                       0,
-                      nullstring,
+                      "",
                       0);
                 }
               }
@@ -2271,7 +2271,7 @@
                       0x88u,
                       0x15u,
                       0,
-                      nullstring,
+                      "",
                       0);
                 }
               }
@@ -2292,7 +2292,7 @@
                       0x88u,
                       0x16u,
                       0,
-                      nullstring,
+                      "",
                       0);
                 }
               }
@@ -2313,7 +2313,7 @@
                       0x88u,
                       0x17u,
                       0,
-                      nullstring,
+                      "",
                       0);
                 }
               }
@@ -2334,7 +2334,7 @@
                       0x88u,
                       0x18u,
                       0,
-                      nullstring,
+                      "",
                       0);
                 }
               }
@@ -2439,11 +2439,11 @@
       return pWindow;
     }
 LABEL_62:
-    pWindow->CreateButton(0x3Du, 0x1A8u, 0x1Fu, 0, 2, 94, 0x6Eu, 1u, 0x31u, nullstring, 0);
-    pWindow->CreateButton(0xB1u, 0x1A8u, 0x1Fu, 0, 2, 94, 0x6Eu, 2u, 0x32u, nullstring, 0);
-    pWindow->CreateButton(0x124u, 0x1A8u, 0x1Fu, 0, 2, 94, 0x6Eu, 3u, 0x33u, nullstring, 0);
-    pWindow->CreateButton(0x197u, 0x1A8u, 0x1Fu, 0, 2, 94, 0x6Eu, 4u, 0x34u, nullstring, 0);
-    pWindow->CreateButton(0, 0, 0, 0, 1, 0, 0xB0u, 0, 9u, nullstring, 0);
+    pWindow->CreateButton(0x3Du, 0x1A8u, 0x1Fu, 0, 2, 94, 0x6Eu, 1u, 0x31u, "", 0);
+    pWindow->CreateButton(0xB1u, 0x1A8u, 0x1Fu, 0, 2, 94, 0x6Eu, 2u, 0x32u, "", 0);
+    pWindow->CreateButton(0x124u, 0x1A8u, 0x1Fu, 0, 2, 94, 0x6Eu, 3u, 0x33u, "", 0);
+    pWindow->CreateButton(0x197u, 0x1A8u, 0x1Fu, 0, 2, 94, 0x6Eu, 4u, 0x34u, "", 0);
+    pWindow->CreateButton(0, 0, 0, 0, 1, 0, 0xB0u, 0, 9u, "", 0);
     return pWindow;
   }
   if (eWindowType == WINDOW_HouseInterior)