Mercurial > mm7

comparison mm7_1.cpp @ 1091:9c7eb4037567

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
data moving
author Gloval
date Sun, 26 May 2013 14:13:22 +0400
parents 81a30c2e3e0a
children 81a51a0443e2
comparison
equal deleted inserted replaced
1082:7033eb155558 1091:9c7eb4037567
65 void CharacterUI_ReleaseButtons() 65 void CharacterUI_ReleaseButtons()
66 { 66 {
67 GUIButton *i; // esi@2 67 GUIButton *i; // esi@2
68 GUIButton *j; // esi@7 68 GUIButton *j; // esi@7
69 69
70 if ( dword_507CC0 ) 70 if ( dword_507CC0_activ_ch )
71 { 71 {
72 dword_507CC0 = 0; 72 dword_507CC0_activ_ch = 0;
73 for ( i = pGUIWindow_CurrentMenu->pControlsHead; i; i = j ) 73 for ( i = pGUIWindow_CurrentMenu->pControlsHead; i; i = j )
74 { 74 {
75 j=i->pNext; 75 j=i->pNext;
76 if ( BYTE1(i->field_1C) & 0x80 ) 76 if ( BYTE1(i->field_1C) & 0x80 )
77 { 77 {
81 } 81 }
82 for ( j = pGUIWindow_CurrentMenu->pControlsHead; j; j = j->pNext ) 82 for ( j = pGUIWindow_CurrentMenu->pControlsHead; j; j = j->pNext )
83 { 83 {
84 if ( j->msg == UIMSG_InventoryLeftClick) 84 if ( j->msg == UIMSG_InventoryLeftClick)
85 { 85 {
86 j->uX = dword_50698C; 86 j->uX = dword_50698C_uX;
87 j->uY = dword_506988; 87 j->uY = dword_506988_uY;
88 j->uZ = dword_506984; 88 j->uZ = dword_506984_uZ;
89 j->uW = dword_506980; 89 j->uW = dword_506980_uW;
90 pGUIWindow_CurrentMenu->_41D08F_set_keyboard_control_group(1, 0, 0, 0); 90 pGUIWindow_CurrentMenu->_41D08F_set_keyboard_control_group(1, 0, 0, 0);
91 } 91 }
92 } 92 }
93 } 93 }
94 } 94 }
294 } 294 }
295 pMessageQueue_50CBD0->AddMessage(pButton->msg, pButton->msg_param, 0); 295 pMessageQueue_50CBD0->AddMessage(pButton->msg, pButton->msg_param, 0);
296 return true; 296 return true;
297 } 297 }
298 case VK_NEXT: 298 case VK_NEXT:
299 { 299 {
300 if ( pWindowList[v3].field_30 != 0 ) 300 //if ( pWindowList[v3].field_30 != 0 ) //crashed at skill draw
301 { 301 //{
302 pMouse->GetClickPos(&uClickX, &uClickY); 302 // pMouse->GetClickPos(&uClickX, &uClickY);
303 v4 = pWindowList[v3].pStartingPosActiveItem; 303 // v4 = pWindowList[v3].pStartingPosActiveItem;
304 v29 = v4 + pWindowList[v3].pNumPresenceButton; 304 // v29 = v4 + pWindowList[v3].pNumPresenceButton; //num buttons more than buttons
305 if ( v4 < v4 + pWindowList[v3].pNumPresenceButton ) 305 // if ( v4 < v29 )
306 { 306 // {
307 while ( 1 ) 307 // while ( 1 )
308 { 308 // {
309 pButton = pWindowList[v3].pControlsHead; 309 // pButton = pWindowList[v3].pControlsHead;
310 if ( v4 > 0 ) 310 // if ( v4 > 0 )
311 { 311 // {
312 v15 = v4; 312 // v15 = v4;
313 do 313 // do
314 { 314 // {
315 pButton = pButton->pNext; 315 // pButton = pButton->pNext;
316 --v15; 316 // --v15;
317 } 317 // }
318 while ( v15 ); 318 // while ( v15 );
319 } 319 // }
320 if ( (signed int)uClickX >= (signed int)pButton->uX 320 // if ( (signed int)uClickX >= (signed int)pButton->uX
321 && (signed int)uClickX <= (signed int)pButton->uZ 321 // && (signed int)uClickX <= (signed int)pButton->uZ
322 && (signed int)uClickY >= (signed int)pButton->uY 322 // && (signed int)uClickY >= (signed int)pButton->uY
323 && (signed int)uClickY <= (signed int)pButton->uW ) 323 // && (signed int)uClickY <= (signed int)pButton->uW )
324 { 324 // {
325 pWindowList[v3].pCurrentPosActiveItem = v4; 325 // pWindowList[v3].pCurrentPosActiveItem = v4;
326 return true; 326 // return true;
327 } 327 // }
328 ++v4; 328 // ++v4;
329 if ( v4 >= v29 ) 329 // if ( v4 >= v29 )
330 { 330 // {
331 //v1 = 0; 331 // //v1 = 0;
332 //v2 = pMessageQueue_50CBD0->uNumMessages; 332 // //v2 = pMessageQueue_50CBD0->uNumMessages;
333 break; 333 // break;
334 } 334 // }
335 } 335 // }
336 } 336 // }
337 else 337 // else
338 { 338 // {
339 //v2 = pMessageQueue_50CBD0->uNumMessages; 339 // //v2 = pMessageQueue_50CBD0->uNumMessages;
340 } 340 // }
341 } 341 //}
342 break; 342 break;
343 } 343 }
344 default: 344 default:
345 { 345 {
346 break; 346 break;