Mercurial > mm7

comparison Game.cpp @ 2110:18b0ff5e1bf1

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
pSounds[20] error and GetSkillIdxByOrder(2) != 37 //37 - None(Нет)
author Ritor1
date Sat, 21 Dec 2013 01:03:45 +0600
parents ee2724b9ca05
children a94c5bee0225
comparison
equal deleted inserted replaced
2106:b52c09e01e7e 2110:18b0ff5e1bf1
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;