Mercurial > mm7
diff mm7_1.cpp @ 208:07eb7d649bd5
Слияние
author | Ritor1 |
---|---|
date | Sat, 16 Feb 2013 08:42:58 +0600 |
parents | 9b77686e2239 |
children | 30aa44013f7a 8113753ed2ae |
line wrap: on
line diff
--- a/mm7_1.cpp Sat Feb 16 08:42:43 2013 +0600 +++ b/mm7_1.cpp Sat Feb 16 08:42:58 2013 +0600 @@ -48,6 +48,7 @@ #include "stru298.h" #include "StorylineTextTable.h" #include "Events2D.h" +#include "texts.h" #include "mm7_data.h" @@ -2081,7 +2082,7 @@ pWindowList[v3].pCurrentPosActiveItem -= v12; if ( v8 ) { - pAudioPlayer->PlaySound((SoundID)66, v1, v1, -1, v1, v1, v1, v1); + pAudioPlayer->PlaySound(SOUND_Button, v1, v1, -1, v1, v1, v1, v1); v2 = pMessageQueue_50CBD0->uNumMessages; } } @@ -2121,7 +2122,7 @@ pWindowList[v3].pCurrentPosActiveItem = v7; if ( v8 ) { - pAudioPlayer->PlaySound((SoundID)66, v1, v1, -1, v1, v1, v1, v1); + pAudioPlayer->PlaySound(SOUND_Button, v1, v1, -1, v1, v1, v1, v1); v2 = pMessageQueue_50CBD0->uNumMessages; } } @@ -2450,13 +2451,13 @@ } else { - v83 = (char *)8; + v83 = (char *)SPEECH_8; if ( _this->GetValue() < 100 * (pPlayers[uActiveCharacter]->uLevel + 5) ) - v83 = (char *)7; + v83 = (char *)SPEECH_7; } if ( dword_4E455C ) { - pPlayers[uActiveCharacter]->PlaySound((int)v83, 0); + pPlayers[uActiveCharacter]->PlaySound((PlayerSpeech)(int)v83, 0); dword_4E455C = 0; } } @@ -2468,14 +2469,14 @@ if ( v10 ) _this->uAttributes = _this->uAttributes & 0xFFFFFFFD | 1; v10 = (v12->uAttributes & 2) == 0; - v83 = (char *)11; + v83 = (char *)SPEECH_11; if ( v10 ) - v83 = (char *)10; + v83 = (char *)SPEECH_10; else ShowStatusBarString(pGlobalTXT_LocalizationStrings[448], 2u); if ( dword_4E455C ) { - pPlayers[uActiveCharacter]->PlaySound((int)v83, 0); + pPlayers[uActiveCharacter]->PlaySound((PlayerSpeech)(int)v83, 0); dword_4E455C = 0; } } @@ -3263,15 +3264,15 @@ if ( v119 | v116 | i | (unsigned int)v112 ) { if ( v121->pMonsterInfo.uLevel >= v47->uLevel - 5 ) - v73 = 105; + v73 = SPEECH_105; else - v73 = 104; + v73 = SPEECH_104; } else { - v73 = 106; - } - v47->PlaySound(v73, 0); + v73 = SPEECH_106; + } + v47->PlaySound((PlayerSpeech)v73, 0); } LABEL_84: a2 = pParty->pPlayers; @@ -4089,7 +4090,7 @@ if ( v22 == v5 ) { if ( uActiveCharacter ) - pPlayers[uActiveCharacter]->PlaySound(15, 0); + pPlayers[uActiveCharacter]->PlaySound(SPEECH_15, 0); return 0; } v7 = pIcons_LOD->LoadTexture(pItemsTable->pItems[v4->uItemID].pIconName, TEXTURE_16BIT_PALETTE); @@ -4519,7 +4520,7 @@ if ( *(float *)&sRotY != 0.0 ) { if ( !dword_507CD8 ) - pPlayers[uActiveCharacter]->PlaySound(4, 0); + pPlayers[uActiveCharacter]->PlaySound(SPEECH_4, 0); } dword_507CD8 = 0; v3 = GUIWindow::Create(0, 0, 640u, 480u, WINDOW_Chest, a4, 0); @@ -5756,7 +5757,7 @@ goto LABEL_9; v4 = pPlayers[uActiveCharacter]; } - v4->PlaySound(15, 0); + v4->PlaySound(SPEECH_15, 0); } LABEL_9: if ( !pCurrentScreen )