Mercurial > mm7

diff Viewport.cpp @ 1743:26c1a3d50635

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge
author Ritor1
date Thu, 26 Sep 2013 23:42:25 +0600
parents 1c072d19e397
children c6fe09a06712
line wrap: on
line diff
--- a/Viewport.cpp	Thu Sep 26 23:42:06 2013 +0600
+++ b/Viewport.cpp	Thu Sep 26 23:42:25 2013 +0600
@@ -128,9 +128,9 @@
 //----- (00443249) --------------------------------------------------------
 void ViewingParams::CenterOnParty()
 {
-  this->field_2C = (32768 * (__int64)this->field_2C) >> 16;
-  if (this->field_2C < 384)
-    this->field_2C = 384;
+  this->uMapBookMapZoom = (32768 * (__int64)this->uMapBookMapZoom) >> 16;
+  if (this->uMapBookMapZoom < 384)
+    this->uMapBookMapZoom = 384;
 
   this->sViewCenterX = pParty->vPosition.x;
   this->sViewCenterY = pParty->vPosition.y;
@@ -149,9 +149,9 @@
       v2 = 3072;
     else assert(false);
     
-    this->field_2C *= 2;
-    if (this->field_2C > v2 )
-        this->field_2C = v2;
+    this->uMapBookMapZoom *= 2;
+    if (this->uMapBookMapZoom > v2 )
+        this->uMapBookMapZoom = v2;
 
     this->sViewCenterX = pParty->vPosition.x;
     this->sViewCenterY = pParty->vPosition.y;
@@ -172,7 +172,7 @@
 
     v1 = this;
     v2 = this->indoor_center_y;
-    v3 = 88 >> (this->field_2C / 384);
+    v3 = 88 >> (this->uMapBookMapZoom / 384);
     v4 = (44 - v3) << 9;
     if ( v1->sViewCenterY > v2 + v4 )
         v1->sViewCenterY = v2 + v4;
@@ -253,7 +253,7 @@
     uMinimapZoom = _576E2C_current_minimap_zoom;
     field_28 = dword_576E28;
   }
-  field_2C = 384;
+  uMapBookMapZoom = 384;
 }
 //----- (0042213C) --------------------------------------------------------
 void OnGameViewportClick()