Mercurial > mm7

comparison mm7_1.cpp @ 190:9b77686e2239

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge
author Gloval
date Sat, 16 Feb 2013 00:44:38 +0400
parents 038a4d09406f 49728858c35e
children 30aa44013f7a 8113753ed2ae
comparison
equal deleted inserted replaced
189:038a4d09406f 190:9b77686e2239
2080 { 2080 {
2081 v8 = pCurrentScreen == SCREEN_PARTY_CREATION; 2081 v8 = pCurrentScreen == SCREEN_PARTY_CREATION;
2082 pWindowList[v3].pCurrentPosActiveItem -= v12; 2082 pWindowList[v3].pCurrentPosActiveItem -= v12;
2083 if ( v8 ) 2083 if ( v8 )
2084 { 2084 {
2085 pAudioPlayer->PlaySound((SoundID)66, v1, v1, -1, v1, v1, v1, v1); 2085 pAudioPlayer->PlaySound(SOUND_Button, v1, v1, -1, v1, v1, v1, v1);
2086 v2 = pMessageQueue_50CBD0->uNumMessages; 2086 v2 = pMessageQueue_50CBD0->uNumMessages;
2087 } 2087 }
2088 } 2088 }
2089 if ( pWindowList[v3].field_30 != v1 ) 2089 if ( pWindowList[v3].field_30 != v1 )
2090 goto LABEL_47; 2090 goto LABEL_47;
2120 { 2120 {
2121 v8 = pCurrentScreen == SCREEN_PARTY_CREATION; 2121 v8 = pCurrentScreen == SCREEN_PARTY_CREATION;
2122 pWindowList[v3].pCurrentPosActiveItem = v7; 2122 pWindowList[v3].pCurrentPosActiveItem = v7;
2123 if ( v8 ) 2123 if ( v8 )
2124 { 2124 {
2125 pAudioPlayer->PlaySound((SoundID)66, v1, v1, -1, v1, v1, v1, v1); 2125 pAudioPlayer->PlaySound(SOUND_Button, v1, v1, -1, v1, v1, v1, v1);
2126 v2 = pMessageQueue_50CBD0->uNumMessages; 2126 v2 = pMessageQueue_50CBD0->uNumMessages;
2127 } 2127 }
2128 } 2128 }
2129 if ( pWindowList[v3].field_30 != v1 ) 2129 if ( pWindowList[v3].field_30 != v1 )
2130 goto LABEL_47; 2130 goto LABEL_47;
2449 { 2449 {
2450 ShowStatusBarString(pGlobalTXT_LocalizationStrings[446], 2u); 2450 ShowStatusBarString(pGlobalTXT_LocalizationStrings[446], 2u);
2451 } 2451 }
2452 else 2452 else
2453 { 2453 {
2454 v83 = (char *)8; 2454 v83 = (char *)SPEECH_8;
2455 if ( _this->GetValue() < 100 * (pPlayers[uActiveCharacter]->uLevel + 5) ) 2455 if ( _this->GetValue() < 100 * (pPlayers[uActiveCharacter]->uLevel + 5) )
2456 v83 = (char *)7; 2456 v83 = (char *)SPEECH_7;
2457 } 2457 }
2458 if ( dword_4E455C ) 2458 if ( dword_4E455C )
2459 { 2459 {
2460 pPlayers[uActiveCharacter]->PlaySound((int)v83, 0); 2460 pPlayers[uActiveCharacter]->PlaySound((PlayerSpeech)(int)v83, 0);
2461 dword_4E455C = 0; 2461 dword_4E455C = 0;
2462 } 2462 }
2463 } 2463 }
2464 _this->UpdateTempBonus(pParty->uTimePlayed); 2464 _this->UpdateTempBonus(pParty->uTimePlayed);
2465 if ( a2.y ) 2465 if ( a2.y )
2467 v10 = pPlayers[uActiveCharacter]->CanRepair(_this) == 1; 2467 v10 = pPlayers[uActiveCharacter]->CanRepair(_this) == 1;
2468 v12 = _this; 2468 v12 = _this;
2469 if ( v10 ) 2469 if ( v10 )
2470 _this->uAttributes = _this->uAttributes & 0xFFFFFFFD | 1; 2470 _this->uAttributes = _this->uAttributes & 0xFFFFFFFD | 1;
2471 v10 = (v12->uAttributes & 2) == 0; 2471 v10 = (v12->uAttributes & 2) == 0;
2472 v83 = (char *)11; 2472 v83 = (char *)SPEECH_11;
2473 if ( v10 ) 2473 if ( v10 )
2474 v83 = (char *)10; 2474 v83 = (char *)SPEECH_10;
2475 else 2475 else
2476 ShowStatusBarString(pGlobalTXT_LocalizationStrings[448], 2u); 2476 ShowStatusBarString(pGlobalTXT_LocalizationStrings[448], 2u);
2477 if ( dword_4E455C ) 2477 if ( dword_4E455C )
2478 { 2478 {
2479 pPlayers[uActiveCharacter]->PlaySound((int)v83, 0); 2479 pPlayers[uActiveCharacter]->PlaySound((PlayerSpeech)(int)v83, 0);
2480 dword_4E455C = 0; 2480 dword_4E455C = 0;
2481 } 2481 }
2482 } 2482 }
2483 } 2483 }
2484 v13 = _this->uAttributes; 2484 v13 = _this->uAttributes;
3262 { 3262 {
3263 v47 = pPlayers[uActiveCharacter]; 3263 v47 = pPlayers[uActiveCharacter];
3264 if ( v119 | v116 | i | (unsigned int)v112 ) 3264 if ( v119 | v116 | i | (unsigned int)v112 )
3265 { 3265 {
3266 if ( v121->pMonsterInfo.uLevel >= v47->uLevel - 5 ) 3266 if ( v121->pMonsterInfo.uLevel >= v47->uLevel - 5 )
3267 v73 = 105; 3267 v73 = SPEECH_105;
3268 else 3268 else
3269 v73 = 104; 3269 v73 = SPEECH_104;
3270 } 3270 }
3271 else 3271 else
3272 { 3272 {
3273 v73 = 106; 3273 v73 = SPEECH_106;
3274 } 3274 }
3275 v47->PlaySound(v73, 0); 3275 v47->PlaySound((PlayerSpeech)v73, 0);
3276 } 3276 }
3277 LABEL_84: 3277 LABEL_84:
3278 a2 = pParty->pPlayers; 3278 a2 = pParty->pPlayers;
3279 do 3279 do
3280 { 3280 {
4088 } 4088 }
4089 LABEL_8: 4089 LABEL_8:
4090 if ( v22 == v5 ) 4090 if ( v22 == v5 )
4091 { 4091 {
4092 if ( uActiveCharacter ) 4092 if ( uActiveCharacter )
4093 pPlayers[uActiveCharacter]->PlaySound(15, 0); 4093 pPlayers[uActiveCharacter]->PlaySound(SPEECH_15, 0);
4094 return 0; 4094 return 0;
4095 } 4095 }
4096 v7 = pIcons_LOD->LoadTexture(pItemsTable->pItems[v4->uItemID].pIconName, TEXTURE_16BIT_PALETTE); 4096 v7 = pIcons_LOD->LoadTexture(pItemsTable->pItems[v4->uItemID].pIconName, TEXTURE_16BIT_PALETTE);
4097 HIWORD(v8) = 0; 4097 HIWORD(v8) = 0;
4098 v9 = v7 != -1 ? (int)&pIcons_LOD->pTextures[v7] : 0; 4098 v9 = v7 != -1 ? (int)&pIcons_LOD->pTextures[v7] : 0;
4518 pAudioPlayer->StopChannels(-1, -1); 4518 pAudioPlayer->StopChannels(-1, -1);
4519 pAudioPlayer->PlaySound((SoundID)208, 0, 0, -1, 0, 0, 0, 0); 4519 pAudioPlayer->PlaySound((SoundID)208, 0, 0, -1, 0, 0, 0, 0);
4520 if ( *(float *)&sRotY != 0.0 ) 4520 if ( *(float *)&sRotY != 0.0 )
4521 { 4521 {
4522 if ( !dword_507CD8 ) 4522 if ( !dword_507CD8 )
4523 pPlayers[uActiveCharacter]->PlaySound(4, 0); 4523 pPlayers[uActiveCharacter]->PlaySound(SPEECH_4, 0);
4524 } 4524 }
4525 dword_507CD8 = 0; 4525 dword_507CD8 = 0;
4526 v3 = GUIWindow::Create(0, 0, 640u, 480u, WINDOW_Chest, a4, 0); 4526 v3 = GUIWindow::Create(0, 0, 640u, 480u, WINDOW_Chest, a4, 0);
4527 pGUIWindow_CurrentMenu = v3; 4527 pGUIWindow_CurrentMenu = v3;
4528 pChestWindow = v3; 4528 pChestWindow = v3;
5755 { 5755 {
5756 if ( !pPlayers[uActiveCharacter]->CanAct() ) 5756 if ( !pPlayers[uActiveCharacter]->CanAct() )
5757 goto LABEL_9; 5757 goto LABEL_9;
5758 v4 = pPlayers[uActiveCharacter]; 5758 v4 = pPlayers[uActiveCharacter];
5759 } 5759 }
5760 v4->PlaySound(15, 0); 5760 v4->PlaySound(SPEECH_15, 0);
5761 } 5761 }
5762 LABEL_9: 5762 LABEL_9:
5763 if ( !pCurrentScreen ) 5763 if ( !pCurrentScreen )
5764 { 5764 {
5765 viewparams->bRedrawGameUI = 1; 5765 viewparams->bRedrawGameUI = 1;