Mercurial > mm7

comparison mm7_1.cpp @ 1006:e865f349aa41

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
ui cleanup
author Gloval
date Sat, 18 May 2013 22:01:26 +0400
parents 5876a9cafa3e
children a704435d3285
comparison
equal deleted inserted replaced
1004:eac5af72b614 1006:e865f349aa41
360 } 360 }
361 } 361 }
362 } 362 }
363 363
364 //----- (0041D20D) -------------------------------------------------------- 364 //----- (0041D20D) --------------------------------------------------------
365 char __fastcall sub_41D20D_buff_remaining_time_string(int ecx0, GUIWindow *edx0, __int64 a3, GUIFont *a2) 365 void __fastcall sub_41D20D_buff_remaining_time_string( int ecx0, struct GUIWindow *edx0, __int64 a3, struct GUIFont *a2 )
366 { 366 {
367 unsigned int v4; // edi@1 367 unsigned int v4; // edi@1
368 unsigned int v5; // esi@1 368 unsigned int v5; // esi@1
369 unsigned int v6; // ebp@1 369 unsigned int v6; // ebp@1
370 unsigned int v7; // ebx@1 370 unsigned int v7; // ebx@1
371 signed __int64 v8; // ST34_8@1 371 signed __int64 v8; // ST34_8@1
425 else 425 else
426 v13 = pGlobalTXT_LocalizationStrings[438];// Seconds 426 v13 = pGlobalTXT_LocalizationStrings[438];// Seconds
427 sprintf(pTmpBuf2, "%d %s ", v18, v13); 427 sprintf(pTmpBuf2, "%d %s ", v18, v13);
428 strcat(pTmpBuf, pTmpBuf2); 428 strcat(pTmpBuf, pTmpBuf2);
429 } 429 }
430 return a1->DrawText(a2, 32, uY, 0, pTmpBuf, 0, 0, 0); 430 a1->DrawText(a2, 32, uY, 0, pTmpBuf, 0, 0, 0);
431 } 431 }
432 432
433 //----- (0041F54A) -------------------------------------------------------- 433 //----- (0041F54A) --------------------------------------------------------
434 void __cdecl LoadActualSkyFrame() 434 void __cdecl LoadActualSkyFrame()
435 { 435 {
436 if ( pTexture_RestUI_CurrentSkyFrame ) 436 if ( pTexture_RestUI_CurrentSkyFrame )
437 pTexture_RestUI_CurrentSkyFrame->Release(); 437 pTexture_RestUI_CurrentSkyFrame->Release();
438 if ( pTexture_RestUI_CurrentHourglassFrame ) 438 if ( pTexture_RestUI_CurrentHourglassFrame )
439 pTexture_RestUI_CurrentHourglassFrame->Release(); 439 pTexture_RestUI_CurrentHourglassFrame->Release();
440 pIcons_LOD->_40F9C5(); 440 pIcons_LOD->SyncLoadedFilesCount();
441 sprintf(pTmpBuf, "TERRA%03d", pParty->uCurrentMinute / 6 + 10 * pParty->uCurrentHour); 441 sprintf(pTmpBuf, "TERRA%03d", pParty->uCurrentMinute / 6 + 10 * pParty->uCurrentHour);
442 pTexture_RestUI_CurrentSkyFrame = pIcons_LOD->LoadTexturePtr(pTmpBuf, TEXTURE_16BIT_PALETTE); 442 pTexture_RestUI_CurrentSkyFrame = pIcons_LOD->LoadTexturePtr(pTmpBuf, TEXTURE_16BIT_PALETTE);
443 } 443 }
444 444
445 //----- (0041F5BE) -------------------------------------------------------- 445 //----- (0041F5BE) --------------------------------------------------------
466 if ( pTexture_RestUI_CurrentHourglassFrame ) 466 if ( pTexture_RestUI_CurrentHourglassFrame )
467 pTexture_RestUI_CurrentHourglassFrame->Release(); 467 pTexture_RestUI_CurrentHourglassFrame->Release();
468 pTexture_RestUI_CurrentHourglassFrame = 0; 468 pTexture_RestUI_CurrentHourglassFrame = 0;
469 pTexture_RestUI_CurrentSkyFrame = 0; 469 pTexture_RestUI_CurrentSkyFrame = 0;
470 pIcons_LOD->_4114F2(); 470 pIcons_LOD->_4114F2();
471 pIcons_LOD->_40F9C5(); 471 pIcons_LOD->SyncLoadedFilesCount();
472 pCurrentScreen = SCREEN_GAME; 472 pCurrentScreen = SCREEN_GAME;
473 viewparams->bRedrawGameUI = 1; 473 viewparams->bRedrawGameUI = 1;
474 if ( uCurrentlyLoadedLevelType == LEVEL_Outdoor) 474 if ( uCurrentlyLoadedLevelType == LEVEL_Outdoor)
475 { 475 {
476 pOutdoor->UpdateSunlightVectors(); 476 pOutdoor->UpdateSunlightVectors();
761 } 761 }
762 } 762 }
763 if ( !v11 ) 763 if ( !v11 )
764 { 764 {
765 v1->Release(); 765 v1->Release();
766 pIcons_LOD->_40F9C5(); 766 pIcons_LOD->SyncLoadedFilesCount();
767 } 767 }
768 return 1; 768 return 1;
769 } 769 }
770 770
771 //----- (00421D00) -------------------------------------------------------- 771 //----- (00421D00) --------------------------------------------------------
1164 pItemsTable->pItems[pParty->pPickedItem.uItemID].pIconName, 1164 pItemsTable->pItems[pParty->pPickedItem.uItemID].pIconName,
1165 TEXTURE_16BIT_PALETTE); 1165 TEXTURE_16BIT_PALETTE);
1166 if (v10 != -1) 1166 if (v10 != -1)
1167 pIcons_LOD->pTextures[v10].Release(); 1167 pIcons_LOD->pTextures[v10].Release();
1168 pMouse->RemoveHoldingItem(); 1168 pMouse->RemoveHoldingItem();
1169 pIcons_LOD->_40F9C5(); 1169 pIcons_LOD->SyncLoadedFilesCount();
1170 return; 1170 return;
1171 } 1171 }
1172 v11 = pIndoor->pFaceExtras[v3->uFaceExtraID].uEventID; 1172 v11 = pIndoor->pFaceExtras[v3->uFaceExtraID].uEventID;
1173 } 1173 }
1174 else 1174 else