Mercurial > mm7

comparison Game/GameMenu.cpp @ 2574:dd36326a9994

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
More texture refactoring GetLeather -> DrawTextureCustomHeight
author a.parshin
date Mon, 07 Mar 2016 03:48:40 +0200
parents d87bfbd3bb3b
children a76d408c5132
comparison
equal deleted inserted replaced
2573:0c67be4ec900 2574:dd36326a9994
343 pAudioPlayer->SetMusicVolume(pSoundVolumeLevels[uMusicVolimeMultiplier] * 64.0f); 343 pAudioPlayer->SetMusicVolume(pSoundVolumeLevels[uMusicVolimeMultiplier] * 64.0f);
344 continue; 344 continue;
345 case UIMSG_ChangeSoundVolume: 345 case UIMSG_ChangeSoundVolume:
346 if (param == 4)//reduce sound level button left 346 if (param == 4)//reduce sound level button left
347 { 347 {
348 --uSoundVolumeMultiplier; 348 if (uSoundVolumeMultiplier > 0)
349 if ((char)uSoundVolumeMultiplier < 1) 349 --uSoundVolumeMultiplier;
350 uSoundVolumeMultiplier = 0; 350
351 new OnButtonClick2(243, 162, 0, 0, (int)pBtn_SliderLeft, (char *)1); 351 new OnButtonClick2(243, 162, 0, 0, (int)pBtn_SliderLeft, (char *)1);
352 pAudioPlayer->SetMasterVolume(pSoundVolumeLevels[uSoundVolumeMultiplier] * 128.0f); 352 pAudioPlayer->SetMasterVolume(pSoundVolumeLevels[uSoundVolumeMultiplier] * 128.0f);
353 pAudioPlayer->PlaySound(SOUND_church, -1, 0, -1, 0, 0, 0, 0); 353 pAudioPlayer->PlaySound(SOUND_church, -1, 0, -1, 0, 0, 0, 0);
354 int v = AIL_redbook_volume(pAudioPlayer->hAILRedbook); 354 //int v = AIL_redbook_volume(pAudioPlayer->hAILRedbook);
355 //v = v+1; 355 //v = v+1;
356 if (v) 356 //if (v)
357 __debugbreak(); 357 // __debugbreak();
358 continue; 358 continue;
359 } 359 }
360 if (param == 5)//Increase sound level button right 360 if (param == 5)//Increase sound level button right
361 { 361 {
362 ++uSoundVolumeMultiplier; 362 ++uSoundVolumeMultiplier;
541 } 541 }
542 if (!pKeyBindingFlag) 542 if (!pKeyBindingFlag)
543 { 543 {
544 for (uint i = 0; i < 5; i++) 544 for (uint i = 0; i < 5; i++)
545 { 545 {
546 if (uTextureID_Optkb[i]) 546 if (game_ui_options_controls[i])
547 pIcons_LOD->pTextures[uTextureID_Optkb[i]].Release(); 547 {
548 game_ui_options_controls[i]->Release();
549 game_ui_options_controls[i] = nullptr;
550 }
548 } 551 }
549 memset(uTextureID_Optkb.data(), 0, 20); 552
550 pIcons_LOD->SyncLoadedFilesCount(); 553 pIcons_LOD->SyncLoadedFilesCount();
551 for (uint i = 0; i < 28; ++i) 554 for (uint i = 0; i < 28; ++i)
552 { 555 {
553 if (pKeyActionMap->GetActionVKey((enum InputAction)i) != pPrevVirtualCidesMapping[i]) 556 if (pKeyActionMap->GetActionVKey((enum InputAction)i) != pPrevVirtualCidesMapping[i])
554 { 557 {