diff Render.cpp @ 688:c0bfb386b15f

some ui cleanup
author Gloval
date Sat, 16 Mar 2013 01:11:39 +0400
parents 9824e2eeee30
children e0a1fccc89b1 d5473972234d
line wrap: on
line diff
--- a/Render.cpp	Fri Mar 15 15:58:18 2013 +0200
+++ b/Render.cpp	Sat Mar 16 01:11:39 2013 +0400
@@ -4751,8 +4751,8 @@
   v1->pDefaultZBuffer = 0;
   v1->field_20_clipy = 0;
   v1->field_1C_clipx = 0;
-  v1->field_24_clipz = 639;
-  v1->field_28_clipw = 479;
+  v1->field_24_width = 639;
+  v1->field_28_height = 479;
   v1->field_4003C = (int)&unk_4EED80;
   v1->field_40040 = dword_4EED78;
   v1->uClipZ = 640;
@@ -6337,14 +6337,14 @@
   v35 = this;
   if ( (signed int)uX < v6 )
     HIDWORD(v36) = 8;
-  v34 = this->field_24_clipz;
-  if ( (signed int)uX > this->field_24_clipz )
+  v34 = this->field_24_width;
+  if ( (signed int)uX > this->field_24_width )
     HIDWORD(v36) |= 4u;
   v7 = this->field_20_clipy;
   v8 = uY;
   if ( (signed int)uY < v7 )
     HIDWORD(v36) |= 2u;
-  v9 = this->field_28_clipw;
+  v9 = this->field_28_height;
   if ( (signed int)uY > v9 )
     HIDWORD(v36) |= 1u;
   v10 = uZ;
@@ -6457,17 +6457,17 @@
 LABEL_24:
   if ( (BYTE4(v36) ^ (unsigned __int8)v36) & 4 )
   {
-    v15 = v14->field_24_clipz;
+    v15 = v14->field_24_width;
     if ( BYTE4(v36) & 4 )
     {
       v14 = v35;
       v8 += (signed int)((v11 - v8) * (v15 - uX)) / (signed int)(v10 - uX);
-      uX = v35->field_24_clipz;
+      uX = v35->field_24_width;
     }
     else
     {
       v16 = (signed int)((v8 - v11) * (v15 - v10)) / (signed int)(uX - v10);
-      v10 = v14->field_24_clipz;
+      v10 = v14->field_24_width;
       v11 += v16;
     }
   }
@@ -6476,7 +6476,7 @@
   uYa = v14->field_20_clipy;
   if ( (signed int)v8 < v17 )
     v37 = 2;
-  v18 = v14->field_28_clipw;
+  v18 = v14->field_28_height;
   if ( (signed int)v8 > v18 )
     v37 |= 1u;
   if ( (signed int)v11 >= v17 )
@@ -6510,14 +6510,14 @@
     {
       if ( v37 & 1 )
       {
-        uX += (signed int)((v10 - uX) * (v35->field_28_clipw - v8)) / (signed int)(v11 - v8);
+        uX += (signed int)((v10 - uX) * (v35->field_28_height - v8)) / (signed int)(v11 - v8);
         LOBYTE(v12) = (char)v35;
-        v8 = v35->field_28_clipw;
+        v8 = v35->field_28_height;
       }
       else
       {
-        v12 = (signed int)((uX - v10) * (v35->field_28_clipw - v11)) / (signed int)(v8 - v11);
-        v11 = v35->field_28_clipw;
+        v12 = (signed int)((uX - v10) * (v35->field_28_height - v11)) / (signed int)(v8 - v11);
+        v11 = v35->field_28_height;
         v10 += v12;
       }
     }
@@ -6541,8 +6541,8 @@
 {
   this->field_1C_clipx = uX;
   this->field_20_clipy = uY;
-  this->field_24_clipz = uZ;
-  this->field_28_clipw = uW;
+  this->field_24_width = uZ;
+  this->field_28_height = uW;
 }
 
 
@@ -11074,7 +11074,7 @@
     v6->Load(v8, v9);
 LABEL_38:
     viewparams->bRedrawGameUI = 1;
-    viewparams->_443343();
+    viewparams->InitGrayPalette();
     pMouse->SetCurrentCursorBitmap();
     if ( pRenderer->bWindowMode )
     {