diff Game/GameMenu.cpp @ 2574:dd36326a9994

More texture refactoring GetLeather -> DrawTextureCustomHeight
author a.parshin
date Mon, 07 Mar 2016 03:48:40 +0200
parents d87bfbd3bb3b
children a76d408c5132
line wrap: on
line diff
--- a/Game/GameMenu.cpp	Sat Mar 05 16:25:53 2016 +0200
+++ b/Game/GameMenu.cpp	Mon Mar 07 03:48:40 2016 +0200
@@ -345,16 +345,16 @@
             case UIMSG_ChangeSoundVolume:
                 if (param == 4)//reduce sound level button left
                 {
-                    --uSoundVolumeMultiplier;
-                    if ((char)uSoundVolumeMultiplier < 1)
-                        uSoundVolumeMultiplier = 0;
+                    if (uSoundVolumeMultiplier > 0)
+                        --uSoundVolumeMultiplier;
+
                     new OnButtonClick2(243, 162, 0, 0, (int)pBtn_SliderLeft, (char *)1);
                     pAudioPlayer->SetMasterVolume(pSoundVolumeLevels[uSoundVolumeMultiplier] * 128.0f);
                     pAudioPlayer->PlaySound(SOUND_church, -1, 0, -1, 0, 0, 0, 0);
-                    int v = AIL_redbook_volume(pAudioPlayer->hAILRedbook);
+                    //int v = AIL_redbook_volume(pAudioPlayer->hAILRedbook);
                     //v = v+1;
-                    if (v)
-                        __debugbreak();
+                    //if (v)
+                    //    __debugbreak();
                     continue;
                 }
                 if (param == 5)//Increase sound level button right
@@ -543,10 +543,13 @@
                     {
                         for (uint i = 0; i < 5; i++)
                         {
-                            if (uTextureID_Optkb[i])
-                                pIcons_LOD->pTextures[uTextureID_Optkb[i]].Release();
+                            if (game_ui_options_controls[i])
+                            {
+                                game_ui_options_controls[i]->Release();
+                                game_ui_options_controls[i] = nullptr;
+                            }
                         }
-                        memset(uTextureID_Optkb.data(), 0, 20);
+
                         pIcons_LOD->SyncLoadedFilesCount();
                         for (uint i = 0; i < 28; ++i)
                         {