Mercurial > mm7
comparison UI/UITransition.cpp @ 1477:7ef4b64f6329
* LODFile::LoadBitmaps & LODFile::LoadIconsOrEvents are merged into LODFile::Load
Added support for most of mm6 resources, placeholders for mm8 resources.
Fixed few C4258
author | Nomad |
---|---|
date | Wed, 28 Aug 2013 18:43:07 +0200 |
parents | 8c2f689b5f0b |
children | c4ab816fcc5e |
comparison
equal
deleted
inserted
replaced
1475:d7720c1f1d3b | 1477:7ef4b64f6329 |
---|---|
76 //pVideoPlayer->OpenHouseMovie(pAnimatedRooms[p2DEvents_minus1___02[26 * v9]].field_0, 1u); | 76 //pVideoPlayer->OpenHouseMovie(pAnimatedRooms[p2DEvents_minus1___02[26 * v9]].field_0, 1u); |
77 pVideoPlayer->OpenHouseMovie(pAnimatedRooms[p2DEvents[anim_id - 1].uAnimationID].video_name, 1); | 77 pVideoPlayer->OpenHouseMovie(pAnimatedRooms[p2DEvents[anim_id - 1].uAnimationID].video_name, 1); |
78 } | 78 } |
79 else if ( !v23 ) | 79 else if ( !v23 ) |
80 { | 80 { |
81 v14 = pMapStats->GetMapInfo(pCurrentMapName.data()); | 81 v14 = pMapStats->GetMapInfo(pCurrentMapName); |
82 if ( v14 ) | 82 if ( v14 ) |
83 { | 83 { |
84 sprintfex(sHouseName.data(), pGlobalTXT_LocalizationStrings[410], pMapStats->pInfos[v14].pName); // "Leave %s" | 84 sprintfex(sHouseName.data(), pGlobalTXT_LocalizationStrings[410], pMapStats->pInfos[v14].pName); // "Leave %s" |
85 goto LABEL_20; | 85 goto LABEL_20; |
86 } | 86 } |
87 v21 = pGlobalTXT_LocalizationStrings[79]; | 87 v21 = pGlobalTXT_LocalizationStrings[79]; |
88 goto LABEL_19; | 88 goto LABEL_19; |
89 } | 89 } |
90 v15 = pLocationName; | 90 v15 = pLocationName; |
91 if ( *pLocationName == 48 ) | 91 if ( *pLocationName == 48 ) |
92 v15 = pCurrentMapName.data(); | 92 v15 = pCurrentMapName; |
93 v16 = pMapStats->GetMapInfo(v15); | 93 v16 = pMapStats->GetMapInfo(v15); |
94 if ( v16 ) | 94 if ( v16 ) |
95 { | 95 { |
96 sprintfex(sHouseName.data(), pGlobalTXT_LocalizationStrings[411], pMapStats->pInfos[v16].pName); | 96 sprintfex(sHouseName.data(), pGlobalTXT_LocalizationStrings[411], pMapStats->pInfos[v16].pName); |
97 goto LABEL_20; | 97 goto LABEL_20; |
132 default: assert(false); | 132 default: assert(false); |
133 } | 133 } |
134 | 134 |
135 pTexture_Dialogue_Background = pIcons_LOD->LoadTexturePtr(pContainer, TEXTURE_16BIT_PALETTE); | 135 pTexture_Dialogue_Background = pIcons_LOD->LoadTexturePtr(pContainer, TEXTURE_16BIT_PALETTE); |
136 pTexture_outside = pIcons_LOD->LoadTexturePtr("outside", TEXTURE_16BIT_PALETTE); | 136 pTexture_outside = pIcons_LOD->LoadTexturePtr("outside", TEXTURE_16BIT_PALETTE); |
137 v1 = pMapStats->GetMapInfo(pCurrentMapName.data()); | 137 v1 = pMapStats->GetMapInfo(pCurrentMapName); |
138 if ( v1 ) | 138 if ( v1 ) |
139 sprintfex(sHouseName.data(), pGlobalTXT_LocalizationStrings[410], pMapStats->pInfos[v1].pName);// "Leave %s" | 139 sprintfex(sHouseName.data(), pGlobalTXT_LocalizationStrings[410], pMapStats->pInfos[v1].pName);// "Leave %s" |
140 else | 140 else |
141 strcpy(sHouseName.data(), pGlobalTXT_LocalizationStrings[79]);// "Exit" | 141 strcpy(sHouseName.data(), pGlobalTXT_LocalizationStrings[79]);// "Exit" |
142 pDialogueWindow = GUIWindow::Create(0, 0, 640, 480, WINDOW_ChangeLocation, 0, sHouseName.data()); | 142 pDialogueWindow = GUIWindow::Create(0, 0, 640, 480, WINDOW_ChangeLocation, 0, sHouseName.data()); |
156 GUIWindow v7; // [sp+Ch] [bp-78h]@1 | 156 GUIWindow v7; // [sp+Ch] [bp-78h]@1 |
157 char pDestinationMapName[32]; // [sp+60h] [bp-24h]@1 | 157 char pDestinationMapName[32]; // [sp+60h] [bp-24h]@1 |
158 unsigned int v9; // [sp+80h] [bp-4h]@1 | 158 unsigned int v9; // [sp+80h] [bp-4h]@1 |
159 | 159 |
160 memcpy(&v7, pPrimaryWindow, sizeof(v7)); | 160 memcpy(&v7, pPrimaryWindow, sizeof(v7)); |
161 v9 = pMapStats->GetMapInfo(pCurrentMapName.data()); | 161 v9 = pMapStats->GetMapInfo(pCurrentMapName); |
162 pOutdoor->GetTravelDestination(pParty->vPosition.x, pParty->vPosition.y, pDestinationMapName, 20); | 162 pOutdoor->GetTravelDestination(pParty->vPosition.x, pParty->vPosition.y, pDestinationMapName, 20); |
163 v0 = pMapStats->GetMapInfo(pDestinationMapName); | 163 v0 = pMapStats->GetMapInfo(pDestinationMapName); |
164 pRenderer->DrawTextureIndexed(0x1DDu, 0, pTexture_Dialogue_Background); | 164 pRenderer->DrawTextureIndexed(0x1DDu, 0, pTexture_Dialogue_Background); |
165 pRenderer->DrawTextureTransparent(0x1D4u, 0, &pIcons_LOD->pTextures[uTextureID_right_panel_loop]); | 165 pRenderer->DrawTextureTransparent(0x1D4u, 0, &pIcons_LOD->pTextures[uTextureID_right_panel_loop]); |
166 pRenderer->DrawTextureIndexed(pNPCPortraits_x[0][0], pNPCPortraits_y[0][0], pTexture_outside); | 166 pRenderer->DrawTextureIndexed(pNPCPortraits_x[0][0], pNPCPortraits_y[0][0], pTexture_outside); |
213 unsigned int v9; // [sp+60h] [bp-Ch]@1 | 213 unsigned int v9; // [sp+60h] [bp-Ch]@1 |
214 unsigned int v10; // [sp+64h] [bp-8h]@1 | 214 unsigned int v10; // [sp+64h] [bp-8h]@1 |
215 int a3; // [sp+6Bh] [bp-1h]@11 | 215 int a3; // [sp+6Bh] [bp-1h]@11 |
216 | 216 |
217 memcpy(&v8, pPrimaryWindow, sizeof(v8)); | 217 memcpy(&v8, pPrimaryWindow, sizeof(v8)); |
218 v10 = pMapStats->GetMapInfo(pCurrentMapName.data()); | 218 v10 = pMapStats->GetMapInfo(pCurrentMapName); |
219 v9 = IndoorLocation::GetLocationIndex(dword_591164_teleport_map_name); | 219 v9 = IndoorLocation::GetLocationIndex(dword_591164_teleport_map_name); |
220 pRenderer->DrawTextureIndexed(0x1DDu, 0, pTexture_Dialogue_Background); | 220 pRenderer->DrawTextureIndexed(0x1DDu, 0, pTexture_Dialogue_Background); |
221 pRenderer->DrawTextureIndexed(pNPCPortraits_x[0][0] - 4, pNPCPortraits_y[0][0] - 4, pIcons_LOD->GetTexture(uTextureID_50795C)); | 221 pRenderer->DrawTextureIndexed(pNPCPortraits_x[0][0] - 4, pNPCPortraits_y[0][0] - 4, pIcons_LOD->GetTexture(uTextureID_50795C)); |
222 pRenderer->DrawTextureIndexed(pNPCPortraits_x[0][0], pNPCPortraits_y[0][0], pTexture_outside); | 222 pRenderer->DrawTextureIndexed(pNPCPortraits_x[0][0], pNPCPortraits_y[0][0], pTexture_outside); |
223 uTextureID_right_panel_loop = uTextureID_right_panel; | 223 uTextureID_right_panel_loop = uTextureID_right_panel; |