mm7: mm7_2.cpp comparison

comparison mm7_2.cpp @ 1541:86cb7398d2a8

mm8 icons

author	Nomad
date	Sat, 07 Sep 2013 12:51:06 +0200
parents	7ef4b64f6329
children	7d986a396092

comparison

equal deleted inserted replaced

-:251111bac49f
+:86cb7398d2a8
 int a2; // [sp+7Ch] [bp+10h]@50
 switch (Msg)
 {
 case WM_SIZING:  return 1;
+case WM_CREATE:  case WM_NCCREATE:
 case WM_SHOWWINDOW:
 case WM_GETTEXT:
 case WM_SETTEXT: return DefWindowProcW(hWnd, Msg, wParam, lParam);
 case WM_WINDOWPOSCHANGED:
 for (uint i = 0; i < 1000; ++i)
 pSpriteObjects[i].uObjectDescID = 0;
 v5 = pMapStats->GetMapInfo(pCurrentMapName);
-bUnderwater = 0;
+bUnderwater = false;
 uLevelMapStatsID = v5;
 pGame->uFlags2 &= 0xFFFFFFF7u;
 if ( !_stricmp(pCurrentMapName, "out15.odm") )
 {
-bUnderwater = 1;
+bUnderwater = true;
 pGame->uFlags2 |= 8u;
 }
 pParty->floor_face_pid = 0;
 if ( _stricmp(Str1, "blv") )
 PrepareToLoadODM(v9, 0);
 }
 auto hDesktopDC = GetDC(nullptr);
 uint uDesktopWidth = GetDeviceCaps(hDesktopDC, HORZRES);
 uint uDesktopHeight = GetDeviceCaps(hDesktopDC, VERTRES);
-if (GetDeviceCaps(hDesktopDC, BITSPIXEL) != 16 ||
-GetDeviceCaps(hDesktopDC, PLANES) != 1 )
-dword_6BE364_game_settings_1 |= 2;
 ReleaseDC(nullptr, hDesktopDC);
 uint uTotalWinWidth = 2 * GetSystemMetrics(SM_CXFRAME) + 640;
 uint uTotalWinHeight = GetSystemMetrics(SM_CYCAPTION) + 2 * GetSystemMetrics(SM_CYFRAME) + 480;
 hWnd = CreateWindowExW(0, wcxw.lpszClassName, L"Might and Magic® VII",
 uWindowStyle = WS_SYSMENU | WS_GROUP | WS_DLGFRAME | WS_BORDER,
 uWindowX, uWindowY,
 640, 480,
 nullptr,
-hOSMenu = nullptr,
+nullptr,
 wcxw.hInstance,
 nullptr);
-SetWindowTextW(hWnd, L"Might and Magic® VII");
 HMENU menu = CreateMenu();
 {
 HMENU file = CreatePopupMenu();
 AppendMenuW(menu, MF_ENABLED | MF_STRING | MF_POPUP, (UINT_PTR)file, L"&File");
 }
 else
 Log::Warning(L"Unable to find mm6:sprites.lod");
+if (_access("../mm8/data/icons.lod", 0) == 0)
-if (bDebugResouces)
+{
-{
+pIcons_LOD_mm8 = new LODFile_IconsBitmaps;
-pSpriteFrameTable = new SpriteFrameTable;
+if (!pIcons_LOD_mm8->Load("../mm8/data/icons.lod", "icons"))
-if (!pSpriteFrameTable->FromFileTxt("data\\sft.txt"))
+{
-Abortf("Unable to open sft.txt");
+delete pIcons_LOD_mm8;
+pIcons_LOD_mm8 = nullptr;
-pDecorationList = new DecorationList;
+Log::Warning(L"Unable to load mm8:icons.lod");
-if (!pDecorationList->FromFileTxt("data\\declist.txt"))
+}
-Abortf("Unable to open declist.txt");
-pObjectList = new ObjectList;
-if (!pObjectList->FromFileTxt("data\\objlist.txt"))
-Abortf("Unable to open objlist.txt");
-pMonsterList = new MonsterList;
-if (!pMonsterList->FromFileTxt("data\\monlist.txt"))
-Abortf("Unable to open monlist.txt");
-pIconsFrameTable = new IconFrameTable;
-if (!pIconsFrameTable->FromFileTxt("data\\ift.txt"))
-Abortf("Unable to open ift.txt");
-pTextureFrameTable = new TextureFrameTable;
-if (!pTextureFrameTable->FromFileTxt("data\\tft.def"))
-Abortf("Unable to open tft.def");
-pTileTable = new TileTable;
-if (!pTileTable->FromFileTxt("data\\tile.def"))
-Abortf("Unable to open tile.def");
-pPlayerFrameTable = new PlayerFrameTable;
-if (!pPlayerFrameTable->FromFileTxt("data\\pft.def"))
-Abortf("Unable to open pft.def");
-pChestList = new ChestList;
-if (!pChestList->FromFileTxt("data\\chest.def"))
-Abortf("Unable to open chest.def");
-pOverlayList = new OverlayList;
-if (!pOverlayList->FromFileTxt("data\\overlay.def"))
-Abortf("Unable to open overlay.def");
-pSoundList = new SoundList;
-if (!pSoundList->FromFileTxt("data\\sounds.def"))
-Abortf("Unable to open sounds.def");
 }
 else
+Log::Warning(L"Unable to find mm8:icons.lod");
+if (_access("../mm8/data/bitmaps.lod", 0) == 0)
+{
+pBitmaps_LOD_mm8 = new LODFile_IconsBitmaps;
+if (!pBitmaps_LOD_mm8->Load("../mm8/data/bitmaps.lod", "bitmaps"))
+{
+delete pBitmaps_LOD_mm8;
+pBitmaps_LOD_mm8 = nullptr;
+Log::Warning(L"Unable to load mm8:bitmaps.lod");
+}
+}
+else
+Log::Warning(L"Unable to find mm8:bitmaps.lod");
+if (_access("../mm8/data/sprites.lod", 0) == 0)
+{
+pSprites_LOD_mm8 = new LODFile_Sprites;
+if (!pSprites_LOD_mm8->LoadSprites("../mm8/data/sprites.lod"))
+{
+delete pSprites_LOD_mm8;
+pSprites_LOD_mm8 = nullptr;
+Log::Warning(L"Unable to load mm8:sprites.lod");
+}
+}
+else
+Log::Warning(L"Unable to find mm8:sprites.lod");
 {
 void *sft_mm6 = pIcons_LOD_mm6 ? pIcons_LOD_mm6->LoadRaw("dsft.bin", 1) : nullptr,
 *sft_mm8 = nullptr;
 auto  sft_mm7 = pEvents_LOD->LoadRaw("dsft.bin", 1);
 pSpriteFrameTable = new SpriteFrameTable;
 free(sounds_mm7);
 free(sounds_mm8);
 }
-if (bDebugResouces)
-{
-pSpriteFrameTable->ToFile();
-pDecorationList->ToFile();
-pObjectList->ToFile();
-pMonsterList->ToFile();
-pIconsFrameTable->ToFile();
-pTextureFrameTable->ToFile();
-pTileTable->ToFile();
-pPlayerFrameTable->ToFile();
-pChestList->ToFile();
-pOverlayList->ToFile();
-pSoundList->ToFile();
-}
 if (dword_6BE364_game_settings_1 & 2 || !(dword_6BE368_debug_settings_2 & 1))//
 //   color depth != 16
 // or
 bool all_magic = true;
 //----- (00462C94) --------------------------------------------------------
 bool MM_Main(const wchar_t *pCmdLine)
 {
-HWND hPrevWnd; // eax@1
-HWND hPrevWnd_; // esi@1
-HWND v6; // eax@4
-int v8; // eax@15
-//bool v9; // edx@16
-//OtherOverlay *v10; // esi@44
-//signed int v11; // edi@44
-//unsigned int v12; // ecx@56
-HANDLE v13; // eax@68
-unsigned int startms; // [sp+8h] [bp-24h]@55
-RECT Rect; // [sp+Ch] [bp-20h]@15
-int a2[4]; // [sp+1Ch] [bp-10h]@15
 IntegrityTest();
 char test[1024];
 sprintfex(test, "^Pi[%s]: çíàõàð^R[ü;êà;]", "Çîëòàí");
 bool bNoMargareth = false;
 {
 Log::Warning(L"MM init: failed");
 pGame->Deinitialize();
 return 1;
 }
-Log::Warning(L"MM init: ok");
 pEventTimer->Pause();
 SetUserInterface(PartyAlignment_Neutral, false);
 ShowIntroVideo_and_LoadingScreen();
 WriteWindowsRegistryInt("Ran once", 1);
 dword_6BE364_game_settings_1 |= 0x4000;
 pGame->InitializeGammaController();
 SecondaryInitialization();
-pRenderer->SetRasterClipRect(0, 0, 639u, 479u);
+pRenderer->SetRasterClipRect(0, 0, 639, 479);
 FinalInitialization();
 Log::Warning(L"MM: entering main loop");
 while ( 1 )
 {
 }
 if (!bNoSound && pAudioPlayer->hAILRedbook)
 {
 pAudioPlayer->SetMusicVolume(pSoundVolumeLevels[uMusicVolimeMultiplier] * 64.0f);
 AIL_redbook_stop(pAudioPlayer->hAILRedbook);
-unsigned int end_ms;
+unsigned int startms, end_ms;
 AIL_redbook_track_info(pAudioPlayer->hAILRedbook, 0xE, &startms, &end_ms);
 AIL_redbook_play(pAudioPlayer->hAILRedbook, startms + 1, end_ms);
 }
 }

Mercurial > mm7

comparison mm7_2.cpp @ 1541:86cb7398d2a8