Mercurial > mm7

comparison UI/UIHouses.cpp @ 1919:140ca8123384

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Tavern rest fix
author Ritor1
date Wed, 23 Oct 2013 10:24:38 +0600
parents 2e6d3cd052e0
children 05b433b8cb37
comparison
equal deleted inserted replaced
1918:c77935190b51 1919:140ca8123384
1596 v15 = v14 + v13; 1596 v15 = v14 + v13;
1597 if ( v15 < v14 ) 1597 if ( v15 < v14 )
1598 v15 = v14; 1598 v15 = v14;
1599 while ( GetTickCount() < v15 ) 1599 while ( GetTickCount() < v15 )
1600 sqrt(3.1415926); 1600 sqrt(3.1415926);
1601 while ( sub_4BD8B5() ) 1601 while ( HouseDialogPressCloseBtn() )
1602 ; 1602 ;
1603 pMessageQueue_50CBD0->AddMessage(UIMSG_Escape, 0, 0); 1603 pMessageQueue_50CBD0->AddMessage(UIMSG_Escape, 0, 0);
1604 return; 1604 return;
1605 } 1605 }
1606 else 1606 else
2044 { 2044 {
2045 if ( pParty->uNumGold >= pPriceRoom ) 2045 if ( pParty->uNumGold >= pPriceRoom )
2046 { 2046 {
2047 Party::TakeGold(pPriceRoom); 2047 Party::TakeGold(pPriceRoom);
2048 PlayHouseSound((unsigned int)window_SpeakInHouse->ptr_1C, HouseSound_NotEnoughMoney_TrainingSuccessful); 2048 PlayHouseSound((unsigned int)window_SpeakInHouse->ptr_1C, HouseSound_NotEnoughMoney_TrainingSuccessful);
2049 dialog_menu_id = HOUSE_DIALOGUE_NULL; 2049 //dialog_menu_id = HOUSE_DIALOGUE_NULL;
2050 sub_4BD8B5(); 2050 HouseDialogPressCloseBtn();
2051 GetHouseGoodbyeSpeech(); 2051 GetHouseGoodbyeSpeech();
2052 pVideoPlayer->Unload(); 2052 pVideoPlayer->Unload();
2053 if ( pMessageQueue_50CBD0->uNumMessages ) 2053 if ( pMessageQueue_50CBD0->uNumMessages )
2054 pMessageQueue_50CBD0->uNumMessages = pMessageQueue_50CBD0->pMessages[0].field_8 != 0; 2054 pMessageQueue_50CBD0->uNumMessages = pMessageQueue_50CBD0->pMessages[0].field_8 != 0;
2055 pMessageQueue_50CBD0->pMessages[0].eType = UIMSG_RentRoom; 2055 pMessageQueue_50CBD0->pMessages[0].eType = UIMSG_RentRoom;