Mercurial > mm7

comparison mm7_5.cpp @ 89:98cd93e14777

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
pointer fixes
author zipi
date Wed, 06 Feb 2013 21:19:42 +0000
parents 1faa29fd4c2d
children d61f6bc04bf2
comparison
equal deleted inserted replaced
88:7bdf8f1150eb 89:98cd93e14777
4154 continue; 4154 continue;
4155 } 4155 }
4156 if ( pUIMessageType == UIMSG_PlayerCreationClickOK ) 4156 if ( pUIMessageType == UIMSG_PlayerCreationClickOK )
4157 { 4157 {
4158 GUIWindow::Create(580, 431, 0, 0, (enum WindowType)90, (int)pPlayerCreationUI_BtnOK, 0); 4158 GUIWindow::Create(580, 431, 0, 0, (enum WindowType)90, (int)pPlayerCreationUI_BtnOK, 0);
4159 if ( PlayerCreation_ComputeAttributeBonus() || !sub_4908DE() ) 4159 if ( PlayerCreation_ComputeAttributeBonus() || !PlayerCreation_Chose4Skills() )
4160 GameUI_StatusBar_TimedStringTimeLeft = GetTickCount() + 4000; 4160 GameUI_StatusBar_TimedStringTimeLeft = GetTickCount() + 4000;
4161 else 4161 else
4162 uGameState = 6; 4162 uGameState = 6;
4163 continue; 4163 continue;
4164 } 4164 }
4945 unsigned int v22; // edx@17 4945 unsigned int v22; // edx@17
4946 int v23; // edx@18 4946 int v23; // edx@18
4947 int v24; // eax@18 4947 int v24; // eax@18
4948 Vec3_int_ v25; // ST04_12@19 4948 Vec3_int_ v25; // ST04_12@19
4949 unsigned int v26; // ebx@20 4949 unsigned int v26; // ebx@20
4950 char *v27; // edi@20 4950 Player *v27; // edi@20
4951 char *v28; // edi@27 4951 char *v28; // edi@27
4952 int v29; // ebx@29 4952 int v29; // ebx@29
4953 int v30; // eax@29 4953 int v30; // eax@29
4954 int v31; // edx@29 4954 int v31; // edx@29
4955 int v32; // eax@29 4955 int v32; // eax@29
5071 v25.y = *((short *)v1 - 100); 5071 v25.y = *((short *)v1 - 100);
5072 v25.x = *((short *)v1 - 200); 5072 v25.x = *((short *)v1 - 200);
5073 if ( sub_407A1C(pParty->vPosition.x, pParty->vPosition.y, pParty->vPosition.z + pParty->sEyelevel, v25) ) 5073 if ( sub_407A1C(pParty->vPosition.x, pParty->vPosition.y, pParty->vPosition.z + pParty->sEyelevel, v25) )
5074 { 5074 {
5075 v26 = 0; 5075 v26 = 0;
5076 v27 = (char *)&pParty->pPlayers[0].pConditions[15]; 5076 v27 = pParty->pPlayers;//[0].pConditions[15];
5077 do 5077 do
5078 { 5078 {
5079 if ( !(*((int *)v27 - 1) | *((int *)v27 - 2)) && !*(_QWORD *)v27 && !*((_QWORD *)v27 + 1) ) 5079 if ( !(HIDWORD(v27->pConditions[14]) | LODWORD(v27->pConditions[14])) && !v27->pConditions[15] && !v27->pConditions[16] )
5080 DamagePlayerFromMonster(*((short *)v1 - 300), stru_50FE08.field_450[v43], pVelocity, v26); 5080 DamagePlayerFromMonster(*((short *)v1 - 300), stru_50FE08.field_450[v43], pVelocity, v26);
5081 v27 += 6972; 5081 ++v27;
5082 ++v26; 5082 ++v26;
5083 } 5083 }
5084 while ( (signed int)v27 < (signed int)&pParty->pHirelings[1].evtb ); 5084 while ( v27 <= &pParty->pPlayers[3] );
5085 } 5085 }
5086 } 5086 }
5087 uActorID = 0; 5087 uActorID = 0;
5088 if ( (signed int)uNumActors > 0 ) 5088 if ( (signed int)uNumActors > 0 )
5089 { 5089 {