mm7: mm7_5.cpp comparison

comparison mm7_5.cpp @ 158:f4ebd13c2a8e

13.02.13

author	Ritor1
date	Wed, 13 Feb 2013 01:26:49 +0600
parents	9abdd40a107b
children	a0e7ad5425d4

comparison

equal deleted inserted replaced

-:8e0e2991f9d1
+:f4ebd13c2a8e
 pRenderer->DrawTextureIndexed(0x1DCu, 0x1C2u, pTexture_50643C);
 pRenderer->DrawTextureIndexed(0x231u, 0x1C2u, pTexture_506448);
 }
 //----- (00412B58) --------------------------------------------------------
-void __cdecl sub_412B58()
+void __cdecl DrawSpellBookContent()
 {
 Player *v0; // ebx@1
 int v1; // ebp@1
 unsigned int v2; // eax@1
 Texture *v3; // edi@1
 Texture *v11; // edx@14
 int v12; // eax@15
 signed int v13; // ecx@18
 unsigned int v14; // esi@18
 unsigned int v15; // edi@18
-Texture *v16; // eax@21
+Texture *pPageTexture; // eax@21
 unsigned int v17; // [sp-Ch] [bp-2Ch]@8
 unsigned int v18; // [sp-Ch] [bp-2Ch]@15
 unsigned int v19; // [sp-8h] [bp-28h]@8
 unsigned int v20; // [sp-8h] [bp-28h]@15
 Texture *v21; // [sp-4h] [bp-24h]@15
 {
 if ( *(short *)a2.x )
 {
 if ( v0->pNumSpellBookPage == v13 )
 {
-v16 = pTextures_tabs[v13][1];
+pPageTexture = pTextures_tabs[v13][1];
 switch ( v13 )
 {
 case 0:
 v14 = 406;
 v22 = 9;
 break;
 }
 }
 else
 {
-v16 = pTextures_tabs[v13][0];
+pPageTexture = pTextures_tabs[v13][0];
 switch ( v13 )
 {
 case 0:
 v14 = 415;
 v22 = 10;
 break;
 default:
 break;
 }
 }
-pRenderer->DrawTextureTransparent(v14, v15, v16);
+pRenderer->DrawTextureTransparent(v14, v15, pPageTexture);
 v13 = v25;
 }
 a2.x += 2;
 ++v13;
 v25 = v13;
 if ( v37 )//pWindowType > 103
 {
 v38 = v37 - 2;
 if ( v38 )//pWindowType > 105
 {
-if ( v38 == 1 )//pWindowType == 106 (0x6A) WINDOW_VideoOptions
+if ( pWindowType == WINDOW_VideoOptions )
 GameMenuUI_DrawVideoOptions();
 }
-else//pWindowType == 105 (0x69) WINDOW_KeyMappingOptions
+else if ( pWindowType == WINDOW_KeyMappingOptions )
 {
 GameMenuUI_DrawKeyBindings();
 }
 }
-else//pWindowType == 103 (0x67) WINDOW_67
+else//pWindowType == WINDOW_67
 {
 pWindow->DrawMessageBox(0);
 pWindow->DrawText(pFontLucida, 10, 20, 0, "Making item number", 0, 0, 0);
 pWindow->DrawText(pFontLucida, 10, 40, 0, (const char *)pKeyActionMap->pPressedKeysBuffer, 0, 0, 0);
 if ( !pKeyActionMap->field_204 )
 pGUIWindow2 = pWindow;
 //goto LABEL_110;
 pGUIWindow2->Release();
 continue;
 }
-if ( pWindow->Hint != (char *)1 )//pWindowType == 97 (0x61) WINDOW_61
+if ( pWindow->Hint != (char *)1 )//pWindowType == WINDOW_61
 pAudioPlayer->PlaySound((SoundID)75, 0, 0, -1, 0, 0, 0, 0);
 v32 = pWindow->ptr_1C;
 pRenderer->DrawTextureIndexed(pWindow->uFrameX, pWindow->uFrameY, *((Texture **)v32 + 16));
 //goto LABEL_138;
 pHint = pWindow->Hint;
 //LABEL_142:
 pNumMessages = pMessageQueue_50CBD0->uNumMessages;
 if ( (signed int)pMessageQueue_50CBD0->uNumMessages < 40 )
 //goto LABEL_151;
 {
-pMessageQueue_50CBD0->pMessages[pNumMessages].eType = (UIMessageType)113;
+pMessageQueue_50CBD0->pMessages[pNumMessages].eType = (UIMessageType)113; //0x71
 pMessageQueue_50CBD0->pMessages[pMessageQueue_50CBD0->uNumMessages].param = 0;
 *(&pMessageQueue_50CBD0->uNumMessages + 3 * pMessageQueue_50CBD0->uNumMessages + 3) = 0;
 ++pMessageQueue_50CBD0->uNumMessages;
 continue;
 }
 }
 v14 = pWindowType - 80;
 if ( v14 )//pWindowType > 80
 {
 v15 = v14 - 9;
-if ( !v15 )//pWindowType == 89 (0x59) WINDOW_59
+if ( pWindowType == WINDOW_59)
 {
 pWindow->DrawMessageBox(0);
 pWindow->DrawText(pFontLucida, 10, 20, 0, "Making item number", 0, 0, 0);
 pWindow->DrawText(pFontLucida, 10, 40, 0, (const char *)pKeyActionMap->pPressedKeysBuffer, 0, 0, 0);
 if ( !pKeyActionMap->field_204 )
 }
 }
 continue;
 }
 v16 = v15 - 1;
-if ( !v16 )// pWindowType == 90 (0x5A) WINDOW_5A
+if ( pWindowType == WINDOW_5A ) // Press buttons in title menu and in game, and escape in game
 {
 if ( pWindow->Hint != (char *)1 )
 pAudioPlayer->PlaySound((SoundID)75, 0, 0, -1, 0, 0, 0, 0);
 pButtonPtr_1C = (GUIButton *)pWindow->ptr_1C;
 if ( pButtonPtr_1C->uX >= 0 )//if ( (pButtonPtr_1C->uX & 0x80000000u) == 0 )
 //goto LABEL_110;
 pGUIWindow2->Release();
 continue;
 }
 v17 = v16 - 1;
-if ( !v17 )//pWindowType == 91 (0x5B) WINDOW_5B
+if ( pWindowType == WINDOW_5B )//Change button in Character window
 {
 if ( pWindow->Hint != (char *)1 )
 pAudioPlayer->PlaySound((SoundID)75, 0, 0, -1, 0, 0, 0, 0);
 pButtonPtr_1C = (GUIButton *)pWindow->ptr_1C;
 pTexture2 = pButtonPtr_1C->pTextures[1];
 //goto LABEL_110;
 pGUIWindow2->Release();
 continue;
 }
 v18 = v17 - 1;
-if ( !v18 )//pWindowType == 92 (0x5C) WINDOW_5C
+if ( pWindowType == WINDOW_5C ) // Change page in AutonotesBook
 {
 if ( pWindow->Hint != (char *)1 )
 pAudioPlayer->PlaySound((SoundID)75, 0, 0, -1, 0, 0, 0, 0);
 pButtonPtr_1C = (GUIButton *)pWindow->ptr_1C;
 pRenderer->DrawTextureTransparent(pWindow->uFrameX, pWindow->uFrameY, pButtonPtr_1C->pTextures[0]);
 pGUIWindow2 = pWindow;
 pGUIWindow2->Release();
 continue;
 }
 v19 = v18 - 1;
-if ( !v19 )//pWindowType == 93 (0x5D) WINDOW_5D
+if ( pWindowType == WINDOW_5D )
 {
 if ( pWindow->Hint != (char *)1 )
 pAudioPlayer->PlaySound((SoundID)75, 0, 0, -1, 0, 0, 0, 0);
 pRenderer->DrawTextureTransparent(pWindow->uFrameX, pWindow->uFrameY, *((Texture **)pWindow->ptr_1C + 16));
 viewparams->bRedrawGameUI = 1;
 //goto LABEL_110;
 pGUIWindow2->Release();
 continue;
 }
 }
-else//pWindowType == 80 (0x50) WINDOW_50
+else if ( pWindowType == WINDOW_50 )
 {
 v27 = GenerateColorAsCloseAsPossibleToR8G8B8InTargetFormat(0xFFu, 0xFFu, 0xFFu);
 if ( ptr_507BD0->field_40 == 1 )
 {
 ptr_507BD0->DrawMessageBox(0);
 }
 }
 }
 else
 {
-if ( pWindowType == 70 ) // 0x46 WINDOW_FinalWindow
+if ( pWindowType == WINDOW_FinalWindow )
 {
 sub_41420D_press_esc();
 continue;
 }
 if ( (signed int)pWindowType > 18 )
 if ( v12 )// pWindowType > 26
 {
 v13 = v12 - 4;
 if ( v13 )//pWindowType > 30
 {
-if ( v13 == 1 ) //pWindowType == 31 (0x1F) WINDOW_1F
+if ( pWindowType == WINDOW_1F)
 {
 pRenderer->ClearZBuffer(0, 479);
 draw_leather();
 CharacterUI_InventoryTab_Draw(uActiveCharacter, 1);
 CharacterUI_DrawPaperdoll(uActiveCharacter);
 pRenderer->DrawTextureTransparent(pBtn_ExitCancel->uX, pBtn_ExitCancel->uY,
 (Texture *)(uTextureID_x_x_u != -1 ? &pIcons_LOD->pTextures[uTextureID_x_x_u] : 0));
 }
 }
-else// pWindowType == 30 (0x1E) WINDOW_1E
+else if( pWindowType == WINDOW_Scroll)
 {
-sub_467FB6();
+CreateScrollWindow();
 }
 }
-else //pWindowType == 26 (0x1A) WINDOW_1A
+else if ( pWindowType == WINDOW_Transition )
 {
 TransitionUI_Draw();
 }
 continue;
 }
 if ( v9 )//pWindowType > 23
 {
 //if ( v9 == 1 ) //pWindowType == 24 (0x18) WINDOW_MainMenu_Load
 //  sub_4606F7();
 }
-else//pWindowType == 23 (0x17) WINDOW_17
+else if ( pWindowType == WINDOW_17 )
 {
 sub_4606FE();
 }
 }
-else//pWindowType == 20 (0x14) WINDOW_Chest
+else if ( pWindowType == WINDOW_Chest )
 {
 if ( pCurrentScreen == SCREEN_CHEST )
 {
 Chest::DrawChestUI((unsigned int)pWindow->ptr_1C);
 }
 (Texture *)(uTextureID_506438 != -1 ? (int)&pIcons_LOD->pTextures[uTextureID_506438] : 0));
 }
 }
 }
 }
-else//pWindowType == 19 (0x13) WINDOW_GreetingNPC
+else if (pWindowType == WINDOW_GreetingNPC )
 {
 DrawBranchlessDialogueUI();
 }
 continue;
 }
 ++pMessageQueue_50CBD0->uNumMessages;
 continue;
 }
 continue;
 }
-if ( pWindowType == 18 ) //(0x12) WINDOW_SpellBook
+if ( pWindowType == WINDOW_SpellBook )
 {
-sub_412B58();
+DrawSpellBookContent();
 }
 else
 {
 if ( (signed int)pWindowType > 10 )
 {
 if ( v5 )//pWindowType >12
 {
 v6 = v5 - 4;
 if ( v6 )//pWindowType > 16
 {
-if ( v6 == 1 )//pWindowType == 17 (0x11) WINDOW_ChangeLocation
+if ( pWindowType == WINDOW_ChangeLocation )
 TravelUI_Draw();
 }
-else//pWindowType == 16 (0x10) WINDOW_10
+else if ( pWindowType == WINDOW_Rest )
 {
 RestUI_Draw();
 }
 }
-else// pWindowType == 12 (0xC) WINDOW_C
+else if (pWindowType == WINDOW_QuickReference )
 {
 QuickRefDraw();
 }
 continue;
 }
 if ( v3 )// pWindowType > 4
 {
 v4 = v3 - 2;
 if ( v4 )//pWindowType > 6
 {
-if ( v4 == 3 )//pWindowType == 9 (0x9) WINDOW_Book
+if ( pWindowType == WINDOW_Book )
 SellectDrawBook((unsigned int)pWindow->ptr_1C);
 }
-else//pWindowType == 6 (0x6) WINDOW_Options
+else if (pWindowType == WINDOW_Options)
 {
 sub_414F82_DrawGameOptions();
 }
 }
-else//pWindowType == 4 (0x4) WINDOW_CharacterRecord
+else if (pWindowType == WINDOW_CharacterRecord)
 {
 CharacterUI_CharacterScreen_Draw(uActiveCharacter);
 }
 continue;
 }

Mercurial > mm7

comparison mm7_5.cpp @ 158:f4ebd13c2a8e