Mercurial > mm7

comparison mm7_2.cpp @ 602:628694cd5744

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Margaret working
author zipi
date Wed, 06 Mar 2013 23:26:46 +0000
parents deb559e4fe47
children cfca6297e4ae 5bf285f56fa8
comparison
equal deleted inserted replaced
601:d59398528e4f 602:628694cd5744
3170 pMessageQueue_50CBD0->pMessages[pMessageQueue_50CBD0->uNumMessages].param = 0; 3170 pMessageQueue_50CBD0->pMessages[pMessageQueue_50CBD0->uNumMessages].param = 0;
3171 *(&pMessageQueue_50CBD0->uNumMessages + 3 * pMessageQueue_50CBD0->uNumMessages + 3) = 0; 3171 *(&pMessageQueue_50CBD0->uNumMessages + 3 * pMessageQueue_50CBD0->uNumMessages + 3) = 0;
3172 ++pMessageQueue_50CBD0->uNumMessages; 3172 ++pMessageQueue_50CBD0->uNumMessages;
3173 }*/ 3173 }*/
3174 dword_50C9DC = 195; 3174 dword_50C9DC = 195;
3175 ptr_50C9E0 = GetNPCData(uDialogue_SpeakingActorNPC_ID); 3175 ptr_50C9E0 = GetNPCData(sDialogue_SpeakingActorNPC_ID);
3176 return 0; 3176 return 0;
3177 } 3177 }
3178 if ( a1 == 42 ) 3178 if ( a1 == 42 )
3179 { 3179 {
3180 v32 = 0; 3180 v32 = 0;
11321 v17 = 1; 11321 v17 = 1;
11322 //v1 = 0; 11322 //v1 = 0;
11323 v4 = (v3 - 1) % 3; 11323 v4 = (v3 - 1) % 3;
11324 if ( 2 == v4 ) 11324 if ( 2 == v4 )
11325 { 11325 {
11326 if ( pActor->uNPC_ID && pActor->uNPC_ID < 5000 ) 11326 if ( pActor->sNPC_ID && pActor->sNPC_ID < 5000 )
11327 continue; 11327 continue;
11328 } 11328 }
11329 else 11329 else
11330 { 11330 {
11331 if ( v4 != 1 ) 11331 if ( v4 != 1 )
11332 { 11332 {
11333 if ( v4 != 0 || pActor->uNPC_ID ) 11333 if ( v4 != 0 || pActor->sNPC_ID )
11334 continue; 11334 continue;
11335 goto LABEL_12; 11335 goto LABEL_12;
11336 } 11336 }
11337 } 11337 }
11338 if ( pActor->uNPC_ID > 0 && pActor->uNPC_ID < 5000 ) 11338 if ( pActor->sNPC_ID > 0 && pActor->sNPC_ID < 5000 )
11339 continue; 11339 continue;
11340 if ( v17 ) 11340 if ( v17 )
11341 { 11341 {
11342 pNPCStats->InitializeAdditionalNPCs(&pNPCStats->pAdditionalNPC[pNPCStats->uNewlNPCBufPos], v3, 0, v19); 11342 pNPCStats->InitializeAdditionalNPCs(&pNPCStats->pAdditionalNPC[pNPCStats->uNewlNPCBufPos], v3, 0, v19);
11343 v14 = LOWORD(pNPCStats->uNewlNPCBufPos) + 5000; 11343 v14 = LOWORD(pNPCStats->uNewlNPCBufPos) + 5000;
11344 ++pNPCStats->uNewlNPCBufPos; 11344 ++pNPCStats->uNewlNPCBufPos;
11345 pActor->uNPC_ID = v14; 11345 pActor->sNPC_ID = v14;
11346 continue; 11346 continue;
11347 } 11347 }
11348 LABEL_12: 11348 LABEL_12:
11349 pActor->uNPC_ID = 0; 11349 pActor->sNPC_ID = 0;
11350 //LABEL_13: 11350 //LABEL_13:
11351 //++v15; 11351 //++v15;
11352 //v2 += 836; 11352 //v2 += 836;
11353 //} 11353 //}
11354 //while ( v15 < (signed int)uNumActors ); 11354 //while ( v15 < (signed int)uNumActors );
15451 else 15451 else
15452 { 15452 {
15453 if ( !v13->GetActorsRelation(0) && !(BYTE2(v13->uAttributes) & 8) && v13->CanAct() ) 15453 if ( !v13->GetActorsRelation(0) && !(BYTE2(v13->uAttributes) & 8) && v13->CanAct() )
15454 { 15454 {
15455 Actor::FaceObject(v12, 4u, 0, 0); 15455 Actor::FaceObject(v12, 4u, 0, 0);
15456 if ( v13->uNPC_ID ) 15456 if ( v13->sNPC_ID )
15457 { 15457 {
15458 pMessageQueue_50CBD0->AddMessage(UIMSG_StartNPCDialogue, v12, 0); 15458 pMessageQueue_50CBD0->AddMessage(UIMSG_StartNPCDialogue, v12, 0);
15459 /*if ( (signed int)pMessageQueue_50CBD0->uNumMessages < 40 ) 15459 /*if ( (signed int)pMessageQueue_50CBD0->uNumMessages < 40 )
15460 { 15460 {
15461 pMessageQueue_50CBD0->pMessages[pMessageQueue_50CBD0->uNumMessages].eType = (UIMessageType)161; 15461 pMessageQueue_50CBD0->pMessages[pMessageQueue_50CBD0->uNumMessages].eType = (UIMessageType)161;