Mercurial > mm7

comparison mm7_4.cpp @ 1384:b51332ab228f

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
changed a few member variables in Player to slightly less confusing names
author Grumpy7
date Tue, 16 Jul 2013 20:51:29 +0200
parents 5572e7b02f45
children 613c77e51e38
comparison
equal deleted inserted replaced
1383:0a4254e80036 1384:b51332ab228f
1300 { 1300 {
1301 if ( v21->HasItemEquipped(v22) ) 1301 if ( v21->HasItemEquipped(v22) )
1302 { 1302 {
1303 //v23 = v21->pEquipment.pIndices; 1303 //v23 = v21->pEquipment.pIndices;
1304 auto _idx = v21->pEquipment.pIndices[v22]; 1304 auto _idx = v21->pEquipment.pIndices[v22];
1305 v24 = v21->pInventoryItems[_idx].uItemID; 1305 v24 = v21->pInventoryItemList[_idx].uItemID;
1306 if ( v24 > 134 ) 1306 if ( v24 > 134 )
1307 { 1307 {
1308 if ( v24 == 529 ) 1308 if ( v24 == 529 )
1309 goto LABEL_43; 1309 goto LABEL_43;
1310 if ( v24 == 535 ) 1310 if ( v24 == 535 )
1319 goto LABEL_50; 1319 goto LABEL_50;
1320 } 1320 }
1321 } 1321 }
1322 else 1322 else
1323 { 1323 {
1324 v25 = v21->pInventoryItems[_idx].uSpecEnchantmentType; 1324 v25 = v21->pInventoryItemList[_idx].uSpecEnchantmentType;
1325 if ( v25 <= 50 ) 1325 if ( v25 <= 50 )
1326 { 1326 {
1327 if ( v25 != 50 ) 1327 if ( v25 != 50 )
1328 { 1328 {
1329 v26 = v25 - 37; 1329 v26 = v25 - 37;
1367 if ( (signed int)v22 >= 16 ) 1367 if ( (signed int)v22 >= 16 )
1368 { 1368 {
1369 if ( v48 ) 1369 if ( v48 )
1370 { 1370 {
1371 v31 = 0; 1371 v31 = 0;
1372 v32 = (char *)v21->pInventoryItems; 1372 v32 = (char *)v21->pInventoryItemList;
1373 while ( *(int *)v32 != 601 || (unsigned __int8)v32[26] != v49 + 1 ) 1373 while ( *(int *)v32 != 601 || (unsigned __int8)v32[26] != v49 + 1 )
1374 { 1374 {
1375 ++v31; 1375 ++v31;
1376 v32 += 36; 1376 v32 += 36;
1377 if ( v31 >= 138 ) 1377 if ( v31 >= 138 )
5232 { 5232 {
5233 v10 = 0; 5233 v10 = 0;
5234 v6 = pParty->pPlayers;//[0].pInventoryItems[0].field_1A; 5234 v6 = pParty->pPlayers;//[0].pInventoryItems[0].field_1A;
5235 do 5235 do
5236 { 5236 {
5237 v7 = v6->pInventoryItems; 5237 v7 = v6->pInventoryItemList;
5238 v8 = 138; 5238 v8 = 138;
5239 do 5239 do
5240 { 5240 {
5241 if ( v7->uItemID == ITEM_LICH_JAR_FULL ) 5241 if ( v7->uItemID == ITEM_LICH_JAR_FULL )
5242 { 5242 {