Mercurial > mm7

comparison mm7_3.cpp @ 948:5a2dbb00c399

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Code cleaning.
author Nomad
date Wed, 01 May 2013 17:31:10 +0200
parents 0d96349d8c87
children c0d0656aa662
comparison
equal deleted inserted replaced
947:99aa9c8464cf 948:5a2dbb00c399
12314 case PartyAlignment_Neutral: sprintf(pContainer, "evt%02d", const_2()); break; 12314 case PartyAlignment_Neutral: sprintf(pContainer, "evt%02d", const_2()); break;
12315 case PartyAlignment_Evil: sprintf(pContainer, "evt%02d-c", const_2()); break; 12315 case PartyAlignment_Evil: sprintf(pContainer, "evt%02d-c", const_2()); break;
12316 default: assert(false); 12316 default: assert(false);
12317 } 12317 }
12318 12318
12319 pTexture_Dialogue_Background = &pIcons_LOD->pTextures[pIcons_LOD->LoadTexture(pContainer, TEXTURE_16BIT_PALETTE)]; 12319 pTexture_Dialogue_Background = pIcons_LOD->LoadTexturePtr(pContainer, TEXTURE_16BIT_PALETTE);
12320 pTexture_outside = &pIcons_LOD->pTextures[pIcons_LOD->LoadTexture("outside", TEXTURE_16BIT_PALETTE)]; 12320 pTexture_outside = pIcons_LOD->LoadTexturePtr("outside", TEXTURE_16BIT_PALETTE);
12321 v1 = pMapStats->GetMapInfo(pCurrentMapName); 12321 v1 = pMapStats->GetMapInfo(pCurrentMapName);
12322 if ( v1 ) 12322 if ( v1 )
12323 sprintfex(sHouseName, pGlobalTXT_LocalizationStrings[410], pMapStats->pInfos[v1].pName);// "Leave %s" 12323 sprintfex(sHouseName, pGlobalTXT_LocalizationStrings[410], pMapStats->pInfos[v1].pName);// "Leave %s"
12324 else 12324 else
12325 strcpy(sHouseName, pGlobalTXT_LocalizationStrings[79]);// "Exit" 12325 strcpy(sHouseName, pGlobalTXT_LocalizationStrings[79]);// "Exit"
12480 pMiscTimer->Pause(); 12480 pMiscTimer->Pause();
12481 pEventTimer->Pause(); 12481 pEventTimer->Pause();
12482 dword_5C3418 = v4; 12482 dword_5C3418 = v4;
12483 dword_5C341C = v3; 12483 dword_5C341C = v3;
12484 _591094_decoration = activeLevelDecoration; 12484 _591094_decoration = activeLevelDecoration;
12485 pGUIWindow2 = GUIWindow::Create(0, 0, 640u, 480u, WINDOW_GreetingNPC, a4, 0); 12485 pGUIWindow2 = GUIWindow::Create(0, 0, 640, 480, WINDOW_GreetingNPC, a4, 0);
12486 pGUIWindow2->CreateButton(61u, 424u, 0x1Fu, 0x28u, 2, 94, UIMSG_SelectCharacter, 1u, 0x31u, "", 0); 12486 pGUIWindow2->CreateButton( 61, 424, 31, 40, 2, 94, UIMSG_SelectCharacter, 1, '1', "", 0);
12487 pGUIWindow2->CreateButton(177u, 424u, 0x1Fu, 0x28u, 2, 94, UIMSG_SelectCharacter, 2u, 0x32u, "", 0); 12487 pGUIWindow2->CreateButton(177, 424, 31, 40, 2, 94, UIMSG_SelectCharacter, 2, '2', "", 0);
12488 pGUIWindow2->CreateButton(292u, 424u, 0x1Fu, 0x28u, 2, 94, UIMSG_SelectCharacter, 3u, 0x33u, "", 0); 12488 pGUIWindow2->CreateButton(292, 424, 31, 40, 2, 94, UIMSG_SelectCharacter, 3, '3', "", 0);
12489 pGUIWindow2->CreateButton(407u, 424u, 0x1Fu, 0x28u, 2, 94, UIMSG_SelectCharacter, 4u, 0x34u, "", 0); 12489 pGUIWindow2->CreateButton(407, 424, 31, 40, 2, 94, UIMSG_SelectCharacter, 4, '4', "", 0);
12490 } 12490 }
12491 } 12491 }
12492 12492
12493 //----- (004452BB) -------------------------------------------------------- 12493 //----- (004452BB) --------------------------------------------------------
12494 void __cdecl sub_4452BB() 12494 void __cdecl sub_4452BB()