Mercurial > mm7

comparison GUIWindow.cpp @ 1445:6de9c1316852

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Слияние
author Ritor1
date Sat, 03 Aug 2013 00:00:31 +0600
parents 71a2cf416478
children 8b4f4c723edd
comparison
equal deleted inserted replaced
1444:7b1a94270756 1445:6de9c1316852
391 391
392 //----- (0041CD3B) -------------------------------------------------------- 392 //----- (0041CD3B) --------------------------------------------------------
393 GUIButton *GUIWindow::GetControl(unsigned int uID) 393 GUIButton *GUIWindow::GetControl(unsigned int uID)
394 { 394 {
395 GUIButton *result; // eax@1 395 GUIButton *result; // eax@1
396 unsigned int v3; // ecx@1
397 396
398 result = this->pControlsHead; 397 result = this->pControlsHead;
399 v3 = uID; 398 for ( uID; uID; --uID )
400 if ( (signed int)uID > 0 ) 399 result = result->pNext;
401 {
402 do
403 {
404 result = result->pNext;
405 --v3;
406 }
407 while ( v3 );
408 }
409 return result; 400 return result;
410 } 401 }
411 402
412 //----- (00411BFC) -------------------------------------------------------- 403 //----- (00411BFC) --------------------------------------------------------
413 void GUIWindow::InitializeBookView() 404 void GUIWindow::InitializeBookView()
467 max_beacons = 5; 458 max_beacons = 5;
468 else if ( v18 & 0x40 ) 459 else if ( v18 & 0x40 )
469 max_beacons = 3; 460 max_beacons = 3;
470 461
471 462
472 __debugbreak(); // warning C4700: uninitialized local variable 'v19' used 463 //__debugbreak(); // warning C4700: uninitialized local variable 'v19' used
473 for (int i =0; i< max_beacons; ++i) 464 for (int i =0; i< max_beacons; ++i)
474 CreateButton(pLloydsBeaconsPreviewXs[v19], pLloydsBeaconsPreviewYs[v19], 465 CreateButton(pLloydsBeaconsPreviewXs[i], pLloydsBeaconsPreviewYs[i],
475 92, 68, 1, 180, UIMSG_InstallBeacon, i, 0, "", 0); 466 92, 68, 1, 180, UIMSG_InstallBeacon, i, 0, "", 0);
476 467
477 for (int i =0; i< 5; ++i) 468 for (int i =0; i< 5; ++i)
478 { 469 {
479 if (v17->pInstalledBeacons[i].uBeaconTime >= (signed __int64)pParty->uTimePlayed) 470 if (v17->pInstalledBeacons[i].uBeaconTime >= (signed __int64)pParty->uTimePlayed)
1104 break; 1095 break;
1105 case BuildingType_Jail: 1096 case BuildingType_Jail:
1106 JailDialog(); 1097 JailDialog();
1107 break; 1098 break;
1108 default: 1099 default:
1109 __debugbreak();//New BuildingType 1100 //__debugbreak();//New BuildingType (if enter Boat)
1110 break; 1101 break;
1111 } 1102 }
1112 } 1103 }
1113 if ( pDialogueNPCCount == uNumDialogueNPCPortraits && uHouse_ExitPic ) 1104 if ( pDialogueNPCCount == uNumDialogueNPCPortraits && uHouse_ExitPic )
1114 { 1105 {