comparison Game.cpp @ 2116:18dee3152c52

Merge
author Grumpy7
date Mon, 23 Dec 2013 15:18:16 +0100
parents 68fbaf45ef66
children f6e59446c133
comparison
equal deleted inserted replaced
2115:90cc547a7927 2116:18dee3152c52
1886 pRenderer->bUseColoredLights = pRenderer->bUseColoredLights == 0; 1886 pRenderer->bUseColoredLights = pRenderer->bUseColoredLights == 0;
1887 continue; 1887 continue;
1888 case UIMSG_ToggleTint: 1888 case UIMSG_ToggleTint:
1889 pRenderer->bTinting = pRenderer->bTinting == 0; 1889 pRenderer->bTinting = pRenderer->bTinting == 0;
1890 continue; 1890 continue;
1891 case UIMSG_ChangeMusicVolume: 1891 case UIMSG_ChangeMusicVolume: //громкость музыки
1892 if ( uMessageParam == 4 ) 1892 if ( uMessageParam == 4 )//кнопка понижения
1893 { 1893 {
1894 --uMusicVolimeMultiplier; 1894 --uMusicVolimeMultiplier;
1895 if ( (char)uMusicVolimeMultiplier < 1 ) 1895 if ( (char)uMusicVolimeMultiplier < 1 )
1896 uMusicVolimeMultiplier = 0; 1896 uMusicVolimeMultiplier = 0;
1897 GUIWindow::Create(243, 0xD8u, 0, 0, WINDOW_PressedButton2, (int)pBtn_SliderLeft, (char *)1); 1897 GUIWindow::Create(243, 216, 0, 0, WINDOW_PressedButton2, (int)pBtn_SliderLeft, (char *)1);
1898 if ( uMusicVolimeMultiplier ) 1898 if ( uMusicVolimeMultiplier )
1899 pAudioPlayer->PlaySound(SOUND_Bell, -1, 0, -1, 0, 0, pSoundVolumeLevels[(char)uMusicVolimeMultiplier] * 64.0f, 0); 1899 pAudioPlayer->PlaySound(SOUND_Bell, -1, 0, -1, 0, 0, pSoundVolumeLevels[uMusicVolimeMultiplier] * 64.0f, 0);
1900 pAudioPlayer->SetMusicVolume(pSoundVolumeLevels[(char)uMusicVolimeMultiplier] * 64.0f); 1900 pAudioPlayer->SetMusicVolume(pSoundVolumeLevels[uMusicVolimeMultiplier] * 64.0f);
1901 continue; 1901 continue;
1902 } 1902 }
1903 if ( uMessageParam == 5 ) 1903 if ( uMessageParam == 5 )//кнопка повышения
1904 { 1904 {
1905 ++uMusicVolimeMultiplier; 1905 ++uMusicVolimeMultiplier;
1906 if ( (char)uMusicVolimeMultiplier > 9 ) 1906 if ( (char)uMusicVolimeMultiplier > 9 )
1907 uMusicVolimeMultiplier = 9; 1907 uMusicVolimeMultiplier = 9;
1908 GUIWindow::Create(435, 0xD8u, 0, 0, WINDOW_PressedButton2, (int)pBtn_SliderRight, (char *)1); 1908 GUIWindow::Create(435, 216, 0, 0, WINDOW_PressedButton2, (int)pBtn_SliderRight, (char *)1);
1909 if ( uMusicVolimeMultiplier ) 1909 if ( uMusicVolimeMultiplier )
1910 pAudioPlayer->PlaySound(SOUND_Bell, -1, 0, -1, 0, 0, pSoundVolumeLevels[(char)uMusicVolimeMultiplier] * 64.0f, 0); 1910 pAudioPlayer->PlaySound(SOUND_Bell, -1, 0, -1, 0, 0, pSoundVolumeLevels[uMusicVolimeMultiplier] * 64.0f, 0);
1911 pAudioPlayer->SetMusicVolume(pSoundVolumeLevels[(char)uMusicVolimeMultiplier] * 64.0f); 1911 pAudioPlayer->SetMusicVolume(pSoundVolumeLevels[uMusicVolimeMultiplier] * 64.0f);
1912 continue; 1912 continue;
1913 } 1913 }
1914 uMusicVolimeMultiplier = (pMouse->GetCursorPos(&v202)->x - 263) / 17; 1914 uMusicVolimeMultiplier = (pMouse->GetCursorPos(&v202)->x - 263) / 17;//для задания громкости мышкой
1915 if ( (char)uMusicVolimeMultiplier > 9 ) 1915 if ( (char)uMusicVolimeMultiplier > 9 )
1916 uMusicVolimeMultiplier = 9; 1916 uMusicVolimeMultiplier = 9;
1917 if ( uMusicVolimeMultiplier ) 1917 if ( uMusicVolimeMultiplier )
1918 pAudioPlayer->PlaySound(SOUND_Bell, -1, 0, -1, 0, 0, pSoundVolumeLevels[uMusicVolimeMultiplier] * 64.0f, 0); 1918 pAudioPlayer->PlaySound(SOUND_Bell, -1, 0, -1, 0, 0, pSoundVolumeLevels[uMusicVolimeMultiplier] * 64.0f, 0);
1919 pAudioPlayer->SetMusicVolume(pSoundVolumeLevels[uMusicVolimeMultiplier] * 64.0f); 1919 pAudioPlayer->SetMusicVolume(pSoundVolumeLevels[uMusicVolimeMultiplier] * 64.0f);
4513 pParty->Reset(); 4513 pParty->Reset();
4514 break; 4514 break;
4515 case UIMSG_PlayerCreationRemoveUpSkill: 4515 case UIMSG_PlayerCreationRemoveUpSkill:
4516 v4 = pGUIWindow_CurrentMenu->pCurrentPosActiveItem - pGUIWindow_CurrentMenu->pStartingPosActiveItem; 4516 v4 = pGUIWindow_CurrentMenu->pCurrentPosActiveItem - pGUIWindow_CurrentMenu->pStartingPosActiveItem;
4517 pGUIWindow_CurrentMenu->pCurrentPosActiveItem = v4 % 7 + pGUIWindow_CurrentMenu->pStartingPosActiveItem + 7 * pParam; 4517 pGUIWindow_CurrentMenu->pCurrentPosActiveItem = v4 % 7 + pGUIWindow_CurrentMenu->pStartingPosActiveItem + 7 * pParam;
4518 pParty->pPlayers[pParam].pActiveSkills[pPlayer[pParam].GetSkillIdxByOrder(2)] = 0; 4518 if ( pPlayer[pParam].GetSkillIdxByOrder(2) != 37 )//37 - None(Нет)
4519 pParty->pPlayers[pParam].pActiveSkills[pPlayer[pParam].GetSkillIdxByOrder(2)] = 0;
4519 break; 4520 break;
4520 case UIMSG_PlayerCreationRemoveDownSkill: 4521 case UIMSG_PlayerCreationRemoveDownSkill:
4521 v4 = pGUIWindow_CurrentMenu->pCurrentPosActiveItem - pGUIWindow_CurrentMenu->pStartingPosActiveItem; 4522 v4 = pGUIWindow_CurrentMenu->pCurrentPosActiveItem - pGUIWindow_CurrentMenu->pStartingPosActiveItem;
4522 pGUIWindow_CurrentMenu->pCurrentPosActiveItem = v4 % 7 + pGUIWindow_CurrentMenu->pStartingPosActiveItem + 7 * pParam; 4523 pGUIWindow_CurrentMenu->pCurrentPosActiveItem = v4 % 7 + pGUIWindow_CurrentMenu->pStartingPosActiveItem + 7 * pParam;
4523 pParty->pPlayers[pParam].pActiveSkills[pPlayer[pParam].GetSkillIdxByOrder(3)] = 0; 4524 if ( pPlayer[pParam].GetSkillIdxByOrder(3) != 37 )//37 - None(Нет)
4525 pParty->pPlayers[pParam].pActiveSkills[pPlayer[pParam].GetSkillIdxByOrder(3)] = 0;
4524 break; 4526 break;
4525 case UIMSG_PlayerCreationChangeName: 4527 case UIMSG_PlayerCreationChangeName:
4526 pAudioPlayer->PlaySound((SoundID)24, 0, 0, -1, 0, 0, 0, 0); 4528 pAudioPlayer->PlaySound((SoundID)24, 0, 0, -1, 0, 0, 0, 0);
4527 v3 = (void *)pParam; 4529 v3 = (void *)pParam;
4528 uPlayerCreationUI_SelectedCharacter = pParam; 4530 uPlayerCreationUI_SelectedCharacter = pParam;