Mercurial > mm7

comparison mm7_5.cpp @ 1754:421c29d4ab3e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
UITransition.cpp cleaning(continue)
author Ritor1
date Mon, 30 Sep 2013 17:29:27 +0600
parents f44b6e02e81c
children 4dee76d79c78
comparison
equal deleted inserted replaced
1753:999bf8c99514 1754:421c29d4ab3e
2334 } 2334 }
2335 } 2335 }
2336 } 2336 }
2337 } 2337 }
2338 } 2338 }
2339 pAudioPlayer->PlaySound(SOUND_27, 0, 0, -1, 0, 0, 0, 0); 2339 pAudioPlayer->PlaySound(SOUND_error, 0, 0, -1, 0, 0, 0, 0);
2340 v73 = "Can't jump to that location!"; 2340 v73 = "Can't jump to that location!";
2341 } 2341 }
2342 ShowStatusBarString(v73, 6u); 2342 ShowStatusBarString(v73, 6u);
2343 continue; 2343 continue;
2344 case UIMSG_CastQuickSpell: 2344 case UIMSG_CastQuickSpell:
3378 GUIWindow::Create(523, 393, 0, 0, WINDOW_PressedButton2, (int)pPlayerCreationUI_BtnMinus, (char *)1); 3378 GUIWindow::Create(523, 393, 0, 0, WINDOW_PressedButton2, (int)pPlayerCreationUI_BtnMinus, (char *)1);
3379 pPlayer[uPlayerCreationUI_SelectedCharacter].DecreaseAttribute((pGUIWindow_CurrentMenu->pCurrentPosActiveItem - pGUIWindow_CurrentMenu->pStartingPosActiveItem) % 7); 3379 pPlayer[uPlayerCreationUI_SelectedCharacter].DecreaseAttribute((pGUIWindow_CurrentMenu->pCurrentPosActiveItem - pGUIWindow_CurrentMenu->pStartingPosActiveItem) % 7);
3380 pAudioPlayer->PlaySound((SoundID)23, 0, 0, -1, 0, 0, 0, 0); 3380 pAudioPlayer->PlaySound((SoundID)23, 0, 0, -1, 0, 0, 0, 0);
3381 break; 3381 break;
3382 case UIMSG_PlayerCreationSelectActiveSkill: 3382 case UIMSG_PlayerCreationSelectActiveSkill:
3383 pPlayer = &pPlayer[uPlayerCreationUI_SelectedCharacter]; 3383 if ( pPlayer[uPlayerCreationUI_SelectedCharacter].GetSkillIdxByOrder(3) == 37 )
3384 v6 = pPlayer->GetSkillIdxByOrder(pParam + 4); 3384 pParty->pPlayers[uPlayerCreationUI_SelectedCharacter].pActiveSkills[pPlayer[uPlayerCreationUI_SelectedCharacter].GetSkillIdxByOrder(pParam + 4)] = 1;
3385 if ( pPlayer->GetSkillIdxByOrder(3) == 37 ) 3385 pAudioPlayer->PlaySound(SOUND_24, 0, 0, -1, 0, 0, 0, 0);
3386 pParty->pPlayers[0].pActiveSkills[v6 + 3486 * uPlayerCreationUI_SelectedCharacter] = 1;
3387 pAudioPlayer->PlaySound((SoundID)24, 0, 0, -1, 0, 0, 0, 0);
3388 break; 3386 break;
3389 case UIMSG_PlayerCreationSelectClass: 3387 case UIMSG_PlayerCreationSelectClass:
3390 pPlayer[uPlayerCreationUI_SelectedCharacter].Reset((PLAYER_CLASS_TYPE)pParam); 3388 pPlayer[uPlayerCreationUI_SelectedCharacter].Reset((PLAYER_CLASS_TYPE)pParam);
3391 pAudioPlayer->PlaySound(SOUND_Button, 0, 0, -1, 0, 0, 0, 0); 3389 pAudioPlayer->PlaySound(SOUND_Button, 0, 0, -1, 0, 0, 0, 0);
3392 break; 3390 break;
3400 case UIMSG_PlayerCreationClickReset: 3398 case UIMSG_PlayerCreationClickReset:
3401 GUIWindow::Create(527, 431, 0, 0, WINDOW_PressedButton2, (int)pPlayerCreationUI_BtnReset, 0); 3399 GUIWindow::Create(527, 431, 0, 0, WINDOW_PressedButton2, (int)pPlayerCreationUI_BtnReset, 0);
3402 pParty->Reset(); 3400 pParty->Reset();
3403 break; 3401 break;
3404 case UIMSG_PlayerCreationRemoveUpSkill: 3402 case UIMSG_PlayerCreationRemoveUpSkill:
3405 uPlayerCreationUI_SelectedCharacter = pParam;
3406 v4 = pGUIWindow_CurrentMenu->pCurrentPosActiveItem - pGUIWindow_CurrentMenu->pStartingPosActiveItem; 3403 v4 = pGUIWindow_CurrentMenu->pCurrentPosActiveItem - pGUIWindow_CurrentMenu->pStartingPosActiveItem;
3407 //int pSex = pGUIWindow_CurrentMenu->pStartingPosActiveItem; 3404 pGUIWindow_CurrentMenu->pCurrentPosActiveItem = v4 % 7 + pGUIWindow_CurrentMenu->pStartingPosActiveItem + 7 * pParam;
3408 v41 = 2; 3405 pParty->pPlayers[pParam].pActiveSkills[pPlayer[pParam].GetSkillIdxByOrder(2)] = 0;
3409 v5 = v4 % 7 + pGUIWindow_CurrentMenu->pStartingPosActiveItem + 7 * pParam; 3406 break;
3410 pGUIWindow_CurrentMenu->pCurrentPosActiveItem = v5; 3407 case UIMSG_PlayerCreationRemoveDownSkill:
3411 pParty->pPlayers[0].pActiveSkills[(&pPlayer[uPlayerCreationUI_SelectedCharacter])->GetSkillIdxByOrder(v41) 3408 v4 = pGUIWindow_CurrentMenu->pCurrentPosActiveItem - pGUIWindow_CurrentMenu->pStartingPosActiveItem;
3412 + 3486 * uPlayerCreationUI_SelectedCharacter] = 0; 3409 pGUIWindow_CurrentMenu->pCurrentPosActiveItem = v4 % 7 + pGUIWindow_CurrentMenu->pStartingPosActiveItem + 7 * pParam;
3410 pParty->pPlayers[pParam].pActiveSkills[pPlayer[pParam].GetSkillIdxByOrder(3)] = 0;
3413 break; 3411 break;
3414 case UIMSG_PlayerCreationChangeName: 3412 case UIMSG_PlayerCreationChangeName:
3415 pAudioPlayer->PlaySound((SoundID)24, 0, 0, -1, 0, 0, 0, 0); 3413 pAudioPlayer->PlaySound((SoundID)24, 0, 0, -1, 0, 0, 0, 0);
3416 v3 = (void *)pParam; 3414 v3 = (void *)pParam;
3417 uPlayerCreationUI_SelectedCharacter = pParam; 3415 uPlayerCreationUI_SelectedCharacter = pParam;
3564 viewparams->bRedrawGameUI = v15; 3562 viewparams->bRedrawGameUI = v15;
3565 break; 3563 break;
3566 } 3564 }
3567 //VideoPlayer::dtor(); 3565 //VideoPlayer::dtor();
3568 } 3566 }
3569 break;
3570 case UIMSG_PlayerCreationRemoveDownSkill:
3571 uPlayerCreationUI_SelectedCharacter = pParam;
3572 //__debugbreak();
3573 pGUIWindow_CurrentMenu->pCurrentPosActiveItem = (pGUIWindow_CurrentMenu->pCurrentPosActiveItem - pGUIWindow_CurrentMenu->pStartingPosActiveItem) % 7
3574 + pGUIWindow_CurrentMenu->pStartingPosActiveItem + 7 * pParam;
3575 pParty->pPlayers[0].pActiveSkills[(&pPlayer[uPlayerCreationUI_SelectedCharacter])->GetSkillIdxByOrder(3)
3576 + 3486 * uPlayerCreationUI_SelectedCharacter] = 0;
3577 break; 3567 break;
3578 default: 3568 default:
3579 break; 3569 break;
3580 } 3570 }
3581 } 3571 }