comparison Party.cpp @ 381:39a60868e9c7

Merge
author Nomad
date Fri, 22 Feb 2013 22:36:31 +0200
parents 243418228760
children 7189d0bddf07
comparison
equal deleted inserted replaced
380:2f67762d04f6 381:39a60868e9c7
1060 v14 = 0; 1060 v14 = 0;
1061 v7 = v2->pInventoryItems;//[0].field_1A; 1061 v7 = v2->pInventoryItems;//[0].field_1A;
1062 v8 = 138; 1062 v8 = 138;
1063 do 1063 do
1064 { 1064 {
1065 if ( v7->uItemID == 601 && (unsigned __int8)v7->field_1A== v15 + 1 ) 1065 if ( v7->uItemID == 601 && (unsigned __int8)v7->uHolderPlayer== v15 + 1 )
1066 v14 = 1; 1066 v14 = 1;
1067 ++v7; 1067 ++v7;
1068 --v8; 1068 --v8;
1069 } 1069 }
1070 while ( v8 ); 1070 while ( v8 );