Mercurial > mm7

comparison mm7_4.cpp @ 398:7189d0bddf07

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Слияние
author Ritor1
date Sat, 23 Feb 2013 02:12:55 +0600
parents 4a60371fd70c 39a60868e9c7
children c0700eaabeb8
comparison
equal deleted inserted replaced
397:5fd328336048 398:7189d0bddf07
1163 { 1163 {
1164 v1 = &pLevelDecorations[v0->pDecorationIDs[i]]; 1164 v1 = &pLevelDecorations[v0->pDecorationIDs[i]];
1165 if ( !(v1->field_2 & 0x20) ) 1165 if ( !(v1->field_2 & 0x20) )
1166 { 1166 {
1167 v2 = &pDecorationList->pDecorations[v1->uDecorationDescID]; 1167 v2 = &pDecorationList->pDecorations[v1->uDecorationDescID];
1168 if ( !(v2->uFlags & 1) ) 1168 if (!v2->CanMoveThrough())
1169 { 1169 {
1170 v3 = v2->uRadius; 1170 v3 = v2->uRadius;
1171 v4 = v1->vPosition.x; 1171 v4 = v1->vPosition.x;
1172 if ( stru_721530.sMaxX <= v4 + v3 ) 1172 if ( stru_721530.sMaxX <= v4 + v3 )
1173 { 1173 {
1272 { 1272 {
1273 v5 = &pLevelDecorations[(signed __int16)v4 >> 3]; 1273 v5 = &pLevelDecorations[(signed __int16)v4 >> 3];
1274 if ( !(v5->field_2 & 0x20) ) 1274 if ( !(v5->field_2 & 0x20) )
1275 { 1275 {
1276 v6 = &pDecorationList->pDecorations[v5->uDecorationDescID]; 1276 v6 = &pDecorationList->pDecorations[v5->uDecorationDescID];
1277 if ( !(v6->uFlags & 1) ) 1277 if (!v6->CanMoveThrough())
1278 { 1278 {
1279 v7 = v6->uRadius; 1279 v7 = v6->uRadius;
1280 v8 = v5->vPosition.x; 1280 v8 = v5->vPosition.x;
1281 if ( stru_721530.sMaxX <= v8 + v7 ) 1281 if ( stru_721530.sMaxX <= v8 + v7 )
1282 { 1282 {
3560 goto LABEL_50; 3560 goto LABEL_50;
3561 } 3561 }
3562 } 3562 }
3563 else 3563 else
3564 { 3564 {
3565 v25 = v21->pInventoryItems[_idx].uAdditionalValue; 3565 v25 = v21->pInventoryItems[_idx].uSpecEnchantmentType;
3566 if ( v25 <= 50 ) 3566 if ( v25 <= 50 )
3567 { 3567 {
3568 if ( v25 != 50 ) 3568 if ( v25 != 50 )
3569 { 3569 {
3570 v26 = v25 - 37; 3570 v26 = v25 - 37;
6171 pTexture2.field_22 = 0; 6171 pTexture2.field_22 = 0;
6172 pColor1 = GenerateColorAsCloseAsPossibleToR8G8B8InTargetFormat(0x70u, 0x8Fu, 0xFEu); 6172 pColor1 = GenerateColorAsCloseAsPossibleToR8G8B8InTargetFormat(0x70u, 0x8Fu, 0xFEu);
6173 pColor2 = GenerateColorAsCloseAsPossibleToR8G8B8InTargetFormat(0xECu, 0xE6u, 0x9Cu); 6173 pColor2 = GenerateColorAsCloseAsPossibleToR8G8B8InTargetFormat(0xECu, 0xE6u, 0x9Cu);
6174 pString = (char *)operator new(2 * pSize); 6174 pString = (char *)operator new(2 * pSize);
6175 strncpy(pString, ptr, pSize); 6175 strncpy(pString, ptr, pSize);
6176 pString[pSize]=0;
6176 pFontQuick->_44D2FD_prolly_draw_credits_entry(pFontCChar, 0, a4, (signed __int16)pTexture2.uWidth, (signed __int16)pTexture2.uHeight, pColor1, 6177 pFontQuick->_44D2FD_prolly_draw_credits_entry(pFontCChar, 0, a4, (signed __int16)pTexture2.uWidth, (signed __int16)pTexture2.uHeight, pColor1,
6177 pColor2, pString, pTexture2.pPixels, (signed __int16)pTexture2.uWidth); 6178 pColor2, pString, pTexture2.pPixels, (signed __int16)pTexture2.uWidth);
6178 free(pString); 6179 free(pString);
6179 pWindow_MainMenu = GUIWindow::Create(0, 0, 640, 480, WINDOW_MainMenu, 0, (int)ptr); 6180 pWindow_MainMenu = GUIWindow::Create(0, 0, 640, 480, WINDOW_MainMenu, 0, (int)ptr);
6180 pWindow_MainMenu->CreateButton(0, 0, 0, 0, 1, 0, 0x71u, 0, 0x1Bu, "", 0); 6181 pWindow_MainMenu->CreateButton(0, 0, 0, 0, 1, 0, 0x71u, 0, 0x1Bu, "", 0);
9338 v8 = 138; 9339 v8 = 138;
9339 do 9340 do
9340 { 9341 {
9341 if ( v7->uItemID == 601 ) 9342 if ( v7->uItemID == 601 )
9342 { 9343 {
9343 if ( !v7->field_1A ) 9344 if ( !v7->uHolderPlayer )
9344 v9 = v7; 9345 v9 = v7;
9345 if ( v7->field_1A == v5 ) 9346 if ( v7->uHolderPlayer == v5 )
9346 v10 = 1; 9347 v10 = 1;
9347 } 9348 }
9348 ++v7; 9349 ++v7;
9349 --v8; 9350 --v8;
9350 } 9351 }
9359 ++v5; 9360 ++v5;
9360 if ( v12 > &pParty->pPlayers[3] ) 9361 if ( v12 > &pParty->pPlayers[3] )
9361 return; 9362 return;
9362 } 9363 }
9363 if ( v9 ) 9364 if ( v9 )
9364 v9->field_1A = v5; 9365 v9->uHolderPlayer = v5;
9365 } 9366 }
9366 } 9367 }
9367 // 4F08EC: using guessed type int dword_4F08EC[]; 9368 // 4F08EC: using guessed type int dword_4F08EC[];
9368 // 722B3C: using guessed type int dword_722B3C; 9369 // 722B3C: using guessed type int dword_722B3C;
9369 // 722B44: using guessed type int dword_722B44; 9370 // 722B44: using guessed type int dword_722B44;