Mercurial > mm7

comparison mm7_3.cpp @ 419:ad1e9c0bf6da

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Multi-npc house icons fixed
author Nomad
date Sat, 23 Feb 2013 21:04:08 +0200
parents 55684f4eda73
children afad358dc684
comparison
equal deleted inserted replaced
418:913675aac25b 419:ad1e9c0bf6da
14621 14621
14622 memcpy(&v8, pPrimaryWindow, sizeof(v8)); 14622 memcpy(&v8, pPrimaryWindow, sizeof(v8));
14623 v10 = pMapStats->GetMapInfo(pCurrentMapName); 14623 v10 = pMapStats->GetMapInfo(pCurrentMapName);
14624 v9 = IndoorLocation::GetLocationIndex(dword_591164_teleport_map_name); 14624 v9 = IndoorLocation::GetLocationIndex(dword_591164_teleport_map_name);
14625 pRenderer->DrawTextureIndexed(0x1DDu, 0, pTexture_Dialogue_Background); 14625 pRenderer->DrawTextureIndexed(0x1DDu, 0, pTexture_Dialogue_Background);
14626 pRenderer->DrawTextureIndexed(pNPCPortraits_x - 4, pNPCPortraits_y - 4, (Texture *)(uTextureID_50795C != -1 ? (int)&pIcons_LOD->pTextures[uTextureID_50795C] : 0)); 14626 pRenderer->DrawTextureIndexed(pNPCPortraits_x[0][0] - 4, pNPCPortraits_y[0][0] - 4, &pIcons_LOD->pTextures[uTextureID_50795C]);
14627 pRenderer->DrawTextureIndexed(pNPCPortraits_x, pNPCPortraits_y, pTexture_outside); 14627 pRenderer->DrawTextureIndexed(pNPCPortraits_x[0][0], pNPCPortraits_y[0][0], pTexture_outside);
14628 uTextureID_507B04 = uTextureID_right_panel; 14628 uTextureID_507B04 = uTextureID_right_panel;
14629 pRenderer->DrawTextureTransparent(468, 0, (Texture *)(uTextureID_right_panel != -1 ? (int)&pIcons_LOD->pTextures[uTextureID_right_panel] : 0)); 14629 pRenderer->DrawTextureTransparent(468, 0, (Texture *)(uTextureID_right_panel != -1 ? (int)&pIcons_LOD->pTextures[uTextureID_right_panel] : 0));
14630 pRenderer->DrawTextureIndexed(556, 451, (Texture *)(uTextureID_x_x_u != -1 ? (int)&pIcons_LOD->pTextures[uTextureID_x_x_u] : 0)); 14630 pRenderer->DrawTextureIndexed(556, 451, (Texture *)(uTextureID_x_x_u != -1 ? (int)&pIcons_LOD->pTextures[uTextureID_x_x_u] : 0));
14631 pRenderer->DrawTextureIndexed(476, 451, (Texture *)(uTextureID_x_ok_u != -1 ? (int)&pIcons_LOD->pTextures[uTextureID_x_ok_u] : 0)); 14631 pRenderer->DrawTextureIndexed(476, 451, (Texture *)(uTextureID_x_ok_u != -1 ? (int)&pIcons_LOD->pTextures[uTextureID_x_ok_u] : 0));
14632 if ( (pVideoPlayer->AnyMovieLoaded() || v9) && *dword_591164_teleport_map_name != 48 ) 14632 if ( (pVideoPlayer->AnyMovieLoaded() || v9) && *dword_591164_teleport_map_name != 48 )
14748 memcpy(&v7, pPrimaryWindow, sizeof(v7)); 14748 memcpy(&v7, pPrimaryWindow, sizeof(v7));
14749 v9 = pMapStats->GetMapInfo(pCurrentMapName); 14749 v9 = pMapStats->GetMapInfo(pCurrentMapName);
14750 pOutdoor->GetTravelDestination(pParty->vPosition.x, pParty->vPosition.y, pDestinationMapName, 20); 14750 pOutdoor->GetTravelDestination(pParty->vPosition.x, pParty->vPosition.y, pDestinationMapName, 20);
14751 v0 = pMapStats->GetMapInfo(pDestinationMapName); 14751 v0 = pMapStats->GetMapInfo(pDestinationMapName);
14752 pRenderer->DrawTextureIndexed(0x1DDu, 0, pTexture_Dialogue_Background); 14752 pRenderer->DrawTextureIndexed(0x1DDu, 0, pTexture_Dialogue_Background);
14753 pRenderer->DrawTextureTransparent(0x1D4u, 0, 14753 pRenderer->DrawTextureTransparent(0x1D4u, 0, &pIcons_LOD->pTextures[uTextureID_507B04]);
14754 (Texture *)(uTextureID_507B04 != -1 ? (int)&pIcons_LOD->pTextures[uTextureID_507B04] : 0)); 14754 pRenderer->DrawTextureIndexed(pNPCPortraits_x[0][0], pNPCPortraits_y[0][0], pTexture_outside);
14755 pRenderer->DrawTextureIndexed(pNPCPortraits_x, pNPCPortraits_y, pTexture_outside); 14755 pRenderer->DrawTextureIndexed(0x22Cu, 0x1C3u, &pIcons_LOD->pTextures[uTextureID_x_x_u]);
14756 pRenderer->DrawTextureIndexed(0x22Cu, 0x1C3u,
14757 (Texture *)(uTextureID_x_x_u != -1 ? (int)&pIcons_LOD->pTextures[uTextureID_x_x_u] : 0));
14758 pRenderer->DrawTextureIndexed(0x1DCu, 0x1C3u, 14756 pRenderer->DrawTextureIndexed(0x1DCu, 0x1C3u,
14759 (Texture *)(uTextureID_x_ok_u != -1 ? (int)&pIcons_LOD->pTextures[uTextureID_x_ok_u] : 0)); 14757 (Texture *)(uTextureID_x_ok_u != -1 ? (int)&pIcons_LOD->pTextures[uTextureID_x_ok_u] : 0));
14760 if ( v0 ) 14758 if ( v0 )
14761 { 14759 {
14762 v1 = &pMapStats->pInfos[v0]; 14760 v1 = &pMapStats->pInfos[v0];
14976 GenerateColorAsCloseAsPossibleToR8G8B8InTargetFormat(0xFFu, 0xFFu, 0xFFu); 14974 GenerateColorAsCloseAsPossibleToR8G8B8InTargetFormat(0xFFu, 0xFFu, 0xFFu);
14977 GenerateColorAsCloseAsPossibleToR8G8B8InTargetFormat(0xE1u, 0xCDu, 0x23u); 14975 GenerateColorAsCloseAsPossibleToR8G8B8InTargetFormat(0xE1u, 0xCDu, 0x23u);
14978 v2 = GenerateColorAsCloseAsPossibleToR8G8B8InTargetFormat(0x15u, 0x99u, 0xE9u); 14976 v2 = GenerateColorAsCloseAsPossibleToR8G8B8InTargetFormat(0x15u, 0x99u, 0xE9u);
14979 pRenderer->DrawTextureIndexed(477, 0, pTexture_Dialogue_Background); 14977 pRenderer->DrawTextureIndexed(477, 0, pTexture_Dialogue_Background);
14980 pRenderer->DrawTextureTransparent(468, 0, (Texture *)(uTextureID_507B04 != -1 ? &pIcons_LOD->pTextures[uTextureID_507B04] : 0)); 14978 pRenderer->DrawTextureTransparent(468, 0, (Texture *)(uTextureID_507B04 != -1 ? &pIcons_LOD->pTextures[uTextureID_507B04] : 0));
14981 pRenderer->DrawTextureIndexed(pNPCPortraits_x - 4, pNPCPortraits_y - 4, (Texture *)(uTextureID_50795C != -1 ? &pIcons_LOD->pTextures[uTextureID_50795C] : 0)); 14979 pRenderer->DrawTextureIndexed(pNPCPortraits_x[0][0] - 4, pNPCPortraits_y[0][0] - 4, (Texture *)(uTextureID_50795C != -1 ? &pIcons_LOD->pTextures[uTextureID_50795C] : 0));
14982 pRenderer->DrawTextureIndexed(pNPCPortraits_x, pNPCPortraits_y, pDialogueNPCPortraits[0]); 14980 pRenderer->DrawTextureIndexed(pNPCPortraits_x[0][0], pNPCPortraits_y[0][0], pDialogueNPCPortraits[0]);
14983 14981
14984 if (pNPC->uProfession) 14982 if (pNPC->uProfession)
14985 { 14983 {
14986 assert(pNPC->uProfession < sizeof(aNPCProfessionNames) / sizeof(*aNPCProfessionNames)); // sometimes buffer overflows; errors emerge both here and in dialogue text 14984 assert(pNPC->uProfession < sizeof(aNPCProfessionNames) / sizeof(*aNPCProfessionNames)); // sometimes buffer overflows; errors emerge both here and in dialogue text
14987 sprintfex(pTmpBuf, pGlobalTXT_LocalizationStrings[429], pNPC->pName, aNPCProfessionNames[pNPC->uProfession]);//^Pi[%s] %s 14985 sprintfex(pTmpBuf, pGlobalTXT_LocalizationStrings[429], pNPC->pName, aNPCProfessionNames[pNPC->uProfession]);//^Pi[%s] %s