comparison mm7_1.cpp @ 89:98cd93e14777

pointer fixes
author zipi
date Wed, 06 Feb 2013 21:19:42 +0000
parents 1faa29fd4c2d
children 2baff1256844
comparison
equal deleted inserted replaced
88:7bdf8f1150eb 89:98cd93e14777
3693 } 3693 }
3694 3694
3695 //----- (0041F6C1) -------------------------------------------------------- 3695 //----- (0041F6C1) --------------------------------------------------------
3696 void __cdecl RestUI_Initialize() 3696 void __cdecl RestUI_Initialize()
3697 { 3697 {
3698 char *v0; // eax@10 3698 Player *v0; // eax@10
3699 3699
3700 if ( !dword_506F14 ) 3700 if ( !dword_506F14 )
3701 pAudioPlayer->StopChannels(-1, -1); 3701 pAudioPlayer->StopChannels(-1, -1);
3702 if ( pCurrentScreen ) 3702 if ( pCurrentScreen )
3703 { 3703 {
3716 pParty->vPosition.x, 3716 pParty->vPosition.x,
3717 pParty->vPosition.y, 3717 pParty->vPosition.y,
3718 pParty->vPosition.z); 3718 pParty->vPosition.z);
3719 if ( sub_476387() ) 3719 if ( sub_476387() )
3720 { 3720 {
3721 v0 = (char *)&pParty->pPlayers[0].uClass; 3721 v0 = pParty->pPlayers;//[0].uClass;
3722 while ( *v0 != 31 ) 3722 while ( v0 <= &pParty->pPlayers[3] )
3723 { 3723 {
3724 v0 += 6972; 3724 ++v0;
3725 if ( (signed int)v0 >= (signed int)((char *)&pParty->pPickedItem.uExpireTime + 5) ) 3725 if ( v0 > &pParty->pPlayers[3] )
3726 goto LABEL_15; 3726 break;
3727 } 3727 }
3728 ++uRestUI_FoodRequiredToRest; 3728 if(v0->uClass == 31)
3729 } 3729 ++uRestUI_FoodRequiredToRest;
3730 LABEL_15: 3730 }
3731 if ( CheckHiredNPCSpeciality(0x1Du) ) 3731 if ( CheckHiredNPCSpeciality(0x1Du) )
3732 --uRestUI_FoodRequiredToRest; 3732 --uRestUI_FoodRequiredToRest;
3733 if ( CheckHiredNPCSpeciality(0x1Eu) ) 3733 if ( CheckHiredNPCSpeciality(0x1Eu) )
3734 uRestUI_FoodRequiredToRest -= 2; 3734 uRestUI_FoodRequiredToRest -= 2;
3735 if ( CheckHiredNPCSpeciality(0x30u) ) 3735 if ( CheckHiredNPCSpeciality(0x30u) )