mm7: mm7_1.cpp comparison

comparison mm7_1.cpp @ 169:d1dde383af89

Merge

author	Nomad
date	Thu, 14 Feb 2013 14:03:17 +0200
parents	ee11772d0ad2 796b79187c27
children	91fa025e6ca6

comparison

equal deleted inserted replaced

-:ee11772d0ad2
+:d1dde383af89
 v16 = pItem->uAttributes;
 v17 = uCellX + ((v15 - v10) >> 1) + pSRZBufferLineOffsets[uCellY + ((((v14 - 14) & 0xFFFFFFE0) - v9 + 32) >> 1)];
 if ( !(v16 & 0xF0) )
 {
 if ( v16 & 1
-|| pCurrentScreen != 13 )
+|| pCurrentScreen != SCREEN_HOUSE )
 {
 if ( v16 & 2 )
 pRenderer->_4A6776(uCellX, uCellY, v7);
 else
 pRenderer->DrawTextureTransparent(uCellX, uCellY, v7);
 // 5118E0: using guessed type int bRingsShownInCharScreen;
 //----- (0041AD6E) --------------------------------------------------------
 void __cdecl GameUI_DrawRightPanelItems()
 {
-if ( (signed int)((pParty->uTimePlayed - qword_507CC8) >> 32) <= 0
+if ( (signed int)((pParty->uTimePlayed - qword_507CC8) >> 32) <= 0 && (((pParty->uTimePlayed - qword_507CC8) >> 32) & 0x80000000u) != 0i64 )
-&& (((pParty->uTimePlayed - qword_507CC8) >> 32) & 0x80000000u) != 0i64 )
 qword_507CC8 = 0i64;
 if ( (((pParty->uTimePlayed - qword_507CC8) >> 32) & 0x80000000u) == 0i64
 && (!(SHIDWORD(pParty->uTimePlayed) < (LODWORD(pParty->uTimePlayed) < (unsigned int)qword_507CC8)
 + HIDWORD(qword_507CC8) | (pParty->uTimePlayed - qword_507CC8) >> 32 == 0)
 || (unsigned int)(LODWORD(pParty->uTimePlayed) - qword_507CC8) > 0x80) )
 {
 qword_507CC8 = pParty->uTimePlayed;
 byte_50697C = byte_50697C == 0;
-if ( byte_50697C
+if ( byte_50697C && pCurrentScreen != SCREEN_REST )
-&& pCurrentScreen != 5 )
 {
 if ( bFlashQuestBook )
-pRenderer->DrawTextureTransparent(
+pRenderer->DrawTextureTransparent(493, 355, (Texture *)(uTextureID_ib_td1_A != -1 ? (int)&pIcons_LOD->pTextures[uTextureID_ib_td1_A] : 0));
-493u,
-355u,
-(Texture *)(uTextureID_ib_td1_A != -1 ? (int)&pIcons_LOD->pTextures[uTextureID_ib_td1_A] : 0));
 if ( bFlashAutonotesBook )
-pRenderer->DrawTextureTransparent(
+pRenderer->DrawTextureTransparent(527, 353, (Texture *)(uTextureID_ib_td2_A != -1 ? (int)&pIcons_LOD->pTextures[uTextureID_ib_td2_A] : 0));
-527u,
-353u,
-(Texture *)(uTextureID_ib_td2_A != -1 ? (int)&pIcons_LOD->pTextures[uTextureID_ib_td2_A] : 0));
 if ( bFlashHistoryBook )
-pRenderer->DrawTextureTransparent(
+pRenderer->DrawTextureTransparent(600, 361, (Texture *)(uTextureID_ib_td5_A != -1 ? (int)&pIcons_LOD->pTextures[uTextureID_ib_td5_A] : 0));
-600u,
-361u,
-(Texture *)(uTextureID_ib_td5_A != -1 ? (int)&pIcons_LOD->pTextures[uTextureID_ib_td5_A] : 0));
 }
 else
 {
 pRenderer->DrawTextureRGB(468u, 0, pTexture_RightFrame);
 DrawHiredNPCs();
 if ( v26 == 37 )
 {
 v12 = pWindowList[v3].field_34;
 if ( pWindowList[v3].pCurrentPosActiveItem - pWindowList[v3].pStartingPosActiveItem - v12 >= 0 )
 {
-v8 = pCurrentScreen == 21;
+v8 = pCurrentScreen == SCREEN_PARTY_CREATION;
 pWindowList[v3].pCurrentPosActiveItem -= v12;
 if ( v8 )
 {
 pAudioPlayer->PlaySound((SoundID)66, v1, v1, -1, v1, v1, v1, v1);
 v2 = pMessageQueue_50CBD0->uNumMessages;
 if ( v26 == 39 )
 {
 v7 = pWindowList[v3].pCurrentPosActiveItem + pWindowList[v3].field_34;
 if ( v7 < pWindowList[v3].pNumPresenceButton + pWindowList[v3].pStartingPosActiveItem )
 {
-v8 = pCurrentScreen == 21;
+v8 = pCurrentScreen == SCREEN_PARTY_CREATION;
 pWindowList[v3].pCurrentPosActiveItem = v7;
 if ( v8 )
 {
 pAudioPlayer->PlaySound((SoundID)66, v1, v1, -1, v1, v1, v1, v1);
 v2 = pMessageQueue_50CBD0->uNumMessages;
 pTexture_RestUI_CurrentHourglassFrame->Release();
 pTexture_RestUI_CurrentHourglassFrame = 0;
 pTexture_RestUI_CurrentSkyFrame = 0;
 pIcons_LOD->_4114F2();
 pIcons_LOD->_40F9C5();
-pCurrentScreen = 0;
+pCurrentScreen = SCREEN_GAME;
 viewparams->bRedrawGameUI = 1;
 if ( uCurrentlyLoadedLevelType == LEVEL_Outdoor)
 {
 pOutdoor->UpdateSunlightVectors();
 pOutdoor->UpdateFog();
 if ( !dword_506F14 )
 pAudioPlayer->StopChannels(-1, -1);
 if ( pCurrentScreen )
 {
 pGUIWindow_CurrentMenu->Release();
-pCurrentScreen = 0;
+pCurrentScreen = SCREEN_GAME;
 viewparams->bRedrawGameUI = 1;
 }
 pEventTimer->Pause();
 if ( dword_506F14 != 2 )
 GUIWindow::Create(518u, 450u, 0, 0, (enum WindowType)90, (int)pBtn_Rest, 0);
 if ( !_strcmpi(pCurrentMapName, "d29.blv") && (unsigned __int16)_449B57_test_bit(pParty->_award_bits, 98) )
 uRestUI_FoodRequiredToRest = 0;
 ++pIcons_LOD->uTexturePacksCount;
 if ( !pIcons_LOD->uNumPrevLoadedFiles )
 pIcons_LOD->uNumPrevLoadedFiles = pIcons_LOD->uNumLoadedFiles;
-pCurrentScreen = 5;
+pCurrentScreen = SCREEN_REST;
 _507CD4_RestUI_hourglass_anim_controller = 0;
 uTextureID_RestUI_restmain = pIcons_LOD->LoadTexture("restmain", TEXTURE_16BIT_PALETTE);
 uTextureID_RestUI_restb1 = pIcons_LOD->LoadTexture("restb1", TEXTURE_16BIT_PALETTE);
 uTextureID_RestUI_restb2 = pIcons_LOD->LoadTexture("restb2", TEXTURE_16BIT_PALETTE);
 uTextureID_RestUI_restb3 = pIcons_LOD->LoadTexture("restb3", TEXTURE_16BIT_PALETTE);
 0,
 pGlobalTXT_LocalizationStrings[79],// Exit
 (Texture *)(uTextureID_506438 != -1 ? (int)&pIcons_LOD->pTextures[uTextureID_506438] : 0),
 0);
 pChestWindow->CreateButton(7u, 8u, 460u, 343u, 1, 0, 0xCu, 0, 0, "", 0);
-pCurrentScreen = 10;
+pCurrentScreen = SCREEN_CHEST;
 pEventTimer->Pause();
 return 1;
 }
 //----- (0042092D) --------------------------------------------------------
 }
 v1 = uNumVisibleWindows;
 if ( uNumVisibleWindows <= 0 )
 {
 LABEL_38:
-if ( pCurrentScreen == 10 ) // ChestScreen
+if ( pCurrentScreen == SCREEN_CHEST )
 {
 sub_42038D();
 //goto _return;
 if ( pMouse->uPointingObjectID == 0 )
 {
 }
 }
 uLastPointedObjectID = pMouse->uPointingObjectID;
 return;
 }
-if ( pCurrentScreen == 13 ) // HouseScreen
+if ( pCurrentScreen == SCREEN_HOUSE )
 {
 if ( dword_F8B19C != 2
 || (v16 = pRenderer->pActiveZBuffer[pX + pSRZBufferLineOffsets[pY]], v16 == 0)
 || v16 == -65536 )
 //goto _return;
 v1 = (int)a4;
 pEventTimer->Pause();
 pAudioPlayer->StopChannels(-1, -1);
 bRingsShownInCharScreen = 0;
 CharacterUI_LoadPaperdollTextures();
-pCurrentScreen = 23;
+pCurrentScreen = SCREEN_CASTING;
 v2 = GUIWindow::Create(0, 0, 640, 480, (WindowType)(WINDOW_HouseInterior|WINDOW_Options), v1, 0);
 pCharacterScreen_ExitBtn = v2->CreateButton(
 394u,
 318u,
 75u,
 v5 = 7;
 //LABEL_22:
 pGUIWindow_CurrentMenu = GameUI_InitializeCharacterWindow(v5);
 return;
 }
-if ( pCurrentScreen == 8 )
+if ( pCurrentScreen == SCREEN_SPELL_BOOK )
 return;
-if ( pCurrentScreen == 10 )
+if ( pCurrentScreen == SCREEN_CHEST )
 {
 //LABEL_23:
 viewparams->bRedrawGameUI = 1;
 if ( uActiveCharacter == v1 )
 {
 pWindowList_at_506F50_minus1_indexing_buttons____and_an_int_[0] = 103;
-pCurrentScreen = 15;
+pCurrentScreen = SCREEN_F;
 //goto LABEL_28;
 uActiveCharacter = v1;
 return;
 }
 //LABEL_27:
 return;
 //goto LABEL_28;
 uActiveCharacter = v1;
 return;
 }
-if ( pCurrentScreen != 13 )
+if ( pCurrentScreen != SCREEN_HOUSE )
 {
-if ( pCurrentScreen == 14 )
+if ( pCurrentScreen == SCREEN_E )
 {
 //LABEL_28:
 uActiveCharacter = v1;
 return;
 }
-if ( pCurrentScreen != 15 )
+if ( pCurrentScreen != SCREEN_F )
 {
 viewparams->bRedrawGameUI = 1;
 uActiveCharacter = v1;
 if ( pWindowList_at_506F50_minus1_indexing_buttons____and_an_int_[0] == 102 )
 sub_419100();
 //goto LABEL_23;
 viewparams->bRedrawGameUI = 1;
 if ( uActiveCharacter == v1 )
 {
 pWindowList_at_506F50_minus1_indexing_buttons____and_an_int_[0] = 103;
-pCurrentScreen = 15;
+pCurrentScreen = SCREEN_F;
 //goto LABEL_28;
 uActiveCharacter = v1;
 return;
 }
 //LABEL_27:
 //----- (004226C2) --------------------------------------------------------
 bool __cdecl sub_4226C2()
 {
 if ( pCurrentScreen
-&& pCurrentScreen != 4
+&& pCurrentScreen != SCREEN_NPC_DIALOGUE
-&& pCurrentScreen != 17 )
+&& pCurrentScreen != SCREEN_CHANGE_LOCATION )
 {
-if ( pCurrentScreen == 18 )
+if ( pCurrentScreen == SCREEN_INPUT_BLV )
 return pVideoPlayer->pSmackerMovie != 0;
-if ( pCurrentScreen != 19 )
+if ( pCurrentScreen != SCREEN_BRANCHLESS_NPC_DIALOG )
 return 1;
 }
 return 0;
 }
 // 4E28F8: using guessed type int pCurrentScreen;

Mercurial > mm7

comparison mm7_1.cpp @ 169:d1dde383af89