Mercurial > mm7

comparison 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
comparison
equal deleted inserted replaced
1742:79621dd04649 1743:26c1a3d50635
126 } 126 }
127 127
128 //----- (00443249) -------------------------------------------------------- 128 //----- (00443249) --------------------------------------------------------
129 void ViewingParams::CenterOnParty() 129 void ViewingParams::CenterOnParty()
130 { 130 {
131 this->field_2C = (32768 * (__int64)this->field_2C) >> 16; 131 this->uMapBookMapZoom = (32768 * (__int64)this->uMapBookMapZoom) >> 16;
132 if (this->field_2C < 384) 132 if (this->uMapBookMapZoom < 384)
133 this->field_2C = 384; 133 this->uMapBookMapZoom = 384;
134 134
135 this->sViewCenterX = pParty->vPosition.x; 135 this->sViewCenterX = pParty->vPosition.x;
136 this->sViewCenterY = pParty->vPosition.y; 136 this->sViewCenterY = pParty->vPosition.y;
137 137
138 AdjustPosition(); 138 AdjustPosition();
147 v2 = 1536; 147 v2 = 1536;
148 else if (uCurrentlyLoadedLevelType == LEVEL_Indoor) 148 else if (uCurrentlyLoadedLevelType == LEVEL_Indoor)
149 v2 = 3072; 149 v2 = 3072;
150 else assert(false); 150 else assert(false);
151 151
152 this->field_2C *= 2; 152 this->uMapBookMapZoom *= 2;
153 if (this->field_2C > v2 ) 153 if (this->uMapBookMapZoom > v2 )
154 this->field_2C = v2; 154 this->uMapBookMapZoom = v2;
155 155
156 this->sViewCenterX = pParty->vPosition.x; 156 this->sViewCenterX = pParty->vPosition.x;
157 this->sViewCenterY = pParty->vPosition.y; 157 this->sViewCenterY = pParty->vPosition.y;
158 AdjustPosition(); 158 AdjustPosition();
159 } 159 }
170 int v7; // eax@5 170 int v7; // eax@5
171 171
172 172
173 v1 = this; 173 v1 = this;
174 v2 = this->indoor_center_y; 174 v2 = this->indoor_center_y;
175 v3 = 88 >> (this->field_2C / 384); 175 v3 = 88 >> (this->uMapBookMapZoom / 384);
176 v4 = (44 - v3) << 9; 176 v4 = (44 - v3) << 9;
177 if ( v1->sViewCenterY > v2 + v4 ) 177 if ( v1->sViewCenterY > v2 + v4 )
178 v1->sViewCenterY = v2 + v4; 178 v1->sViewCenterY = v2 + v4;
179 179
180 v5 = v1->indoor_center_x; 180 v5 = v1->indoor_center_x;
251 indoor_center_x = 0; 251 indoor_center_x = 0;
252 indoor_center_y = 0; 252 indoor_center_y = 0;
253 uMinimapZoom = _576E2C_current_minimap_zoom; 253 uMinimapZoom = _576E2C_current_minimap_zoom;
254 field_28 = dword_576E28; 254 field_28 = dword_576E28;
255 } 255 }
256 field_2C = 384; 256 uMapBookMapZoom = 384;
257 } 257 }
258 //----- (0042213C) -------------------------------------------------------- 258 //----- (0042213C) --------------------------------------------------------
259 void OnGameViewportClick() 259 void OnGameViewportClick()
260 { 260 {
261 signed int v0; // ebx@2 261 signed int v0; // ebx@2