Mercurial > mm7

comparison UI/UIHouses.cpp @ 1554:e303d8a9bcdc

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge
author Grumpy7
date Sat, 07 Sep 2013 21:14:48 +0200
parents c4ab816fcc5e
children 6d759814a817
comparison
equal deleted inserted replaced
1553:b98812ead5d9 1554:e303d8a9bcdc
556 case BuildingType_House: 556 case BuildingType_House:
557 case BuildingType_Jail: 557 case BuildingType_Jail:
558 break; 558 break;
559 559
560 default: 560 default:
561 assert(false && "Invalid enumeration value"); 561 Error("Invalid enumeration value: %u", type);
562 } 562 }
563 563
564 /* if ( a1 > 13 ) 564 /* if ( a1 > 13 )
565 { 565 {
566 if ( a1 > 22 ) 566 if ( a1 > 22 )
865 } 865 }
866 ++pIcons_LOD->uTexturePacksCount; 866 ++pIcons_LOD->uTexturePacksCount;
867 if ( !pIcons_LOD->uNumPrevLoadedFiles ) 867 if ( !pIcons_LOD->uNumPrevLoadedFiles )
868 pIcons_LOD->uNumPrevLoadedFiles = pIcons_LOD->uNumLoadedFiles; 868 pIcons_LOD->uNumPrevLoadedFiles = pIcons_LOD->uNumLoadedFiles;
869 switch (pParty->alignment) 869 switch (pParty->alignment)
870 { 870 {
871 case PartyAlignment_Good: sprintf(pContainer, "evt%02d-b", const_2()); break; 871 case PartyAlignment_Good: sprintf(pContainer, "evt%02d-b", const_2()); break;
872 case PartyAlignment_Neutral: sprintf(pContainer, "evt%02d", const_2()); break; 872 case PartyAlignment_Neutral: sprintf(pContainer, "evt%02d", const_2()); break;
873 case PartyAlignment_Evil: sprintf(pContainer, "evt%02d-c", const_2()); break; 873 case PartyAlignment_Evil: sprintf(pContainer, "evt%02d-c", const_2()); break;
874 default: assert(false); 874 default: Error("Invalid alignment type: %u", pParty->alignment);
875 } 875 }
876 876
877 v17 = pIcons_LOD->LoadTexture(pContainer, TEXTURE_16BIT_PALETTE); 877 v17 = pIcons_LOD->LoadTexture(pContainer, TEXTURE_16BIT_PALETTE);
878 pDialogueNPCCount = 0; 878 pDialogueNPCCount = 0;
879 pTexture_Dialogue_Background = &pIcons_LOD->pTextures[v17]; 879 pTexture_Dialogue_Background = &pIcons_LOD->pTextures[v17];
880 uTextureID_right_panel_loop = uTextureID_right_panel; 880 uTextureID_right_panel_loop = uTextureID_right_panel;