Mercurial > mm7

comparison mm7_5.cpp @ 1419:9a1adf08f4ed

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
more label cleaning 2
author zipi
date Sun, 28 Jul 2013 18:54:40 +0100
parents ff495bf260d9
children 71a2cf416478
comparison
equal deleted inserted replaced
1418:483b1b453986 1419:9a1adf08f4ed
4710 v28 = v17; 4710 v28 = v17;
4711 v18 = dword_4F5CC4_ys[1] >= v8; 4711 v18 = dword_4F5CC4_ys[1] >= v8;
4712 v19 = 0; 4712 v19 = 0;
4713 v29 = 0; 4713 v29 = 0;
4714 if ( v17 <= 0 ) 4714 if ( v17 <= 0 )
4715 goto LABEL_29; 4715 return 0;
4716 do 4716 do
4717 { 4717 {
4718 if ( a3a >= 2 ) 4718 if ( a3a >= 2 )
4719 break; 4719 break;
4720 v20 = v19; 4720 v20 = v19;
4745 v19 = v29++ + 1; 4745 v19 = v29++ + 1;
4746 } 4746 }
4747 while ( v29 < v28 ); 4747 while ( v29 < v28 );
4748 result = 1; 4748 result = 1;
4749 if ( a3a != 1 ) 4749 if ( a3a != 1 )
4750 LABEL_29:
4751 result = 0; 4750 result = 0;
4752 return result; 4751 return result;
4753 } 4752 }
4754 4753
4755 //----- (004077F1) -------------------------------------------------------- 4754 //----- (004077F1) --------------------------------------------------------
4845 dword_4F5BF4_xs[v15 + 1] = dword_4F5BF4_xs[1]; 4844 dword_4F5BF4_xs[v15 + 1] = dword_4F5BF4_xs[1];
4846 dword_4F5B24_ys[v15 + 1] = dword_4F5B24_ys[1]; 4845 dword_4F5B24_ys[v15 + 1] = dword_4F5B24_ys[1];
4847 v25 = 0; 4846 v25 = 0;
4848 v16 = dword_4F5B24_ys[1] >= a3; 4847 v16 = dword_4F5B24_ys[1] >= a3;
4849 if ( v15 <= 0 ) 4848 if ( v15 <= 0 )
4850 goto LABEL_29; 4849 return 0;
4851 do 4850 do
4852 { 4851 {
4853 if ( a5a >= 2 ) 4852 if ( a5a >= 2 )
4854 break; 4853 break;
4855 v17 = v25; 4854 v17 = v25;
4880 v16 = v18 >= a3; 4879 v16 = v18 >= a3;
4881 } 4880 }
4882 while ( v25 < v15 ); 4881 while ( v25 < v15 );
4883 result = 1; 4882 result = 1;
4884 if ( a5a != 1 ) 4883 if ( a5a != 1 )
4885 LABEL_29:
4886 result = 0; 4884 result = 0;
4887 return result; 4885 return result;
4888 } 4886 }
4889 4887
4890 //----- (004088E9) -------------------------------------------------------- 4888 //----- (004088E9) --------------------------------------------------------
5191 { 5189 {
5192 if ( pParty->pPickedItem.uItemID == 236 ) 5190 if ( pParty->pPickedItem.uItemID == 236 )
5193 { 5191 {
5194 v35 = v27->uAttributes; 5192 v35 = v27->uAttributes;
5195 if ( v35 & 2 || (v51 & 0x80000000u) != 0 || (signed int)v51 > 12 || (signed int)v28 >= 500 ) 5193 if ( v35 & 2 || (v51 & 0x80000000u) != 0 || (signed int)v51 > 12 || (signed int)v28 >= 500 )
5196 goto LABEL_92; 5194 {
5195 pMouse->RemoveHoldingItem();
5196 dword_50CDCC = 1;
5197 return;
5198 }
5197 LOWORD(v35) = v35 | 0x210; 5199 LOWORD(v35) = v35 | 0x210;
5198 v27->uAttributes = v35; 5200 v27->uAttributes = v35;
5199 } 5201 }
5200 else 5202 else
5201 { 5203 {
5202 if ( (signed int)pParty->pPickedItem.uItemID <= 245 ) 5204 if ( (signed int)pParty->pPickedItem.uItemID <= 245 )
5203 goto LABEL_92; 5205 {
5206 pMouse->RemoveHoldingItem();
5207 dword_50CDCC = 1;
5208 return;
5209 }
5204 if ( (signed int)pParty->pPickedItem.uItemID <= 250 ) 5210 if ( (signed int)pParty->pPickedItem.uItemID <= 250 )
5205 { 5211 {
5206 v27->UpdateTempBonus(pParty->uTimePlayed); 5212 v27->UpdateTempBonus(pParty->uTimePlayed);
5207 v33 = v27->uItemID; 5213 v33 = v27->uItemID;
5208 if ( (signed int)v27->uItemID >= 64 && (signed int)v33 <= 65 5214 if ( (signed int)v27->uItemID >= 64 && (signed int)v33 <= 65
5209 || (pOut.y = v27->uAttributes, pOut.y & 2) 5215 || (pOut.y = v27->uAttributes, pOut.y & 2)
5210 || v27->uSpecEnchantmentType 5216 || v27->uSpecEnchantmentType
5211 || v27->uEnchantmentType 5217 || v27->uEnchantmentType
5212 || v51 && v51 != 1 && v51 != 2 5218 || v51 && v51 != 1 && v51 != 2
5213 || (signed int)v33 >= 500 ) 5219 || (signed int)v33 >= 500 )
5214 goto LABEL_92; 5220 {
5221 pMouse->RemoveHoldingItem();
5222 dword_50CDCC = 1;
5223 return;
5224 }
5215 v34 = *(int *)&aSbwb00[4 * pParty->pPickedItem.uItemID + 4]; 5225 v34 = *(int *)&aSbwb00[4 * pParty->pPickedItem.uItemID + 4];
5216 a2.y = (int)v29 << 7; 5226 a2.y = (int)v29 << 7;
5217 v31 = (double)(signed int)((int)v29 << 7); 5227 v31 = (double)(signed int)((int)v29 << 7);
5218 v27->uSpecEnchantmentType = v34; 5228 v27->uSpecEnchantmentType = v34;
5219 } 5229 }
5225 || (pOut.y = v27->uAttributes, pOut.y & 2) 5235 || (pOut.y = v27->uAttributes, pOut.y & 2)
5226 || v27->uSpecEnchantmentType 5236 || v27->uSpecEnchantmentType
5227 || v27->uEnchantmentType 5237 || v27->uEnchantmentType
5228 || v51 && v51 != 1 && v51 != 2 5238 || v51 && v51 != 1 && v51 != 2
5229 || (signed int)v30 >= 500 ) 5239 || (signed int)v30 >= 500 )
5230 goto LABEL_92; 5240 {
5241 pMouse->RemoveHoldingItem();
5242 dword_50CDCC = 1;
5243 return;
5244 }
5231 a2.y = (int)v29 << 7; 5245 a2.y = (int)v29 << 7;
5232 v27->uSpecEnchantmentType = 40; 5246 v27->uSpecEnchantmentType = 40;
5233 v31 = (double)a2.y; 5247 v31 = (double)a2.y;
5234 } 5248 }
5235 v32 = pParty->uTimePlayed + (signed int)(signed __int64)(v31 * 0.033333335); 5249 v32 = pParty->uTimePlayed + (signed int)(signed __int64)(v31 * 0.033333335);
5238 LOBYTE(v32) = LOBYTE(pOut.y) | 0x18; 5252 LOBYTE(v32) = LOBYTE(pOut.y) | 0x18;
5239 HIDWORD(v27->uExpireTime) = HIDWORD(v32); 5253 HIDWORD(v27->uExpireTime) = HIDWORD(v32);
5240 v27->uAttributes = v32; 5254 v27->uAttributes = v32;
5241 } 5255 }
5242 _50C9A8_item_enchantment_timer = 256; 5256 _50C9A8_item_enchantment_timer = 256;
5243 goto LABEL_92; 5257 pMouse->RemoveHoldingItem();
5258 dword_50CDCC = 1;
5259 return;
5244 } 5260 }
5245 v36 = (70.0 - (double)pParty->pPickedItem.uEnchantmentType) * 0.01; 5261 v36 = (70.0 - (double)pParty->pPickedItem.uEnchantmentType) * 0.01;
5246 if ( v36 < 0.0 ) 5262 if ( v36 < 0.0 )
5247 v36 = 0.0; 5263 v36 = 0.0;
5248 if ( v51 != 12 ) 5264 if ( v51 != 12 )
5252 } 5268 }
5253 a2.y = v27->uMaxCharges; 5269 a2.y = v27->uMaxCharges;
5254 v37 = (signed __int64)((double)a2.y - v36 * (double)a2.y); 5270 v37 = (signed __int64)((double)a2.y - v36 * (double)a2.y);
5255 v27->uMaxCharges = v37; 5271 v27->uMaxCharges = v37;
5256 v27->uNumCharges = (unsigned __int8)v37; 5272 v27->uNumCharges = (unsigned __int8)v37;
5257 goto LABEL_92; 5273 pMouse->RemoveHoldingItem();
5274 dword_50CDCC = 1;
5275 return;
5258 } 5276 }
5259 v14 = v13 - 222; 5277 v14 = v13 - 222;
5260 v15 = pParty->pPickedItem.uItemID - 222; 5278 v15 = pParty->pPickedItem.uItemID - 222;
5261 v47 = v14; 5279 v47 = v14;
5262 y.y = 0; 5280 y.y = 0;
5393 LABEL_74: 5411 LABEL_74:
5394 v22 = (int)((char *)v0 + 36 * pOut.z); 5412 v22 = (int)((char *)v0 + 36 * pOut.z);
5395 if ( !(pItemsTable->pItems[*(int *)(v22 + 532) ].uItemID_Rep_St) ) 5413 if ( !(pItemsTable->pItems[*(int *)(v22 + 532) ].uItemID_Rep_St) )
5396 *(int *)(v22 + 552) |= 1u; 5414 *(int *)(v22 + 552) |= 1u;
5397 if ( !dword_4E455C ) 5415 if ( !dword_4E455C )
5398 goto LABEL_92; 5416 {
5417 pMouse->RemoveHoldingItem();
5418 dword_50CDCC = 1;
5419 return;
5420 }
5399 v0->PlaySound(SPEECH_16, 0); 5421 v0->PlaySound(SPEECH_16, 0);
5400 goto LABEL_91; 5422 dword_4E455C = 0;
5423 pMouse->RemoveHoldingItem();
5424 dword_50CDCC = 1;
5425 return;
5401 } 5426 }
5402 if ( v45 ) 5427 if ( v45 )
5403 { 5428 {
5404 if ( *(int *)(a2.y + 532) == 221 ) 5429 if ( *(int *)(a2.y + 532) == 221 )
5405 *(int *)(a2.y + 532) = pParty->pPickedItem.uItemID; 5430 *(int *)(a2.y + 532) = pParty->pPickedItem.uItemID;
5434 if ( dword_4E455C ) 5459 if ( dword_4E455C )
5435 { 5460 {
5436 if ( v0->CanAct() ) 5461 if ( v0->CanAct() )
5437 v0->PlaySound(SPEECH_17, 0); 5462 v0->PlaySound(SPEECH_17, 0);
5438 ShowStatusBarString(pGlobalTXT_LocalizationStrings[444], 2u); 5463 ShowStatusBarString(pGlobalTXT_LocalizationStrings[444], 2u);
5439 LABEL_91:
5440 dword_4E455C = 0; 5464 dword_4E455C = 0;
5441 } 5465 }
5442 LABEL_92:
5443 pMouse->RemoveHoldingItem(); 5466 pMouse->RemoveHoldingItem();
5444 dword_50CDCC = 1; 5467 dword_50CDCC = 1;
5445 return; 5468 return;
5446 } 5469 }
5447 *(int *)(v11 + 536) = v9 + pItemsTable->pItems[pParty->pPickedItem.uItemID].uDamageDice; 5470 *(int *)(v11 + 536) = v9 + pItemsTable->pItems[pParty->pPickedItem.uItemID].uDamageDice;