diff --git a/.vs/ProjectSettings.json b/.vs/ProjectSettings.json new file mode 100644 index 0000000..38c5f00 --- /dev/null +++ b/.vs/ProjectSettings.json @@ -0,0 +1,3 @@ +{ + "CurrentProjectSetting": "x86-Debug" +} \ No newline at end of file diff --git a/.vs/Speedy-Eggbert-2-Source-Code-Decomp/FileContentIndex/dd1b921b-0c2e-43d2-b23b-45c55dbf2ccb.vsidx b/.vs/Speedy-Eggbert-2-Source-Code-Decomp/FileContentIndex/dd1b921b-0c2e-43d2-b23b-45c55dbf2ccb.vsidx new file mode 100644 index 0000000..17b9c02 Binary files /dev/null and b/.vs/Speedy-Eggbert-2-Source-Code-Decomp/FileContentIndex/dd1b921b-0c2e-43d2-b23b-45c55dbf2ccb.vsidx differ diff --git a/.vs/Speedy-Eggbert-2-Source-Code-Decomp/FileContentIndex/ec760080-a62e-4ee7-9987-8fd6a5f0bb6d.vsidx b/.vs/Speedy-Eggbert-2-Source-Code-Decomp/FileContentIndex/ec760080-a62e-4ee7-9987-8fd6a5f0bb6d.vsidx new file mode 100644 index 0000000..12f5683 Binary files /dev/null and b/.vs/Speedy-Eggbert-2-Source-Code-Decomp/FileContentIndex/ec760080-a62e-4ee7-9987-8fd6a5f0bb6d.vsidx differ diff --git a/.vs/Speedy-Eggbert-2-Source-Code-Decomp/v17/Browse.VC.db b/.vs/Speedy-Eggbert-2-Source-Code-Decomp/v17/Browse.VC.db new file mode 100644 index 0000000..b2669dc Binary files /dev/null and b/.vs/Speedy-Eggbert-2-Source-Code-Decomp/v17/Browse.VC.db differ diff --git a/.vs/Speedy-Eggbert-2-Source-Code-Decomp/v17/DocumentLayout.json b/.vs/Speedy-Eggbert-2-Source-Code-Decomp/v17/DocumentLayout.json new file mode 100644 index 0000000..57286fe --- /dev/null +++ b/.vs/Speedy-Eggbert-2-Source-Code-Decomp/v17/DocumentLayout.json @@ -0,0 +1,143 @@ +{ + "Version": 1, + "WorkspaceRootPath": "C:\\Users\\JonAd\\source\\repos\\HMVocaloid\\Speedy-Eggbert-2-Source-Code-Decomp\\", + "Documents": [ + { + "AbsoluteMoniker": "D:0:0:{A2FE74E1-B743-11D0-AE1A-00A0C90FFFC3}|\u003CMiscFiles\u003E|C:\\Users\\JonAd\\source\\repos\\HMVocaloid\\Speedy-Eggbert-2-Source-Code-Decomp\\decor.cpp||{D0E1A5C6-B359-4E41-9B60-3365922C2A22}", + "RelativeMoniker": "D:0:0:{A2FE74E1-B743-11D0-AE1A-00A0C90FFFC3}|\u003CMiscFiles\u003E|solutionrelative:decor.cpp||{D0E1A5C6-B359-4E41-9B60-3365922C2A22}" + }, + { + "AbsoluteMoniker": "D:0:0:{A2FE74E1-B743-11D0-AE1A-00A0C90FFFC3}|\u003CMiscFiles\u003E|C:\\Users\\JonAd\\source\\repos\\HMVocaloid\\Speedy-Eggbert-2-Source-Code-Decomp\\decblupi.cpp||{D0E1A5C6-B359-4E41-9B60-3365922C2A22}", + "RelativeMoniker": "D:0:0:{A2FE74E1-B743-11D0-AE1A-00A0C90FFFC3}|\u003CMiscFiles\u003E|solutionrelative:decblupi.cpp||{D0E1A5C6-B359-4E41-9B60-3365922C2A22}" + }, + { + "AbsoluteMoniker": "D:0:0:{A2FE74E1-B743-11D0-AE1A-00A0C90FFFC3}|\u003CMiscFiles\u003E|C:\\Users\\JonAd\\source\\repos\\HMVocaloid\\Speedy-Eggbert-2-Source-Code-Decomp\\ddutil.cpp||{D0E1A5C6-B359-4E41-9B60-3365922C2A22}", + "RelativeMoniker": "D:0:0:{A2FE74E1-B743-11D0-AE1A-00A0C90FFFC3}|\u003CMiscFiles\u003E|solutionrelative:ddutil.cpp||{D0E1A5C6-B359-4E41-9B60-3365922C2A22}" + }, + { + "AbsoluteMoniker": "D:0:0:{A2FE74E1-B743-11D0-AE1A-00A0C90FFFC3}|\u003CMiscFiles\u003E|C:\\Users\\JonAd\\source\\repos\\HMVocaloid\\Speedy-Eggbert-2-Source-Code-Decomp\\button.cpp||{D0E1A5C6-B359-4E41-9B60-3365922C2A22}", + "RelativeMoniker": "D:0:0:{A2FE74E1-B743-11D0-AE1A-00A0C90FFFC3}|\u003CMiscFiles\u003E|solutionrelative:button.cpp||{D0E1A5C6-B359-4E41-9B60-3365922C2A22}" + }, + { + "AbsoluteMoniker": "D:0:0:{A2FE74E1-B743-11D0-AE1A-00A0C90FFFC3}|\u003CMiscFiles\u003E|C:\\Users\\JonAd\\source\\repos\\HMVocaloid\\Speedy-Eggbert-2-Source-Code-Decomp\\blupi.cpp||{D0E1A5C6-B359-4E41-9B60-3365922C2A22}", + "RelativeMoniker": "D:0:0:{A2FE74E1-B743-11D0-AE1A-00A0C90FFFC3}|\u003CMiscFiles\u003E|solutionrelative:blupi.cpp||{D0E1A5C6-B359-4E41-9B60-3365922C2A22}" + }, + { + "AbsoluteMoniker": "D:0:0:{A2FE74E1-B743-11D0-AE1A-00A0C90FFFC3}|\u003CMiscFiles\u003E|C:\\Users\\JonAd\\source\\repos\\HMVocaloid\\Speedy-Eggbert-2-Source-Code-Decomp\\CppProperties.json||{90A6B3A7-C1A3-4009-A288-E2FF89E96FA0}", + "RelativeMoniker": "D:0:0:{A2FE74E1-B743-11D0-AE1A-00A0C90FFFC3}|\u003CMiscFiles\u003E|solutionrelative:CppProperties.json||{90A6B3A7-C1A3-4009-A288-E2FF89E96FA0}" + }, + { + "AbsoluteMoniker": "D:0:0:{A2FE74E1-B743-11D0-AE1A-00A0C90FFFC3}|\u003CMiscFiles\u003E|C:\\Users\\JonAd\\source\\repos\\HMVocaloid\\Speedy-Eggbert-2-Source-Code-Decomp\\def.h||{D0E1A5C6-B359-4E41-9B60-3365922C2A22}", + "RelativeMoniker": "D:0:0:{A2FE74E1-B743-11D0-AE1A-00A0C90FFFC3}|\u003CMiscFiles\u003E|solutionrelative:def.h||{D0E1A5C6-B359-4E41-9B60-3365922C2A22}" + } + ], + "DocumentGroupContainers": [ + { + "Orientation": 0, + "VerticalTabListWidth": 256, + "DocumentGroups": [ + { + "DockedWidth": 200, + "SelectedChildIndex": 6, + "Children": [ + { + "$type": "Document", + "DocumentIndex": 1, + "Title": "decblupi.cpp", + "DocumentMoniker": "C:\\Users\\JonAd\\source\\repos\\HMVocaloid\\Speedy-Eggbert-2-Source-Code-Decomp\\decblupi.cpp", + "RelativeDocumentMoniker": "decblupi.cpp", + "ToolTip": "C:\\Users\\JonAd\\source\\repos\\HMVocaloid\\Speedy-Eggbert-2-Source-Code-Decomp\\decblupi.cpp", + "RelativeToolTip": "decblupi.cpp", + "ViewState": "AQIAAAAAAAAAAAAAAAAAAAAAAAAAAAAA", + "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000677|", + "WhenOpened": "2024-06-03T15:31:53.081Z", + "EditorCaption": "" + }, + { + "$type": "Document", + "DocumentIndex": 2, + "Title": "ddutil.cpp", + "DocumentMoniker": "C:\\Users\\JonAd\\source\\repos\\HMVocaloid\\Speedy-Eggbert-2-Source-Code-Decomp\\ddutil.cpp", + "RelativeDocumentMoniker": "ddutil.cpp", + "ToolTip": "C:\\Users\\JonAd\\source\\repos\\HMVocaloid\\Speedy-Eggbert-2-Source-Code-Decomp\\ddutil.cpp", + "RelativeToolTip": "ddutil.cpp", + "ViewState": "AQIAAEUAAAAAAAAAAAAAAAAAAAAAAAAA", + "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000677|", + "WhenOpened": "2024-06-03T15:31:08.119Z", + "EditorCaption": "" + }, + { + "$type": "Document", + "DocumentIndex": 3, + "Title": "button.cpp", + "DocumentMoniker": "C:\\Users\\JonAd\\source\\repos\\HMVocaloid\\Speedy-Eggbert-2-Source-Code-Decomp\\button.cpp", + "RelativeDocumentMoniker": "button.cpp", + "ToolTip": "C:\\Users\\JonAd\\source\\repos\\HMVocaloid\\Speedy-Eggbert-2-Source-Code-Decomp\\button.cpp", + "RelativeToolTip": "button.cpp", + "ViewState": "AQIAAHIAAAAAAAAAAAAAAIEAAAAjAAAA", + "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000677|", + "WhenOpened": "2024-06-03T14:57:00.84Z", + "EditorCaption": "" + }, + { + "$type": "Document", + "DocumentIndex": 5, + "Title": "CppProperties.json", + "DocumentMoniker": "C:\\Users\\JonAd\\source\\repos\\HMVocaloid\\Speedy-Eggbert-2-Source-Code-Decomp\\CppProperties.json", + "RelativeDocumentMoniker": "CppProperties.json", + "ToolTip": "C:\\Users\\JonAd\\source\\repos\\HMVocaloid\\Speedy-Eggbert-2-Source-Code-Decomp\\CppProperties.json", + "RelativeToolTip": "CppProperties.json", + "ViewState": "AQIAAAAAAAAAAAAAAAAAAAAAAAAAAAAA", + "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.001642|", + "WhenOpened": "2024-06-03T14:55:43.15Z", + "EditorCaption": "" + }, + { + "$type": "Document", + "DocumentIndex": 6, + "Title": "def.h", + "DocumentMoniker": "C:\\Users\\JonAd\\source\\repos\\HMVocaloid\\Speedy-Eggbert-2-Source-Code-Decomp\\def.h", + "RelativeDocumentMoniker": "def.h", + "ToolTip": "C:\\Users\\JonAd\\source\\repos\\HMVocaloid\\Speedy-Eggbert-2-Source-Code-Decomp\\def.h", + "RelativeToolTip": "def.h", + "ViewState": "AQIAABwCAAAAAAAAAAAAAEsCAAAtAAAA", + "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000680|", + "WhenOpened": "2024-06-03T13:35:08.061Z", + "EditorCaption": "" + }, + { + "$type": "Document", + "DocumentIndex": 4, + "Title": "blupi.cpp", + "DocumentMoniker": "C:\\Users\\JonAd\\source\\repos\\HMVocaloid\\Speedy-Eggbert-2-Source-Code-Decomp\\blupi.cpp", + "RelativeDocumentMoniker": "blupi.cpp", + "ToolTip": "C:\\Users\\JonAd\\source\\repos\\HMVocaloid\\Speedy-Eggbert-2-Source-Code-Decomp\\blupi.cpp", + "RelativeToolTip": "blupi.cpp", + "ViewState": "AQIAAAAAAAAAAAAAAAAAADIBAAANAAAA", + "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000677|", + "WhenOpened": "2024-06-03T13:23:14.35Z", + "EditorCaption": "" + }, + { + "$type": "Document", + "DocumentIndex": 0, + "Title": "decor.cpp", + "DocumentMoniker": "C:\\Users\\JonAd\\source\\repos\\HMVocaloid\\Speedy-Eggbert-2-Source-Code-Decomp\\decor.cpp", + "RelativeDocumentMoniker": "decor.cpp", + "ToolTip": "C:\\Users\\JonAd\\source\\repos\\HMVocaloid\\Speedy-Eggbert-2-Source-Code-Decomp\\decor.cpp", + "RelativeToolTip": "decor.cpp", + "ViewState": "AQIAAH0AAAAAAAAAAAAAAAAAAAAAAAAA", + "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000677|", + "WhenOpened": "2024-06-03T13:22:46.652Z", + "EditorCaption": "" + }, + { + "$type": "Bookmark", + "Name": "ST:0:0:{1c4feeaa-4718-4aa9-859d-94ce25d182ba}" + } + ] + } + ] + } + ] +} \ No newline at end of file diff --git a/.vs/Speedy-Eggbert-2-Source-Code-Decomp/v17/ipch/AutoPCH/41dcb6303a3f4b5b/DECOR.ipch b/.vs/Speedy-Eggbert-2-Source-Code-Decomp/v17/ipch/AutoPCH/41dcb6303a3f4b5b/DECOR.ipch new file mode 100644 index 0000000..b15ebb6 Binary files /dev/null and b/.vs/Speedy-Eggbert-2-Source-Code-Decomp/v17/ipch/AutoPCH/41dcb6303a3f4b5b/DECOR.ipch differ diff --git a/.vs/Speedy-Eggbert-2-Source-Code-Decomp/v17/ipch/AutoPCH/ae8e51e2112eafb0/BUTTON.ipch b/.vs/Speedy-Eggbert-2-Source-Code-Decomp/v17/ipch/AutoPCH/ae8e51e2112eafb0/BUTTON.ipch new file mode 100644 index 0000000..58f89f7 Binary files /dev/null and b/.vs/Speedy-Eggbert-2-Source-Code-Decomp/v17/ipch/AutoPCH/ae8e51e2112eafb0/BUTTON.ipch differ diff --git a/.vs/Speedy-Eggbert-2-Source-Code-Decomp/v17/ipch/AutoPCH/c13af9782a724004/BLUPI.ipch b/.vs/Speedy-Eggbert-2-Source-Code-Decomp/v17/ipch/AutoPCH/c13af9782a724004/BLUPI.ipch new file mode 100644 index 0000000..456efe1 Binary files /dev/null and b/.vs/Speedy-Eggbert-2-Source-Code-Decomp/v17/ipch/AutoPCH/c13af9782a724004/BLUPI.ipch differ diff --git a/.vs/Speedy-Eggbert-2-Source-Code-Decomp/v17/ipch/AutoPCH/e1934a247fe55c18/BLUPI.ipch b/.vs/Speedy-Eggbert-2-Source-Code-Decomp/v17/ipch/AutoPCH/e1934a247fe55c18/BLUPI.ipch new file mode 100644 index 0000000..cd9ee50 Binary files /dev/null and b/.vs/Speedy-Eggbert-2-Source-Code-Decomp/v17/ipch/AutoPCH/e1934a247fe55c18/BLUPI.ipch differ diff --git a/.vs/VSWorkspaceState.json b/.vs/VSWorkspaceState.json new file mode 100644 index 0000000..002918b --- /dev/null +++ b/.vs/VSWorkspaceState.json @@ -0,0 +1,7 @@ +{ + "ExpandedNodes": [ + "" + ], + "SelectedNode": "\\jauge.cpp", + "PreviewInSolutionExplorer": false +} \ No newline at end of file diff --git a/.vs/slnx.sqlite b/.vs/slnx.sqlite new file mode 100644 index 0000000..bdb618f Binary files /dev/null and b/.vs/slnx.sqlite differ diff --git a/CppProperties.json b/CppProperties.json new file mode 100644 index 0000000..659bf4e --- /dev/null +++ b/CppProperties.json @@ -0,0 +1,21 @@ +{ + "configurations": [ + { + "inheritEnvironments": [ + "msvc_x86" + ], + "name": "x86-Debug", + "includePath": [ + "${env.INCLUDE}", + "${workspaceRoot}\\**" + ], + "defines": [ + "WIN32", + "_DEBUG", + "UNICODE", + "_UNICODE" + ], + "intelliSenseMode": "windows-msvc-x86" + } + ] +} \ No newline at end of file diff --git a/blupi.cpp b/blupi.cpp index a55acef..fc18c61 100644 --- a/blupi.cpp +++ b/blupi.cpp @@ -230,10 +230,19 @@ void UpdateFrame(void) g_pPixmap->DrawImage(-1, CHBACK, rcRect, 1); // dessine le fond } - if ( phase == WM_PHASE_INTRO1 || - phase == WM_PHASE_INTRO2 ) + if (phase == WM_PHASE_INIT) { - g_pEvent->IntroStep(); + g_pEvent->DemoStep(); // d�marre �v. d�mo automatique + } + + if (phase == WM_PHASE_PLAYMOVIE || phase == WM_PHASE_WINMOVIE || WM_PHASE_WINMOVIEDESIGN || WM_PHASE_WINMOVIEMULTI) + { + g_pEvent->MovieToStart; + } + + if (phase == WM_PHASE_INSERT) + { + g_pEvent->TryInsert(); } if ( phase == WM_PHASE_PLAY ) @@ -267,40 +276,6 @@ void UpdateFrame(void) } } - if ( phase == WM_PHASE_BUILD ) - { - clip.left = POSDRAWX; - clip.top = POSDRAWY; - clip.right = POSDRAWX+DIMDRAWX; - clip.bottom = POSDRAWY+DIMDRAWY; - g_pEvent->DecorAutoShift(posMouse); - g_pDecor->Build(clip, posMouse); // construit le d�cor - g_pDecor->NextPhase(-1); // refait la carte chaque fois - } - - if ( phase == WM_PHASE_INIT ) - { - g_pEvent->DemoStep(); // d�marre �v. d�mo automatique - } - - g_pEvent->DrawButtons(); - - g_lastPhase = phase; - - if ( phase == WM_PHASE_H0MOVIE || - phase == WM_PHASE_H1MOVIE || - phase == WM_PHASE_H2MOVIE || - phase == WM_PHASE_PLAYMOVIE || - phase == WM_PHASE_WINMOVIE ) - { - g_pEvent->MovieToStart(); // fait d�marrer un film si n�cessaire - } - - if ( phase == WM_PHASE_INSERT ) - { - g_pEvent->TryInsert(); - } - if ( phase == WM_PHASE_PLAY ) { term = g_pDecor->IsTerminated(); @@ -311,6 +286,41 @@ void UpdateFrame(void) g_pPixmap->MouseBackDraw(); // remet la souris dans "back" } +void Benchmark() +{ + int i; + POINT pos = { 0, 0 }; + + g_pPixmap->DrawIcon(-1, 2, 10, pos, 0); + + pos.x = 300; + pos.y = 350; + for (i = 0; i < 10000; i++) + { + g_pPixmap->DrawIcon(-1, 2, i % 4, pos, 0); + } + + g_pPixmap->DrawIcon(-1, 2, 10, pos, 0); + g_pSound->Play(0); +} + +// Incomplete + +void SetDecor() +{ + RECT rect; + UINT phase; + POINT posMouse; + + g_pPixmap->MouseBackClear(); + g_pEvent->GetLastMousePos(&posMouse); + phase = g_pEvent->GetPhase; + + if (phase == WM_PHASE_PLAY || phase == WM_PHASE_PLAYTEST || phase == WM_PHASE_BUILD) + { + + } +} BOOL RestoreGame() { if ( g_pPixmap == NULL ) return FALSE; @@ -408,6 +418,10 @@ LRESULT CALLBACK WindowProc (HWND hWnd, UINT message, case WM_ACTIVATEAPP: g_bActive = (wParam != 0); + if (g_pEvent != NULL) + { + g_pEvent->SomethingDecor; + } if ( g_bActive ) { if ( g_bFullScreen ) @@ -539,6 +553,9 @@ BOOL InitFail(char *msg, BOOL bDirectX) return FALSE; } +//Space for SetTimer + + static BOOL DoInit(HINSTANCE hInstance, LPSTR lpCmdLine, int nCmdShow) { WNDCLASS wc; @@ -550,34 +567,34 @@ static BOOL DoInit(HINSTANCE hInstance, LPSTR lpCmdLine, int nCmdShow) InitHInstance(hInstance); - wc.style = CS_HREDRAW|CS_VREDRAW; - wc.lpfnWndProc = WindowProc; - wc.cbClsExtra = 0; - wc.cbWndExtra = 0; - wc.hInstance = hInstance; - wc.hIcon = LoadIcon(hInstance, "IDR_MAINFRAME"); - wc.hCursor = LoadCursor(hInstance, "IDC_POINTER"); + wc.style = CS_HREDRAW | CS_VREDRAW; + wc.lpfnWndProc = WindowProc; + wc.cbClsExtra = 0; + wc.cbWndExtra = 0; + wc.hInstance = hInstance; + wc.hIcon = LoadIcon(hInstance, "IDR_MAINFRAME"); + wc.hCursor = LoadCursor(hInstance, "IDC_POINTER"); wc.hbrBackground = GetStockBrush(BLACK_BRUSH); - wc.lpszMenuMane = NAME; + wc.lpszMenuMane = NAME; wc.lpszClassName = NAME; RegisterClass(&wc); - if ( g_bFullScreen ) + if (g_bFullScreen) { g_hWnd = CreateWindowEx - ( - WS_EX_TOPMOST, - NAME, - TITLE, - WS_POPUP, - 0, 0, - GetSystemMetrics(SM_CXSCREEN), - GetSystemMetrics(SM_CYSCREEN), - NULL, - NULL, - hInstance, - NULL - ); + ( + WS_EX_TOPMOST, + NAME, + TITLE, + WS_POPUP, + 0, 0, + GetSystemMetrics(SM_CXSCREEN), + GetSystemMetrics(SM_CYSCREEN), + NULL, + NULL, + hInstance, + NULL + ); } else { @@ -587,26 +604,26 @@ static BOOL DoInit(HINSTANCE hInstance, LPSTR lpCmdLine, int nCmdShow) sx = GetSystemMetrics(SM_CXSCREEN); sy = GetSystemMetrics(SM_CYSCREEN); - SetRect(&WindowRect, (sx-LXIMAGE)/2, (sy-LYIMAGE)/2, - (sx+LXIMAGE)/2, (sy+LYIMAGE)/2); - AdjustWindowRect(&WindowRect, WS_POPUPWINDOW|WS_CAPTION, TRUE); + SetRect(&WindowRect, (sx - LXIMAGE) / 2, (sy - LYIMAGE) / 2, + (sx + LXIMAGE) / 2, (sy + LYIMAGE) / 2); + AdjustWindowRect(&WindowRect, WS_POPUPWINDOW | WS_CAPTION, TRUE); WindowRect.top += GetSystemMetrics(SM_CYCAPTION); g_hWnd = CreateWindow - ( - NAME, - TITLE, - WS_POPUPWINDOW|WS_CAPTION|WS_VISIBLE, - (sx-LXIMAGE)/2, (sy-LYIMAGE)/2, - WindowRect.right - WindowRect.left, - WindowRect.bottom - WindowRect.top, - HWND_DESKTOP, - NULL, - hInstance, - NULL - ); + ( + NAME, + TITLE, + WS_POPUPWINDOW | WS_CAPTION | WS_VISIBLE, + (sx - LXIMAGE) / 2, (sy - LYIMAGE) / 2, + WindowRect.right - WindowRect.left, + WindowRect.bottom - WindowRect.top, + HWND_DESKTOP, + NULL, + hInstance, + NULL + ); } - if ( !g_hWnd ) return FALSE; + if (!g_hWnd) return FALSE; ShowWindow(g_hWnd, nCmdShow); UpdateWindow(g_hWnd); @@ -614,37 +631,72 @@ static BOOL DoInit(HINSTANCE hInstance, LPSTR lpCmdLine, int nCmdShow) ChangeSprite(SPRITE_WAIT); - if ( !bOk ) + if (!bOk) { return InitFail("Game not correctly installed", FALSE); } g_pPixmap = new CPixmap; - if ( g_pPixmap == NULL ) return InitFail("New pixmap", TRUE); + if (g_pPixmap == NULL) return InitFail("New pixmap", TRUE); totalDim.x = LXIMAGE; totalDim.y = LYIMAGE; - if ( !g_pPixmap->Create(g_hWnd, totalDim, g_bFullScreen, g_mouseType) ) + if (!g_pPixmap->Create(g_hWnd, totalDim, g_bFullScreen, g_mouseType)) return InitFail("Create pixmap", TRUE); OutputDebug("Image: init\n"); totalDim.x = LXIMAGE; totalDim.y = LYIMAGE; - iconDim.x = 0; - iconDim.y = 0; + iconDim.x = 0; + iconDim.y = 0; + + if (!g_pPixmap->CacheAll(g_hWnd, g_bFullScreen, g_bTrueColor, g_bTrueColorDecor, g_mouseType, "image16\\init.blp", FALSE)) + return InitFail("CacheAll", TRUE) + #if _INTRO - if ( !g_pPixmap->Cache(CHBACK, "image16\\init.blp", totalDim, iconDim, TRUE) ) + if (!g_pPixmap->Cache(CHBACK, "image16\\init.blp", totalDim, iconDim, TRUE)) #else - if ( !g_pPixmap->Cache(CHBACK, "image16\\init.blp", totalDim, iconDim, TRUE) ) + if (!g_pPixmap->Cache(CHBACK, "image16\\init.blp", totalDim, iconDim, TRUE)) #endif - return FALSE; - + return FALSE; + OutputDebug("SavePalette\n"); g_pPixmap->SavePalette(); OutputDebug("InitSysPalette\n"); g_pPixmap->InitSysPalette(); - + g_pSound = new CSound; + if (g_pSound == NULL) return InitFail("New sound", TRUE); + + g_pSound->Create(g_hWnd); + g_pSound->CacheAll(); + g_pSoundSetState(TRUE); + + g_pMovie = new CMovie; + if (g_pMovie == NULL) return InitFail("New movie", FALSE); + + g_pMovie->Create(); + + g_pDecor = new CDecor; + if (g_pDecor == NULL) return InitFail("New decor", FALSE); + + g_pDecor->Create(g_hWnd, g_pSound, g_pPixmap); + g_pDecor->MapInitColors(); + + g_pEvent = new CEvent; + if (g_pEvent == NULL) return InitFail("New event", FALSE); + + g_pEvent->Create(g_hWnd, g_pPixmap, g_pDecor, g_pSound, g_pMovie); + g_pEvent->SetFullScreen(g_bFullScreen); + g_pEvent->SetMouseType(g_mouseType); +#if _INTRO + g_pEvent->ChangePhase(WM_PHASE_INTRO1); +#else + g_pEvent->ChangePhase(WM_PHASE_TESTCD); +#endif + + g_bTermInit = TRUE; + return TRUE; } int WINAPI WinMain (HINSTANCE hInstance, HINSTANCE hPrevInstance, diff --git a/button.cpp b/button.cpp index e8b5e90..7240216 100644 --- a/button.cpp +++ b/button.cpp @@ -127,6 +127,8 @@ BOOL CButton::Create(HWND hWnd, CPixmap *pPixmap, CSound *pSound, */ } +// Space for unknown menu function. + // Draw a button in its state void CButton::Draw() diff --git a/def.h b/def.h index 074728e..34567d6 100644 --- a/def.h +++ b/def.h @@ -584,6 +584,8 @@ #define WM_PHASE_INTRO1 (WM_USER+536) #define WM_PHASE_INTRO2 (WM_USER+537) #define WM_PHASE_PLAYTEST (WM_USER+538) +#define WM_PHASE_WINMOVIEDESIGN (WM_USER+539) +#define WM_PHASE_WINMOVIEMULTI (WM_USER+540) #define WM_PREV (WM_USER+600) #define WM_NEXT (WM_USER+601)