Mercurial > mm7

comparison UI/UITransition.cpp @ 2215:e9625ad08541

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
fog fix and change 640,480 - window->GetWidth(), window->GetHeight()
author Ritor1
date Fri, 14 Feb 2014 18:08:30 +0600
parents d28d3c006077
children aff7a7b072b7
comparison
equal deleted inserted replaced
2214:20995bb8895a 2215:e9625ad08541
54 else if ( !IndoorLocation::GetLocationIndex(pLocationName) ) 54 else if ( !IndoorLocation::GetLocationIndex(pLocationName) )
55 { 55 {
56 if ( pMapStats->GetMapInfo(pCurrentMapName) ) 56 if ( pMapStats->GetMapInfo(pCurrentMapName) )
57 { 57 {
58 sprintfex(sHouseName.data(), pGlobalTXT_LocalizationStrings[410], pMapStats->pInfos[pMapStats->GetMapInfo(pCurrentMapName)].pName); // "Leave %s" 58 sprintfex(sHouseName.data(), pGlobalTXT_LocalizationStrings[410], pMapStats->pInfos[pMapStats->GetMapInfo(pCurrentMapName)].pName); // "Leave %s"
59 pDialogueWindow = GUIWindow::Create(0, 0, 640, 480, WINDOW_Transition, 0, sHouseName.data()); 59 pDialogueWindow = GUIWindow::Create(0, 0, window->GetWidth(), window->GetHeight(), WINDOW_Transition, 0, sHouseName.data());
60 //if ( pAnimatedRooms[p2DEvents[anim_id].uAnimationID].uRoomSoundId ) 60 //if ( pAnimatedRooms[p2DEvents[anim_id].uAnimationID].uRoomSoundId )
61 //PlayHouseSound(anim_id, HouseSound_Greeting); 61 //PlayHouseSound(anim_id, HouseSound_Greeting);
62 if ( uCurrentlyLoadedLevelType == LEVEL_Indoor && uActiveCharacter && pParty->uFlags & 0x30 ) 62 if ( uCurrentlyLoadedLevelType == LEVEL_Indoor && uActiveCharacter && pParty->uFlags & 0x30 )
63 pPlayers[uActiveCharacter]->PlaySound(SPEECH_47, 0); 63 pPlayers[uActiveCharacter]->PlaySound(SPEECH_47, 0);
64 if ( IndoorLocation::GetLocationIndex(pLocationName) ) 64 if ( IndoorLocation::GetLocationIndex(pLocationName) )
65 uCurrentHouse_Animation = IndoorLocation::GetLocationIndex(pLocationName); 65 uCurrentHouse_Animation = IndoorLocation::GetLocationIndex(pLocationName);
66 return; 66 return;
67 } 67 }
68 strcpy(sHouseName.data(), pGlobalTXT_LocalizationStrings[79]); 68 strcpy(sHouseName.data(), pGlobalTXT_LocalizationStrings[79]);
69 pDialogueWindow = GUIWindow::Create(0, 0, 640, 480, WINDOW_Transition, 0, sHouseName.data()); 69 pDialogueWindow = GUIWindow::Create(0, 0, window->GetWidth(), window->GetHeight(), WINDOW_Transition, 0, sHouseName.data());
70 //if ( pAnimatedRooms[p2DEvents[anim_id].uAnimationID].uRoomSoundId ) 70 //if ( pAnimatedRooms[p2DEvents[anim_id].uAnimationID].uRoomSoundId )
71 //PlayHouseSound(anim_id, HouseSound_Greeting); 71 //PlayHouseSound(anim_id, HouseSound_Greeting);
72 if ( uCurrentlyLoadedLevelType == LEVEL_Indoor && uActiveCharacter && pParty->uFlags & 0x30 ) 72 if ( uCurrentlyLoadedLevelType == LEVEL_Indoor && uActiveCharacter && pParty->uFlags & 0x30 )
73 pPlayers[uActiveCharacter]->PlaySound(SPEECH_47, 0); 73 pPlayers[uActiveCharacter]->PlaySound(SPEECH_47, 0);
74 if ( IndoorLocation::GetLocationIndex(pLocationName) ) 74 if ( IndoorLocation::GetLocationIndex(pLocationName) )
79 if ( *pLocationName == 48 ) 79 if ( *pLocationName == 48 )
80 v15 = pCurrentMapName; 80 v15 = pCurrentMapName;
81 if ( pMapStats->GetMapInfo(v15) ) 81 if ( pMapStats->GetMapInfo(v15) )
82 { 82 {
83 sprintfex(sHouseName.data(), pGlobalTXT_LocalizationStrings[411], pMapStats->pInfos[pMapStats->GetMapInfo(v15)].pName);//Войти в ^Pv[%s] 83 sprintfex(sHouseName.data(), pGlobalTXT_LocalizationStrings[411], pMapStats->pInfos[pMapStats->GetMapInfo(v15)].pName);//Войти в ^Pv[%s]
84 pDialogueWindow = GUIWindow::Create(0, 0, 640, 480, WINDOW_Transition, 0, sHouseName.data()); 84 pDialogueWindow = GUIWindow::Create(0, 0, window->GetWidth(), window->GetHeight(), WINDOW_Transition, 0, sHouseName.data());
85 if ( uCurrentlyLoadedLevelType == LEVEL_Indoor && uActiveCharacter && pParty->uFlags & 0x30 ) 85 if ( uCurrentlyLoadedLevelType == LEVEL_Indoor && uActiveCharacter && pParty->uFlags & 0x30 )
86 pPlayers[uActiveCharacter]->PlaySound(SPEECH_47, 0); 86 pPlayers[uActiveCharacter]->PlaySound(SPEECH_47, 0);
87 if ( IndoorLocation::GetLocationIndex(pLocationName) ) 87 if ( IndoorLocation::GetLocationIndex(pLocationName) )
88 uCurrentHouse_Animation = IndoorLocation::GetLocationIndex(pLocationName); 88 uCurrentHouse_Animation = IndoorLocation::GetLocationIndex(pLocationName);
89 return; 89 return;
90 } 90 }
91 strcpy(sHouseName.data(), pGlobalTXT_LocalizationStrings[73]);//Войти 91 strcpy(sHouseName.data(), pGlobalTXT_LocalizationStrings[73]);//Войти
92 pDialogueWindow = GUIWindow::Create(0, 0, 640, 480, WINDOW_Transition, 0, sHouseName.data()); 92 pDialogueWindow = GUIWindow::Create(0, 0, window->GetWidth(), window->GetHeight(), WINDOW_Transition, 0, sHouseName.data());
93 //if ( pAnimatedRooms[p2DEvents[anim_id].uAnimationID].uRoomSoundId ) 93 //if ( pAnimatedRooms[p2DEvents[anim_id].uAnimationID].uRoomSoundId )
94 //PlayHouseSound(anim_id, HouseSound_Greeting); 94 //PlayHouseSound(anim_id, HouseSound_Greeting);
95 if ( uCurrentlyLoadedLevelType == LEVEL_Indoor && uActiveCharacter && pParty->uFlags & 0x30 ) 95 if ( uCurrentlyLoadedLevelType == LEVEL_Indoor && uActiveCharacter && pParty->uFlags & 0x30 )
96 pPlayers[uActiveCharacter]->PlaySound(SPEECH_47, 0); 96 pPlayers[uActiveCharacter]->PlaySound(SPEECH_47, 0);
97 if ( IndoorLocation::GetLocationIndex(pLocationName) ) 97 if ( IndoorLocation::GetLocationIndex(pLocationName) )
117 pTexture_outside = pIcons_LOD->LoadTexturePtr("outside", TEXTURE_16BIT_PALETTE); 117 pTexture_outside = pIcons_LOD->LoadTexturePtr("outside", TEXTURE_16BIT_PALETTE);
118 if ( pMapStats->GetMapInfo(pCurrentMapName) ) 118 if ( pMapStats->GetMapInfo(pCurrentMapName) )
119 sprintfex(sHouseName.data(), pGlobalTXT_LocalizationStrings[410], pMapStats->pInfos[pMapStats->GetMapInfo(pCurrentMapName)].pName);// "Leave %s" 119 sprintfex(sHouseName.data(), pGlobalTXT_LocalizationStrings[410], pMapStats->pInfos[pMapStats->GetMapInfo(pCurrentMapName)].pName);// "Leave %s"
120 else 120 else
121 strcpy(sHouseName.data(), pGlobalTXT_LocalizationStrings[79]);// "Exit" 121 strcpy(sHouseName.data(), pGlobalTXT_LocalizationStrings[79]);// "Exit"
122 pDialogueWindow = GUIWindow::Create(0, 0, 640, 480, WINDOW_ChangeLocation, 0, sHouseName.data()); 122 pDialogueWindow = GUIWindow::Create(0, 0, window->GetWidth(), window->GetHeight(), WINDOW_ChangeLocation, 0, sHouseName.data());
123 } 123 }
124 124
125 //----- (00444DCA) -------------------------------------------------------- 125 //----- (00444DCA) --------------------------------------------------------
126 void TravelUI_Draw() 126 void TravelUI_Draw()
127 { 127 {