mm7: mm7_2.cpp comparison

comparison mm7_2.cpp @ 510:7c86030324a5

Слияние

author	Ritor1
date	Fri, 01 Mar 2013 18:38:12 +0600
parents	0e20e886365d
children	cb0ad52d6a26 d2a55c0a8dda

comparison

equal deleted inserted replaced

-:dddedef7a98e
+:7c86030324a5
 }
 }
 return result;
 }
 }
-pRenderer->DrawTextureIndexed(8u, 8u, dword_F8B164);
+pRenderer->DrawTextureIndexed(8u, 8u, ShopTexture);
 v3 = 0;
 if ( dword_F8B19C == 2 )
 {
 v48 = 0;
 v108 = 0;
 LABEL_46:
 v40 = pFontArrus->CalcTextHeight(v21, v84, v85, v86);
 return (POINT *)v104.DrawTitleText(pFontArrus, v3, (174 - v40) / 2 + 138, v88, v90, v92);
 }
 }
-pRenderer->DrawTextureIndexed(8u, 8u, dword_F8B164);
+pRenderer->DrawTextureIndexed(8u, 8u, ShopTexture);
 v3 = 0;
 v114 = 0;
 if ( dword_F8B19C == 2 )
 {
 do
 			}
 		}
 		break;
 	case 2: //buy standart
 		{
-		pRenderer->DrawTextureIndexed(8u, 8u, dword_F8B164);
+		pRenderer->DrawTextureIndexed(8u, 8u, ShopTexture);
 		v55 = 0;
 		v153 = 0;
 		for(int i=0; i<8; ++i)
 			{
 			//  if ( pParty->field_777C[9 * (v55 + 12 * (unsigned int)window_SpeakInHouse->ptr_1C)] )
 		return;
 		}
 		break;
 	case 6:
 		{
-		pRenderer->DrawTextureIndexed(8u, 8u, dword_F8B164);
+		pRenderer->DrawTextureIndexed(8u, 8u, ShopTexture);
 		DrawTextAtStatusBar(pGlobalTXT_LocalizationStrings[195], 0);
 		if ( !sub_4B1784_check_if_player_concious__draw_warning_else_mess_with_dlg_win() )
 			return;
 		v149 = 0;
 		v93 = 0;
 		}
 		break;
 	case 95:  //buy spesial
 		{
-		pRenderer->DrawTextureIndexed(8u, 8u, dword_F8B164);
+		pRenderer->DrawTextureIndexed(8u, 8u, ShopTexture);
 		v11 = 0;
 		v61 = 0;
 		v153 = 0;
 		do
 //----- (004BC8D5) --------------------------------------------------------
-Texture *__cdecl sub_4BC8D5()
+void SpellBookGenerator()
-{
+	{
 int v0; // esi@1
-char *v1; // ebx@1
+int v1; // ebx@1
 signed int v2; // edi@1
 signed int v3; // eax@2
 int v4; // esi@7
 GUIWindow *v5; // ebp@15
 Texture *result; // eax@15
 int v7; // [sp+10h] [bp-4h]@0
-v0 = v7;
+// v0 = v7;
-v1 = (char *)window_SpeakInHouse->ptr_1C - 139;
+v1 = window_SpeakInHouse->par1C - 139;
 v2 = 0;
-do
+for(int i=0; i<12; ++i)
 {
 //v3 = p2DEvents_minus1___00[26 * (unsigned int)ptr_507BC0->ptr_1C];
-v3 = p2DEvents[(unsigned int)window_SpeakInHouse->ptr_1C - 1].uType;
+v3 = p2DEvents[window_SpeakInHouse->par1C - 1].uType;
 if ( v3 < 5 )
 goto LABEL_12;
 if ( v3 <= 13 )
 {
 v0 = rand() % word_4F0F30[(signed int)v1]
 if ( !(unsigned __int16)_449B57_test_bit(pParty->_quest_bits, 239) )
 v0 = 486;
 }
 v5 = window_SpeakInHouse;
-auto _u = (ItemGen *)&pParty->pPlayers[1].pInstalledBeacons[0].field_18 + v2 + 12 * (unsigned int)window_SpeakInHouse->ptr_1C;
+ItemGen * _u = &pParty->SpellBooksInGuilds[window_SpeakInHouse->par1C-139][i];
 _u->Reset();
-*(&pParty->pPlayers[1].pInstalledBeacons[0].field_18 + 9 * (v2 + 12 * (unsigned int)v5->ptr_1C)) = v0;
+pParty->SpellBooksInGuilds[window_SpeakInHouse->par1C-139][i].uItemID= v0;
-*(&pParty->pPlayers[1].pInstalledBeacons[1].field_10 + 9 * (v2++ + 12 * (unsigned int)v5->ptr_1C)) = 1;
+pParty->SpellBooksInGuilds[window_SpeakInHouse->par1C-139][i].Identified();
-result = &pIcons_LOD->pTextures[pIcons_LOD->LoadTexture(pItemsTable->pItems[v0].pIconName, TEXTURE_16BIT_PALETTE)];
-*(&dword_F8B164 + v2) = result;
+ItemsInShopTexture[i] = &pIcons_LOD->pTextures[pIcons_LOD->LoadTexture(pItemsTable->pItems[v0].pIconName, TEXTURE_16BIT_PALETTE)];
 }
-while ( v2 < 12 );
-return result;
+return;
 }
 //----- (004BCA33) --------------------------------------------------------
 GUIButton *__cdecl UI_CreateEndConversationButton()
 dword_F8B19C = uMessageParam;
 if ( in_current_building_type < BildingType_19 )
 {
 v9 = pIcons_LOD->LoadTexture(off_4F03B8[in_current_building_type], TEXTURE_16BIT_PALETTE);
 //v3 = dword_F8B198;
-dword_F8B164 = &pIcons_LOD->pTextures[v9];
+ShopTexture = &pIcons_LOD->pTextures[v9];
 LABEL_13:
 v8 = window_SpeakInHouse;
 }
 if ( in_current_building_type > BildingType_Tavern )
 {
 *(int *)&stru_AA1058[3].pSounds[8 * (unsigned int)v8->ptr_1C + 44468]) >= (signed __int64)pParty->uTimePlayed )
 {
 v32 = 0;
 do
 {
-v33 = *(&pParty->pPlayers[1].pInstalledBeacons[0].field_18 + 9 * (v32 + 12 * (unsigned int)v8->ptr_1C));
+//v33 = *(&pParty->pPlayers[1].pInstalledBeacons[0].field_18 + 9 * (v32 + 12 * (unsigned int)v8->ptr_1C));
+				v33 = pParty->SpellBooksInGuilds[v8->par1C-139][v32].uItemID;
 if ( v33 )
 {
 v34 = pIcons_LOD->LoadTexture(pItemsTable->pItems[v33].pIconName, TEXTURE_16BIT_PALETTE);
 v8 = window_SpeakInHouse;
 ItemsInShopTexture[v32] = &pIcons_LOD->pTextures[v34];
 }
 while ( v32 < 12 );
 }
 else
 {
-sub_4BC8D5();
+SpellBookGenerator();
 v30 = window_SpeakInHouse->ptr_1C;
 v31 = pParty->uTimePlayed
 + (signed __int64)((double)(0xA8C000
 //* (signed int)p2DEvents_minus1[26 * (unsigned int)ptr_507BC0->ptr_1C])
 * (signed int)p2DEvents[(unsigned int)window_SpeakInHouse->ptr_1C - 1].field_1C)
 if ( dword_F8B19C != 2
 && dword_F8B19C != 3
 && dword_F8B19C != 97
 && dword_F8B19C != 5
 && dword_F8B19C != 4
-&& dword_F8B164 )
+&& ShopTexture )
 {
-dword_F8B164->Release();
+ShopTexture->Release();
 v0 = dword_F8B19C;
-dword_F8B164 = 0;
+ShopTexture = 0;
 }
 if ( v0 && v0 != 1 )
 {
 if ( v0 == -1 )
 {
 }
 pWindow_MainMenu->Release();
 pIcons_LOD->_4114F2();
 }
+int __stdcall pWinProc(HWND hWnd, UINT Msg, WPARAM wParam, unsigned int lParam)
+	{
+	return DefWindowProcA(hWnd, Msg, wParam, lParam);
+	}
 //----- (004637EB) --------------------------------------------------------
 int __stdcall aWinProc(HWND hWnd, UINT Msg, WPARAM wParam, unsigned int lParam)
 {
 nullptr,
 hOSMenu = nullptr,
 wcxw.hInstance,
 nullptr);
 SetWindowTextW(hWnd, L"Might and Magic� VII");
 SetPriorityClass(GetCurrentProcess(), NORMAL_PRIORITY_CLASS);
 pRenderer = Render::Create();
 if (!pRenderer)
 {
 {
 Log::Warning(L"Render failed to initialize");
 return false;
 }
 }
 pAllocator = Allocator::Create();
 if (!pAllocator->Initialize(26 * 1024))
 {
 MessageBoxW(nullptr,
 L"Unable to Allocate 26Mb of RAM",
 L"More RAM Memory Required", MB_ICONEXCLAMATION);
 return false;
 }
 game_starting_year = 1168;
 pParty = new Party;
 memset(&pParty->pHirelings, 0, sizeof(pParty->pHirelings));
 pParty->uWalkSpeed = GetPrivateProfileIntW(L"debug", L"walkspeed", 384, pMM6IniFile);
 pChestList->ToFile();
 pOverlayList->ToFile();
 pSoundList->ToFile();
 }
 if (dword_6BE364_game_settings_1 & 2 || !(dword_6BE368_debug_settings_2 & 1))//
 //   color depth != 16
 // or
 //   not in window
 {
 {
 uGameState = 0;
 }
 else
 __debugbreak();
-/*{
+{
-if (GetCurrentMenuID() != MENU_10)
+/*  if (GetCurrentMenuID() != MENU_10)
 goto LABEL_49;
 pMouse->Activate(0);
 if (pAsyncMouse)
 pAsyncMouse->Suspend();
 if ( LOBYTE(pGame->pKeyboardInstance->bUsingAsynKeyboard) && pAsyncKeyboard )
 strcpy(pCurrentMapName, ofn.lpstrFileTitle);
 pMouse->Activate(1);
 if (pAsyncMouse)
 pAsyncMouse->Resume();
 if ( LOBYTE(pGame->pKeyboardInstance->bUsingAsynKeyboard) && pAsyncKeyboard )
-pAsyncKeyboard->Resume();
+pAsyncKeyboard->Resume();*/
-}*/
+}
 //LABEL_48:
 pGame->Loop();
 LABEL_49:
 if ( uGameState == 3 )
 __debugbreak();
 }
 }
 else
 Log::Warning(L"MM init: failed");
 pGame->Deinitialize();
+return 1;
 }
 if ( v51 )
 v0->pEquipment.uOffHand = 0;
 LABEL_74:
 if ( v50 )
 stru_A750F8[uActiveCharacter - 1]._494836(
-*((int *)&pSpellDatas[66].field_8 + v50),
+*((int *)&pSpellDatas[66].uNormalLevelRecovery + v50),
 uActiveCharacter - 1 + 9);
 break;
 case 1u:
 if ( sub_43EE77_ProbablyIfUnderwaterSuitIsEquipped(uActiveCharacter) )
 goto LABEL_95;

Mercurial > mm7

comparison mm7_2.cpp @ 510:7c86030324a5