Mercurial > mm7

comparison mm7_5.cpp @ 201:30aa44013f7a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
On Items
author Nomad
date Sun, 17 Feb 2013 00:16:48 +0200
parents 66db86fa4ed2
children 0c64754c7fd4
comparison
equal deleted inserted replaced
200:1527f66fd81b 201:30aa44013f7a
340 continue; 340 continue;
341 341
342 if ( pMessageQueue_50CBD0->uNumMessages ) 342 if ( pMessageQueue_50CBD0->uNumMessages )
343 pMessageQueue_50CBD0->uNumMessages = pMessageQueue_50CBD0->pMessages[0].field_8 != 0; 343 pMessageQueue_50CBD0->uNumMessages = pMessageQueue_50CBD0->pMessages[0].field_8 != 0;
344 uAction = 0; 344 uAction = 0;
345 uNumSeconds = uMessage - 134; 345 int hireling_idx = uMessage - UIMSG_StartHireling1Dialogue;
346 v4 = 0; 346 v4 = 0;
347 347
348 for (uint i = 0; i < 2; ++i) 348 for (uint i = 0; i < 2; ++i)
349 //pNPCData0 = pParty->pHirelings; 349 //pNPCData0 = pParty->pHirelings;
350 //do 350 //do
375 //++_this; 375 //++_this;
376 //++pNPCData4; 376 //++pNPCData4;
377 //} 377 //}
378 //while ( _this < (signed int)pNPCStats->uNumNewNPCs ); 378 //while ( _this < (signed int)pNPCStats->uNumNewNPCs );
379 } 379 }
380 if ( (signed int)(uNumSeconds + (unsigned __int8)pParty->field_709) < uAction ) 380
381 if ( (signed int)(hireling_idx + (unsigned __int8)pParty->field_709) < uAction )
381 { 382 {
382 //Actor::Actor(&actor); 383 //Actor::Actor(&actor);
383 memset(&actor, 0, 0x344u); 384 memset(&actor, 0, 0x344u);
384 actor.uNPC_ID += -1 - (unsigned __int8)pParty->field_709 - uNumSeconds; 385 actor.uNPC_ID += -1 - (unsigned __int8)pParty->field_709 - hireling_idx;
385 pActor = &actor; 386 pActor = &actor;
386 //_actor_init_dlg: 387 //_actor_init_dlg:
387 pActor->InitializeDialogue(v0); 388 pActor->InitializeDialogue(v0);
388 } 389 }
389 } 390 }
3622 v137 = 0; 3623 v137 = 0;
3623 v133 = 0; 3624 v133 = 0;
3624 //LABEL_733: 3625 //LABEL_733:
3625 GUIWindow::Create(v9, v8, v133, v137, pWindowType1, (int)pButton2, v163); 3626 GUIWindow::Create(v9, v8, v133, v137, pWindowType1, (int)pButton2, v163);
3626 continue; 3627 continue;
3627 case UIMSG_194: 3628 case UIMSG_Game_Action:
3628 if ( pMessageQueue_50CBD0->uNumMessages ) 3629 if ( pMessageQueue_50CBD0->uNumMessages )
3629 pMessageQueue_50CBD0->uNumMessages = pMessageQueue_50CBD0->pMessages[0].field_8 != 0; 3630 pMessageQueue_50CBD0->uNumMessages = pMessageQueue_50CBD0->pMessages[0].field_8 != 0;
3630 OnPressSpace(); 3631 OnPressSpace();
3631 continue; 3632 continue;
3632 case UIMSG_16F: 3633 case UIMSG_16F:
16170 { 16171 {
16171 back_to_game(); 16172 back_to_game();
16172 return; 16173 return;
16173 } 16174 }
16174 } 16175 }
16176
16175 if ( pParty->pPickedItem.uItemID )//нажатие на портрет перса правой кнопкой мыши с раствором 16177 if ( pParty->pPickedItem.uItemID )//нажатие на портрет перса правой кнопкой мыши с раствором
16176 { 16178 {
16177 //v1 = 0; 16179 //v1 = 0;
16178 //do 16180 //do
16179 for ( pPlayerNum = 0; pPlayerNum < 4; ++pPlayerNum) 16181 for ( pPlayerNum = 0; pPlayerNum < 4; ++pPlayerNum)
16186 } 16188 }
16187 //++v1; 16189 //++v1;
16188 } 16190 }
16189 //while ( v1 < 4 ); 16191 //while ( v1 < 4 );
16190 } 16192 }
16193
16191 pEventTimer->Pause(); 16194 pEventTimer->Pause();
16192 if ( pCurrentScreen <= SCREEN_CHEST ) 16195 if ( pCurrentScreen <= SCREEN_CHEST )
16193 { 16196 {
16194 if ( pCurrentScreen == SCREEN_CHEST ) 16197 if ( pCurrentScreen == SCREEN_CHEST )
16195 { 16198 {