mm7: mm7_2.cpp comparison

comparison mm7_2.cpp @ 169:d1dde383af89

Merge

author	Nomad
date	Thu, 14 Feb 2013 14:03:17 +0200
parents	ee11772d0ad2 572d821561f3
children	91fa025e6ca6 27573ee0d434

comparison

equal deleted inserted replaced

-:ee11772d0ad2
+:d1dde383af89
 if ( uNumDialogueNPCPortraits > 0 )
 {
 v3 = byte_591180;
 do
 {
-array_5913D8[v2 + 7] = (NPCData *)ptr_507BC0->CreateButton(
+array_5913D8[v2 + 7] = (NPCData *)ptr_507BC0->CreateButton(*(&pNPCPortraits_x + v2 + 6 * v1 - 6), *(&pNPCPortraits_y + v2 + 6 * v1 - 6),
-*(&_4E5E50_transui_x + v2 + 6 * v1 - 6),
+0x3Fu, 0x49u, 1, 0, 0x19Au, v2, 0, v3, 0, 0, 0);
-*(&_4E5EE0_transui_y + v2 + 6 * v1 - 6),
-0x3Fu,
-0x49u,
-1,
-0,
-0x19Au,
-v2,
-0,
-v3,
-0,
-0,
-0);
 v1 = uNumDialogueNPCPortraits;
 ++v2;
 v3 += 100;
 }
 while ( (signed int)v2 < uNumDialogueNPCPortraits );
 int v80; // [sp+ACh] [bp-8h]@12
 ItemGen *_this; // [sp+B0h] [bp-4h]@13
 v0 = pPlayers[uActiveCharacter];
 v77 = pPlayers[uActiveCharacter];
-if ( pCurrentScreen == 14 )
+if ( pCurrentScreen == SCREEN_E )
 goto LABEL_73;
 if ( !sub_4B1784_check_if_player_concious__draw_warning_else_mess_with_dlg_win() )
 {
 v56 = 0;
 v52 = 0;
 pAudioPlayer->StopChannels(-1, -1);
 pRenderer->BeginScene();
 pRenderer->ClearBlack();
 pRenderer->EndScene();
 pRenderer->Present();
-pVideoPlayer->field_40 = 0;
+pVideoPlayer->pResetflag = 0;
 _449B57_test_bit(pParty->_award_bits, 99);
 _this.Load("winbg.pcx", 2);
 pRenderer->BeginScene();
 pRenderer->DrawTextureRGB(0, 0, &_this);
 pRenderer->EndScene();
 v1 = 255;
 a4 = a1;
 GenerateColorAsCloseAsPossibleToR8G8B8InTargetFormat(0xFF, 0xFF, 0xFF);
 GenerateColorAsCloseAsPossibleToR8G8B8InTargetFormat(0xFF, 0xFF, 0x9B);
 pRenderer->BeginScene();
-if ( GetCurrentMenuID() != MENU_SAVELOAD && GetCurrentMenuID() != MENU_LOAD )
+if ( GetCurrentMenuID() != MENU_SAVELOAD && GetCurrentMenuID() != MENU_LOADINGPROC )
 {
 pRenderer->DrawTextureIndexed(8, 8, uTextureID_loadsave != -1 ? &pIcons_LOD->pTextures[uTextureID_loadsave] : 0);
 if ( a4 )
 {
 v2 = uTextureID_save_up;
 else
 {
 if ( pGUIWindow_CurrentMenu->field_40 == 3 )
 pGUIWindow_CurrentMenu->field_40 = 0;
 }
-if (GetCurrentMenuID() == MENU_LOAD)
+if (GetCurrentMenuID() == MENU_LOADINGPROC)
 {
 //v18 = pGlobalTXT_LocalizationStrings[135];
 v19 = pFontSmallnum->AlignText_Center(0xBA, pGlobalTXT_LocalizationStrings[135]);//"��������"
 pGUIWindow_CurrentMenu->DrawText(pFontSmallnum, v19 + 25, 220, 0, pGlobalTXT_LocalizationStrings[135], 0, 0, 0);
 v20 = (const char *)(pSavegameHeader + uLoadGameUI_SelectedSlot);
 unsigned int pY; // [sp-18h] [bp-54h]@39
 Texture *pTexture; // [sp-14h] [bp-50h]@39
 GUIButton *pButton2; // [sp+0h] [bp-3Ch]@27
 GUIWindow *pWindow; // [sp+4h] [bp-38h]@11
-pCurrentScreen = 0; // ���� ������� ����
+pCurrentScreen = SCREEN_GAME;
 if (pAsyncMouse)
 pAsyncMouse->Resume();
 if ( LOBYTE(pGame->pKeyboardInstance->bUsingAsynKeyboard) && pAsyncKeyboard )
 pAsyncKeyboard->Resume();
 pGUIWindow2 = 0;
 pAudioPlayer->StopChannels(-1, -1);
 pMouse->RemoveHoldingItem();
 ++pIcons_LOD->uTexturePacksCount;
 if ( !pIcons_LOD->uNumPrevLoadedFiles )
 pIcons_LOD->uNumPrevLoadedFiles = pIcons_LOD->uNumLoadedFiles;
-pWindow_MainMenu = GUIWindow::Create(0, 0, 640, 480, WINDOW_MainMenu, 0, 0); // �������� ����
+pWindow_MainMenu = GUIWindow::Create(0, 0, 640, 480, WINDOW_MainMenu, 0, 0);
-auto pNew = pIcons_LOD->LoadTexturePtr("title_new", TEXTURE_16BIT_PALETTE); // �������� ������
+auto pNew = pIcons_LOD->LoadTexturePtr("title_new", TEXTURE_16BIT_PALETTE);
 pMainMenu_BtnNew = pWindow_MainMenu->CreateButton(495, 172, pNew->uTextureWidth, pNew->uTextureHeight, 1, 0,
 UIMSG_MainMenu_ShowPartyCreationWnd, 0, 78, "", pNew, 0);
 auto pLoad = pIcons_LOD->LoadTexturePtr("title_load", TEXTURE_16BIT_PALETTE);
 pMainMenu_BtnLoad = pWindow_MainMenu->CreateButton(495, 227, pLoad->uTextureWidth, pLoad->uTextureHeight, 1, 0,
 UIMSG_MainMenu_ShowLoadWindow, 1, 76, "", pLoad, 0);
 while (GetCurrentMenuID() == MENU_MAIN || GetCurrentMenuID() == MENU_SAVELOAD)
 {
 POINT pt;
 pMouse->GetCursorPos(&pt);
 pWindow = pWindow_MainMenu;
-if ( GetCurrentMenuID() == MENU_SAVELOAD)//���� ���� ��������
+if ( GetCurrentMenuID() == MENU_SAVELOAD)
 {
-if ( pCurrentScreen != 12 )//���� �� ���� �������� ����
+if ( pCurrentScreen != SCREEN_LOADGAME )
 {
 pTexture_PCX.Release();
 pTexture_PCX.Load("lsave640.pcx", 0);
 pGUIWindow2 = GUIWindow::Create(0, 0, 640, 480, WINDOW_MainMenu, 0, 0);
-pCurrentScreen = 12; //���� �������� ����
+pCurrentScreen = SCREEN_LOADGAME;
-GameUI_DrawLoadMenu(0);//������� ���������� ���� ��������
+GameUI_DrawLoadMenu(0);
 }
 pWindow = pGUIWindow_CurrentMenu;
 }
 MSG msg;
-while ( PeekMessageA(&msg, 0, 0, 0, PM_REMOVE) )//�������� ��������� �� �������� ���������
+while ( PeekMessageA(&msg, 0, 0, 0, PM_REMOVE) )
 {
 if (msg.message == WM_QUIT)
 Game_DeinitializeAndTerminate(0);
 TranslateMessage(&msg);
 DispatchMessageA(&msg);
 {
 pRenderer->BeginScene();
 pRenderer->DrawTextureRGB(0, 0, &pTexture_PCX);
 if (pAsyncMouse)
 pAsyncMouse->_46B736_consume_click_lists(1);
-GUI_MainMenuMessageProc();//��������� �������� ��������� ����������� �� ������� ��������� ��� ���� ������ ������������� ����
+GUI_MainMenuMessageProc();
 GUI_UpdateWindows();
 if (pAsyncMouse)
 pAsyncMouse->_46B736_consume_click_lists(1);
-if (GetCurrentMenuID() != MENU_MAIN)// ���� �� ������� ����
+if (GetCurrentMenuID() != MENU_MAIN)
 {
-if (GetCurrentMenuID() == MENU_LOAD)// ���� ���� ��������
+if (GetCurrentMenuID() == MENU_LOADINGPROC)
 {
 pIcons_LOD->_4114F2();
 pGUIWindow_CurrentMenu->Release();
 pGUIWindow_CurrentMenu = 0;
-pCurrentScreen = 0;
+pCurrentScreen = SCREEN_GAME;
 viewparams->bRedrawGameUI = 1;
 }
 }
 else
 {
 v36 = 273;
 v35 = hWnd;
 goto LABEL_104;
 }
 if ( pCurrentScreen
-&& pCurrentScreen != 21 )
+&& pCurrentScreen != SCREEN_PRESS_ESCAPE_MESSAGE )
 return 0;
 }
 if ( !viewparams->field_4C )
 sub_41CD4F(wParam);
 return 0;
 return false;
 }
 pParty = new Party;
+memset(&pParty->pHirelings, 0, sizeof(pParty->pHirelings));
 pParty->uWalkSpeed = GetPrivateProfileIntW(L"debug", L"walkspeed", 384, pMM6IniFile);
 pParty->uDefaultEyelevel = GetPrivateProfileIntW(L"party", L"eyelevel", 160, pMM6IniFile);
 pParty->sEyelevel = pParty->uDefaultEyelevel;
 pParty->uDefaultPartyHeight = GetPrivateProfileIntW(L"party", L"height", 192, pMM6IniFile);
 pParty->uPartyHeight = pParty->uDefaultPartyHeight;
 FinalInitialization();
 Log::Warning(L"MM: entering main loop");
 while ( 1 )
 {
-MainMenu_Loop(); // ���������� �������� ���� � ��� �� ���������� ���� ��������
+MainMenu_Loop();
 uGameState = 0;
 //LABEL_21:
 while ( 1 )
 {
 switch (uGameState)
 {
-case GAME_FINISHED: // ����� �� ����
+case GAME_FINISHED:
 pGame->Deinitialize();
-return true; // ����� �� ������� MM_Main � Win_Main
+return true;
 }
-if (GetCurrentMenuID() == MENU_FINISHED) // ���� �����
+if (GetCurrentMenuID() == MENU_FINISHED)
 {
 uGameState = GAME_FINISHED;
-continue; // � ������ �����
+continue;
 }
-if (GetCurrentMenuID() == MENU_NEWGAME)                // ���� ����� ����
+if (GetCurrentMenuID() == MENU_NEWGAME)
 {
 if ( pAudioPlayer->hAILRedbook )
-AIL_redbook_stop(pAudioPlayer->hAILRedbook);      // ���������� ������
+AIL_redbook_stop(pAudioPlayer->hAILRedbook);
-pParty->Reset();                                    // ����� ������
+pParty->Reset();
 for (uint k = 0; k < 50; ++k)
 pOtherOverlayList->pOverlays[k].Reset();
-strcpy(pCurrentMapName, pStartingMapName);         // ������� �����
+strcpy(pCurrentMapName, pStartingMapName);
-pParty->CreateDefaultParty(0);                     // ������� ������ �� ���������
+pParty->CreateDefaultParty(0);
 PlayerCreationUI_Initialize();
-if ( PlayerCreationUI_Loop() )                    //������� �������� ������
+if ( PlayerCreationUI_Loop() )
 {
 DeleteCCharFont();
-break;// ����� �� �����
+break;
 }
 DeleteCCharFont();
 bFlashQuestBook = true;
-pGame->pCShow->PlayMovie(MOVIE_Emerald, 0);       //��������
+pGame->pCShow->PlayMovie(MOVIE_Emerald, 0);
-Autosave();                                       //��������������
+Autosave();
-//goto LABEL_48;
+pGame->Loop();
-pGame->Loop(); // ������� ����
+if ( uGameState == GAME_STATE_NEWGAME_OUT_GAMEMENU )
-break; // ����� �� �����
+{
-}
+SetCurrentMenuID(MENU_NEWGAME);
-if (GetCurrentMenuID() == MENU_CREDITS) // ���� ���������
+uGameState = 0;
+continue;
+}
+break;
+}
+if (GetCurrentMenuID() == MENU_CREDITS)
 {
 if ( pAudioPlayer->hAILRedbook )
-AIL_redbook_stop(pAudioPlayer->hAILRedbook);// ��������� ����
+AIL_redbook_stop(pAudioPlayer->hAILRedbook);
 extern MENU_STATE __cdecl CreditsMenu__Loop();
-CreditsMenu__Loop(); // ������� ��������������� ���� ���������
+CreditsMenu__Loop();
 break;
 }
-if (GetCurrentMenuID() == MENU_5 || GetCurrentMenuID() == MENU_LOAD) //??? ���������� ��� ���
+if (GetCurrentMenuID() == MENU_5 || GetCurrentMenuID() == MENU_LOADINGPROC)
 {
 uGameState = 0;
 }
 else
 __debugbreak();
 pAsyncMouse->Resume();
 if ( LOBYTE(pGame->pKeyboardInstance->bUsingAsynKeyboard) && pAsyncKeyboard )
 pAsyncKeyboard->Resume();
 }*/
 //LABEL_48:
-pGame->Loop(); //game
+pGame->Loop();
 LABEL_49:
 if ( uGameState == 3 )
 __debugbreak();
 /*{
 v12 = 5;
 SetCurrentMenuID((MENU_STATE)v12);
 //goto LABEL_21;
 uGameState = 0;
 continue;
 }*/
-if ( uGameState == GAME_STATE_NEWGAME_OUT_GAMEMENU )//press NewGame button out GameMenu window
+if ( uGameState == GAME_STATE_NEWGAME_OUT_GAMEMENU )
 {
 SetCurrentMenuID(MENU_NEWGAME);
 uGameState = 0;
 continue;
 }
 case MENU_CREDITS:     return L"MENU_CREDITS";
 case MENU_SAVELOAD:    return L"MENU_SAVELOAD";
 case MENU_FINISHED:    return L"MENU_FINISHED";
 case MENU_5:           return L"MENU_5";
 case MENU_CREATEPARTY: return L"MENU_CREATEPARTY";
-case MENU_7:           return L"MENU_7";
+case MENU_NAMEPANELESC: return L"MENU_NAMEPANELESC";
-case MENU_Credits:     return L"MENU_Credits";
+case MENU_CREDITSPROC: return L"MENU_CREDITSPROC";
-case MENU_LOAD:        return L"MENU_LOAD";
+case MENU_LOADINGPROC: return L"MENU_LOADINGPROC";
 case MENU_10:          return L"MENU_10";
+case MENU_CREDITSCLOSE: return L"MENU_CREDITSCLOSE";
 default:               return L"unk";
 };
 };
 void SetCurrentMenuID(MENU_STATE uMenu)
 {
 pGUIWindow_ScrollWindow = 0;
 }
 }
 //----- (00467FB6) --------------------------------------------------------
-char __cdecl sub_467FB6()
+char __cdecl CreateScrollWindow()
 {
 unsigned int v0; // eax@1
 char *v1; // ST18_4@3
 unsigned int v2; // eax@3
 GUIWindow a1; // [sp+Ch] [bp-54h]@1
 ShowNothingHereStatus();
 return 1;
 }
 if ( v5 & 0x100000 || (v6 = pIndoor->pFaceExtras[v4->uFaceExtraID].uEventID) == 0 )
 return 1;
-if ( pCurrentScreen != 19 )
+if ( pCurrentScreen != SCREEN_BRANCHLESS_NPC_DIALOG )
 goto LABEL_13;
 break;
 }
 return 0;
 }
 {
 pAudioPlayer->StopChannels(-1, -1);
 UI_CreateTravelDialogue();
 }
 }
-//UpdateActors_ODM();Ritor1: it's temporarily
+UpdateActors_ODM();
 _46CC4B_check_event_triggers();
 }

Mercurial > mm7

comparison mm7_2.cpp @ 169:d1dde383af89