Mercurial > mm7

comparison mm7_5.cpp @ 735:6daaa2f18d0d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fixed some house sounds & shop-related stuff
author Nomad
date Fri, 22 Mar 2013 20:01:46 +0200
parents de482c901171
children 9f7db515a8d7
comparison
equal deleted inserted replaced
734:2f4e33c1ed24 735:6daaa2f18d0d
388 pActor = &actor; 388 pActor = &actor;
389 pActor->InitializeDialogue(v0); 389 pActor->InitializeDialogue(v0);
390 } 390 }
391 } 391 }
392 continue; 392 continue;
393 case UIMSG_51: 393
394 sub_4BDB56_buy_skill____(); 394 case UIMSG_BuyInShop_Identify_Repair:
395 UIShop_Buy_Identify_Repair();
395 continue; 396 continue;
397
396 case UIMSG_ClickNPCTopic: 398 case UIMSG_ClickNPCTopic:
397 ClickNPCTopic(uMessageParam); 399 ClickNPCTopic(uMessageParam);
398 continue; 400 continue;
399 case UIMSG_SelectShopDialogueOption: 401 case UIMSG_SelectShopDialogueOption:
400 OnSelectShopDialogueOption(uMessageParam); 402 OnSelectShopDialogueOption(uMessageParam);
1359 viewparams->bRedrawGameUI = v0; 1361 viewparams->bRedrawGameUI = v0;
1360 pIcons_LOD->_4355F7(); 1362 pIcons_LOD->_4355F7();
1361 continue; 1363 continue;
1362 case SCREEN_INPUT_BLV: 1364 case SCREEN_INPUT_BLV:
1363 if ( uCurrentHouse_Animation == 153 ) 1365 if ( uCurrentHouse_Animation == 153 )
1364 HousePlaySomeSound(0x99u, 3); 1366 PlayHouseSound(0x99u, HouseSound_Greeting_2);
1365 pVideoPlayer->Unload(); 1367 pVideoPlayer->Unload();
1366 if ( dword_5B65CC ) 1368 if ( dword_5B65CC )
1367 { 1369 {
1368 pParty->field_709 = 0; 1370 pParty->field_709 = 0;
1369 LOBYTE(pNPCStats->pNewNPCData[dword_5B65CC].uFlags) &= 0x7Fu; 1371 LOBYTE(pNPCStats->pNewNPCData[dword_5B65CC].uFlags) &= 0x7Fu;
1575 case UIMSG_TransitionUI_Confirm: 1577 case UIMSG_TransitionUI_Confirm:
1576 if ( pMessageQueue_50CBD0->uNumMessages ) 1578 if ( pMessageQueue_50CBD0->uNumMessages )
1577 pMessageQueue_50CBD0->uNumMessages = pMessageQueue_50CBD0->pMessages[0].field_8 != 0; 1579 pMessageQueue_50CBD0->uNumMessages = pMessageQueue_50CBD0->pMessages[0].field_8 != 0;
1578 dword_50CDC8 = v0; 1580 dword_50CDC8 = v0;
1579 sub_42FBDD(); 1581 sub_42FBDD();
1580 HousePlaySomeSound(uCurrentHouse_Animation, 2); 1582 PlayHouseSound(uCurrentHouse_Animation, HouseSound_NotEnoughMoney);
1581 pVideoPlayer->Unload(); 1583 pVideoPlayer->Unload();
1582 sub_44603D(); 1584 sub_44603D();
1583 viewparams->bRedrawGameUI = v0; 1585 viewparams->bRedrawGameUI = v0;
1584 if ( dword_59117C_teleportx | dword_591178_teleporty | dword_591174_teleportz | dword_591170_teleport_directiony | dword_59116C_teleport_directionx | dword_591168_teleport_speedz ) 1586 if ( dword_59117C_teleportx | dword_591178_teleporty | dword_591174_teleportz | dword_591170_teleport_directiony | dword_59116C_teleport_directionx | dword_591168_teleport_speedz )
1585 { 1587 {