diff --git a/.vs/Speedy-Eggbert-2-Source-Code-Decomp/v17/.wsuo b/.vs/Speedy-Eggbert-2-Source-Code-Decomp/v17/.wsuo index 4f94bf5..cf831e4 100644 Binary files a/.vs/Speedy-Eggbert-2-Source-Code-Decomp/v17/.wsuo and b/.vs/Speedy-Eggbert-2-Source-Code-Decomp/v17/.wsuo 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 index 21d21a6..0af80e6 100644 Binary files a/.vs/Speedy-Eggbert-2-Source-Code-Decomp/v17/Browse.VC.db 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 index 57286fe..9a45bd5 100644 --- a/.vs/Speedy-Eggbert-2-Source-Code-Decomp/v17/DocumentLayout.json +++ b/.vs/Speedy-Eggbert-2-Source-Code-Decomp/v17/DocumentLayout.json @@ -2,6 +2,18 @@ "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\\event.cpp||{D0E1A5C6-B359-4E41-9B60-3365922C2A22}", + "RelativeMoniker": "D:0:0:{A2FE74E1-B743-11D0-AE1A-00A0C90FFFC3}|\u003CMiscFiles\u003E|solutionrelative:event.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\\event.h||{D0E1A5C6-B359-4E41-9B60-3365922C2A22}", + "RelativeMoniker": "D:0:0:{A2FE74E1-B743-11D0-AE1A-00A0C90FFFC3}|\u003CMiscFiles\u003E|solutionrelative:event.h||{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\\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}" + }, { "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}" @@ -25,10 +37,6 @@ { "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": [ @@ -38,89 +46,50 @@ "DocumentGroups": [ { "DockedWidth": 200, - "SelectedChildIndex": 6, + "SelectedChildIndex": 1, "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", + "ViewState": "AQIAAFICAAAAAAAAAAAAAFwCAAAWAAAA", "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": "" + "IsPinned": true }, { "$type": "Document", "DocumentIndex": 0, + "Title": "event.cpp", + "DocumentMoniker": "C:\\Users\\JonAd\\source\\repos\\HMVocaloid\\Speedy-Eggbert-2-Source-Code-Decomp\\event.cpp", + "RelativeDocumentMoniker": "event.cpp", + "ToolTip": "C:\\Users\\JonAd\\source\\repos\\HMVocaloid\\Speedy-Eggbert-2-Source-Code-Decomp\\event.cpp", + "RelativeToolTip": "event.cpp", + "ViewState": "AQIAAKYIAAAAAAAAAAAYwMEIAAAAAAAA", + "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000677|", + "WhenOpened": "2024-06-05T15:46:32.188Z", + "IsPinned": true, + "EditorCaption": "" + }, + { + "$type": "Document", + "DocumentIndex": 1, + "Title": "event.h", + "DocumentMoniker": "C:\\Users\\JonAd\\source\\repos\\HMVocaloid\\Speedy-Eggbert-2-Source-Code-Decomp\\event.h", + "RelativeDocumentMoniker": "event.h", + "ToolTip": "C:\\Users\\JonAd\\source\\repos\\HMVocaloid\\Speedy-Eggbert-2-Source-Code-Decomp\\event.h", + "RelativeToolTip": "event.h", + "ViewState": "AQIAAA4AAAAAAAAAAAAAAEcAAAAXAAAA", + "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000680|", + "WhenOpened": "2024-06-05T16:14:42.084Z" + }, + { + "$type": "Document", + "DocumentIndex": 3, "Title": "decor.cpp", "DocumentMoniker": "C:\\Users\\JonAd\\source\\repos\\HMVocaloid\\Speedy-Eggbert-2-Source-Code-Decomp\\decor.cpp", "RelativeDocumentMoniker": "decor.cpp", @@ -128,12 +97,67 @@ "RelativeToolTip": "decor.cpp", "ViewState": "AQIAAH0AAAAAAAAAAAAAAAAAAAAAAAAA", "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000677|", - "WhenOpened": "2024-06-03T13:22:46.652Z", - "EditorCaption": "" + "WhenOpened": "2024-06-03T13:22:46.652Z" }, { - "$type": "Bookmark", - "Name": "ST:0:0:{1c4feeaa-4718-4aa9-859d-94ce25d182ba}" + "$type": "Document", + "DocumentIndex": 6, + "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" + }, + { + "$type": "Document", + "DocumentIndex": 8, + "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" + }, + { + "$type": "Document", + "DocumentIndex": 7, + "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" + }, + { + "$type": "Document", + "DocumentIndex": 5, + "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" + }, + { + "$type": "Document", + "DocumentIndex": 4, + "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" } ] } diff --git a/.vs/slnx.sqlite b/.vs/slnx.sqlite index e5753bc..ce11af0 100644 Binary files a/.vs/slnx.sqlite and b/.vs/slnx.sqlite differ diff --git a/def.h b/def.h index 44060f6..cc6bdd6 100644 --- a/def.h +++ b/def.h @@ -601,7 +601,8 @@ #define WM_PHASE_GREAD #define WM_PHASE_GREADp #define WM_PHASE_GWRITE - +#define WM_PHASE_DOQUIT +#define WM_PHASE_GAMER diff --git a/event.cpp b/event.cpp index 6c2cacb..e0fcb74 100644 --- a/event.cpp +++ b/event.cpp @@ -2070,9 +2070,11 @@ void CEvent::TryInsert() // Add SomethingHubWorld once figured out. +// Very rough code, needs improvement + BOOL CEvent::ChangePhase(UINT phase) { - int index, world, time, total, music, i, max; + int index, world, time, total, music, i, max, mission; POINT totalDim, iconDim; char filename[MAX_PATH]; char* pButtonExist; @@ -2134,8 +2136,54 @@ BOOL CEvent::ChangePhase(UINT phase) { DemoRecStop(); } + + m_mission = mission; + + if (phase == WM_PHASE_DOQUIT) + { + if (m_bPrivate == 0) + { + if (mission != 1) + { + if (mission == 99 || mission % 10 == 0) + { + mission = 1; + } + else + { + mission = (mission / 10) * 10; + } + m_mission->GetWorld(); + m_phase = WM_PHASE_PLAY; + + return ChangePhase(WM_PHASE_PLAY); + } + return ChangePhase(WM_PHASE_GAMER); + } + } + else if (m_bMulti == 0) + { + return ChangePhase(WM_PHASE_INFO); + } + + if (SearchPhase(phase) < 0) + { + return 0; + } + m_pPixmap->MouseInvalidate(); + HideMouse(FALSE); + WaitMouse(TRUE); + + if (phase == WM_PHASE_GAMER || phase == WM_PHASE_PLAY) + { + OutputNetDebug(); + m_gamer->WriteInfo(); + } + } +// Implement LoadLevel + void CEvent::MovieToStart() { if (m_movieToStart[0] != 0) @@ -2172,6 +2220,27 @@ int CEvent::GetTryPhase() return m_tryPhase; } +void CEvent::SomethingUserMissions(LPCSTR lpFileName, LPCSTR thing) +{ + +} + +void CEvent::TableSomething() +{ + char filename[MAX_PATH]; + + if (strstr(filename, table[m_index].backName)) + { + AddCDPath(filename); + } + if (!m_pPixmap->CacheAll(CHBACK, filename, totalDim, iconDim, FALSE, GetRegion())) + { + return; + } +} + + + BOOL CEvent::StartMovie(char* pFilename) { RECT rect; diff --git a/event.h b/event.h index e263b56..6f51697 100644 --- a/event.h +++ b/event.h @@ -66,8 +66,10 @@ public: void MovieToStart(); UINT GetPhase(); void TryInsert(); + void SomethingUserMissions(LPCSTR lpFileName, LPCSTR thing); void RestoreGame(); int SomethingMissions(); + void TableSomething(); int GetButtonIndex(int button); int GetState(int button);