Mercurial > mm7

comparison Game/Game.cpp @ 2569:d433439699be

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Слияние
author Ritor1
date Thu, 21 May 2015 18:33:07 +0600
parents 30eb6dcac768
children d87bfbd3bb3b
comparison
equal deleted inserted replaced
2568:f2f2595fe308 2569:d433439699be
1035 CharacterUI_ReleaseButtons(); 1035 CharacterUI_ReleaseButtons();
1036 ReleaseAwardsScrollBar(); 1036 ReleaseAwardsScrollBar();
1037 pIcons_LOD->RemoveTexturesPackFromTextureList(); 1037 pIcons_LOD->RemoveTexturesPackFromTextureList();
1038 Game_OnEscape(); 1038 Game_OnEscape();
1039 continue; 1039 continue;
1040 case SCREEN_SPELL_BOOK:
1041 Game_OnEscape();
1042 continue;
1043
1040 default: 1044 default:
1041 __debugbreak(); // which GAME_MENU is this? 1045 __debugbreak(); // which GAME_MENU is this?
1042 Game_OnEscape(); 1046 Game_OnEscape();
1043 continue; 1047 continue;
1044 } 1048 }
1810 pAudioPlayer->PlaySound(SOUND_error, 0, 0, -1, 0, 0, 0, 0); 1814 pAudioPlayer->PlaySound(SOUND_error, 0, 0, -1, 0, 0, 0, 0);
1811 continue; 1815 continue;
1812 } 1816 }
1813 if (!uActiveCharacter || (pPlayer2 = pPlayers[uActiveCharacter], pPlayer2->uTimeToRecovery)) 1817 if (!uActiveCharacter || (pPlayer2 = pPlayers[uActiveCharacter], pPlayer2->uTimeToRecovery))
1814 continue; 1818 continue;
1815 _42777D_CastSpell_UseWand_ShootArrow(pPlayer2->uQuickSpell, uActiveCharacter - 1, 0, 0, uActiveCharacter); 1819 _42777D_CastSpell_UseWand_ShootArrow((SPELL_TYPE)pPlayer2->uQuickSpell, uActiveCharacter - 1, 0, 0, uActiveCharacter);
1816 continue; 1820 continue;
1817 case UIMSG_CastSpell_Monster_Improvement: 1821 case UIMSG_CastSpell_Monster_Improvement:
1818 case UIMSG_CastSpell_Shoot_Monster://FireBlow, Lightning, Ice Lightning, Swarm, 1822 case UIMSG_CastSpell_Shoot_Monster://FireBlow, Lightning, Ice Lightning, Swarm,
1819 //if ( pRenderer->pRenderD3D ) 1823 //if ( pRenderer->pRenderD3D )
1820 { 1824 {
2189 } 2193 }
2190 continue; 2194 continue;
2191 2195
2192 case UIMSG_CastSpellFromBook: 2196 case UIMSG_CastSpellFromBook:
2193 if (pTurnEngine->turn_stage != TE_MOVEMENT) 2197 if (pTurnEngine->turn_stage != TE_MOVEMENT)
2194 _42777D_CastSpell_UseWand_ShootArrow(uMessageParam, v199, 0, 0, 0); 2198 _42777D_CastSpell_UseWand_ShootArrow((SPELL_TYPE)uMessageParam, v199, 0, 0, 0);
2195 continue; 2199 continue;
2196 2200
2197 case UIMSG_SpellScrollUse: 2201 case UIMSG_SpellScrollUse:
2198 __debugbreak(); 2202 __debugbreak();
2199 if (pTurnEngine->turn_stage != TE_MOVEMENT) 2203 if (pTurnEngine->turn_stage != TE_MOVEMENT)
2200 _42777D_CastSpell_UseWand_ShootArrow(uMessageParam, v199, 133, 1, 0); 2204 _42777D_CastSpell_UseWand_ShootArrow((SPELL_TYPE)uMessageParam, v199, 133, 1, 0);
2201 continue; 2205 continue;
2202 case UIMSG_SpellBookWindow: 2206 case UIMSG_SpellBookWindow:
2203 if (pTurnEngine->turn_stage == TE_MOVEMENT) 2207 if (pTurnEngine->turn_stage == TE_MOVEMENT)
2204 continue; 2208 continue;
2205 if (bUnderwater == true) 2209 if (bUnderwater == true)
2660 if (use_music_folder) 2664 if (use_music_folder)
2661 alSourcef(mSourceID, AL_GAIN, pSoundVolumeLevels[uMusicVolimeMultiplier]); 2665 alSourcef(mSourceID, AL_GAIN, pSoundVolumeLevels[uMusicVolimeMultiplier]);
2662 else 2666 else
2663 pAudioPlayer->SetMusicVolume(pSoundVolumeLevels[uMusicVolimeMultiplier] * 64.0f); 2667 pAudioPlayer->SetMusicVolume(pSoundVolumeLevels[uMusicVolimeMultiplier] * 64.0f);
2664 2668
2669
2670 extern bool all_spells;
2671 if (all_spells)
2672 {
2673 for (int i = 0; i < 4; ++i)
2674 for (int j = 0; j < 99; ++j)
2675 pParty->pPlayers[i].spellbook.bHaveSpell[j] = true;
2676 }
2677
2665 while (2) 2678 while (2)
2666 { 2679 {
2667 v16 = 1; 2680 v16 = 1;
2668 pMessageQueue_50CBD0->Flush(); 2681 pMessageQueue_50CBD0->Flush();
2669 2682