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 703e55f..fee5507 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 9a45bd5..d6b6ad7 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,14 @@ "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\\decor.h||{D0E1A5C6-B359-4E41-9B60-3365922C2A22}", + "RelativeMoniker": "D:0:0:{A2FE74E1-B743-11D0-AE1A-00A0C90FFFC3}|\u003CMiscFiles\u003E|solutionrelative:decor.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\\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}" @@ -11,25 +19,53 @@ "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\\text.cpp||{D0E1A5C6-B359-4E41-9B60-3365922C2A22}", + "RelativeMoniker": "D:0:0:{A2FE74E1-B743-11D0-AE1A-00A0C90FFFC3}|\u003CMiscFiles\u003E|solutionrelative:text.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\\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\\sound.cpp||{D0E1A5C6-B359-4E41-9B60-3365922C2A22}", + "RelativeMoniker": "D:0:0:{A2FE74E1-B743-11D0-AE1A-00A0C90FFFC3}|\u003CMiscFiles\u003E|solutionrelative:sound.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\\pixmap.cpp||{D0E1A5C6-B359-4E41-9B60-3365922C2A22}", + "RelativeMoniker": "D:0:0:{A2FE74E1-B743-11D0-AE1A-00A0C90FFFC3}|\u003CMiscFiles\u003E|solutionrelative:pixmap.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\\jauge.cpp||{D0E1A5C6-B359-4E41-9B60-3365922C2A22}", + "RelativeMoniker": "D:0:0:{A2FE74E1-B743-11D0-AE1A-00A0C90FFFC3}|\u003CMiscFiles\u003E|solutionrelative:jauge.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\\action.h||{D0E1A5C6-B359-4E41-9B60-3365922C2A22}", + "RelativeMoniker": "D:0:0:{A2FE74E1-B743-11D0-AE1A-00A0C90FFFC3}|\u003CMiscFiles\u003E|solutionrelative:action.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\\README.md||{EFC0BB08-EA7D-40C6-A696-C870411A895B}", + "RelativeMoniker": "D:0:0:{A2FE74E1-B743-11D0-AE1A-00A0C90FFFC3}|\u003CMiscFiles\u003E|solutionrelative:README.md||{EFC0BB08-EA7D-40C6-A696-C870411A895B}" + }, + { + "AbsoluteMoniker": "D:0:0:{A2FE74E1-B743-11D0-AE1A-00A0C90FFFC3}|\u003CMiscFiles\u003E|C:\\Users\\JonAd\\source\\repos\\HMVocaloid\\Speedy-Eggbert-2-Source-Code-Decomp\\actions.h||{D0E1A5C6-B359-4E41-9B60-3365922C2A22}", + "RelativeMoniker": "D:0:0:{A2FE74E1-B743-11D0-AE1A-00A0C90FFFC3}|\u003CMiscFiles\u003E|solutionrelative:actions.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\\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\\button.h||{D0E1A5C6-B359-4E41-9B60-3365922C2A22}", + "RelativeMoniker": "D:0:0:{A2FE74E1-B743-11D0-AE1A-00A0C90FFFC3}|\u003CMiscFiles\u003E|solutionrelative:button.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\\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\\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}" @@ -46,11 +82,11 @@ "DocumentGroups": [ { "DockedWidth": 200, - "SelectedChildIndex": 1, + "SelectedChildIndex": 8, "Children": [ { "$type": "Document", - "DocumentIndex": 2, + "DocumentIndex": 14, "Title": "def.h", "DocumentMoniker": "C:\\Users\\JonAd\\source\\repos\\HMVocaloid\\Speedy-Eggbert-2-Source-Code-Decomp\\def.h", "RelativeDocumentMoniker": "def.h", @@ -63,13 +99,13 @@ }, { "$type": "Document", - "DocumentIndex": 0, + "DocumentIndex": 2, "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", + "ViewState": "AQIAALQGAAAAAAAAAAAAAGcIAAAIAAAA", "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000677|", "WhenOpened": "2024-06-05T15:46:32.188Z", "IsPinned": true, @@ -77,31 +113,153 @@ }, { "$type": "Document", - "DocumentIndex": 1, + "DocumentIndex": 4, + "Title": "text.cpp", + "DocumentMoniker": "C:\\Users\\JonAd\\source\\repos\\HMVocaloid\\Speedy-Eggbert-2-Source-Code-Decomp\\text.cpp", + "RelativeDocumentMoniker": "text.cpp", + "ToolTip": "C:\\Users\\JonAd\\source\\repos\\HMVocaloid\\Speedy-Eggbert-2-Source-Code-Decomp\\text.cpp", + "RelativeToolTip": "text.cpp", + "ViewState": "AQIAAFABAAAAAAAAAAAAAAAAAAAAAAAA", + "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000677|", + "WhenOpened": "2024-06-06T17:06:57.032Z", + "EditorCaption": "" + }, + { + "$type": "Document", + "DocumentIndex": 5, + "Title": "sound.cpp", + "DocumentMoniker": "C:\\Users\\JonAd\\source\\repos\\HMVocaloid\\Speedy-Eggbert-2-Source-Code-Decomp\\sound.cpp", + "RelativeDocumentMoniker": "sound.cpp", + "ToolTip": "C:\\Users\\JonAd\\source\\repos\\HMVocaloid\\Speedy-Eggbert-2-Source-Code-Decomp\\sound.cpp", + "RelativeToolTip": "sound.cpp", + "ViewState": "AQIAAH8CAAAAAAAAAAAAAIUCAAACAAAA", + "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000677|", + "WhenOpened": "2024-06-06T17:04:46.211Z", + "EditorCaption": "" + }, + { + "$type": "Document", + "DocumentIndex": 6, + "Title": "pixmap.cpp", + "DocumentMoniker": "C:\\Users\\JonAd\\source\\repos\\HMVocaloid\\Speedy-Eggbert-2-Source-Code-Decomp\\pixmap.cpp", + "RelativeDocumentMoniker": "pixmap.cpp", + "ToolTip": "C:\\Users\\JonAd\\source\\repos\\HMVocaloid\\Speedy-Eggbert-2-Source-Code-Decomp\\pixmap.cpp", + "RelativeToolTip": "pixmap.cpp", + "ViewState": "AQIAAGcCAAAAAAAAAAAAAAAAAAAAAAAA", + "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000677|", + "WhenOpened": "2024-06-06T17:02:47.412Z", + "EditorCaption": "" + }, + { + "$type": "Document", + "DocumentIndex": 7, + "Title": "jauge.cpp", + "DocumentMoniker": "C:\\Users\\JonAd\\source\\repos\\HMVocaloid\\Speedy-Eggbert-2-Source-Code-Decomp\\jauge.cpp", + "RelativeDocumentMoniker": "jauge.cpp", + "ToolTip": "C:\\Users\\JonAd\\source\\repos\\HMVocaloid\\Speedy-Eggbert-2-Source-Code-Decomp\\jauge.cpp", + "RelativeToolTip": "jauge.cpp", + "ViewState": "AQIAAEIAAAAAAAAAAAAAAEMAAAAOAAAA", + "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000677|", + "WhenOpened": "2024-06-06T16:54:12.351Z", + "EditorCaption": "" + }, + { + "$type": "Document", + "DocumentIndex": 8, + "Title": "action.h", + "DocumentMoniker": "C:\\Users\\JonAd\\source\\repos\\HMVocaloid\\Speedy-Eggbert-2-Source-Code-Decomp\\action.h", + "RelativeDocumentMoniker": "action.h", + "ToolTip": "C:\\Users\\JonAd\\source\\repos\\HMVocaloid\\Speedy-Eggbert-2-Source-Code-Decomp\\action.h", + "RelativeToolTip": "action.h", + "ViewState": "AQIAAAAAAAAAAAAAAAAAAAAAAAAAAAAA", + "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000680|", + "WhenOpened": "2024-06-06T14:48:26.328Z", + "EditorCaption": "" + }, + { + "$type": "Document", + "DocumentIndex": 3, "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", + "ViewState": "AQIAAEIAAAAAAAAAAAAAAEYAAAARAAAA", "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000680|", - "WhenOpened": "2024-06-05T16:14:42.084Z" + "WhenOpened": "2024-06-05T16:14:42.084Z", + "EditorCaption": "" }, { "$type": "Document", - "DocumentIndex": 3, + "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", + "ViewState": "AQIAAIYAAAAAAAAAAAAcwJIAAAAYAAAA", "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000677|", - "WhenOpened": "2024-06-03T13:22:46.652Z" + "WhenOpened": "2024-06-03T13:22:46.652Z", + "EditorCaption": "" }, { "$type": "Document", - "DocumentIndex": 6, + "DocumentIndex": 1, + "Title": "decor.h", + "DocumentMoniker": "C:\\Users\\JonAd\\source\\repos\\HMVocaloid\\Speedy-Eggbert-2-Source-Code-Decomp\\decor.h", + "RelativeDocumentMoniker": "decor.h", + "ToolTip": "C:\\Users\\JonAd\\source\\repos\\HMVocaloid\\Speedy-Eggbert-2-Source-Code-Decomp\\decor.h", + "RelativeToolTip": "decor.h", + "ViewState": "AQIAACwCAAAAAAAAAAAAADcCAAAYAAAA", + "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000680|", + "WhenOpened": "2024-06-06T13:28:47.781Z", + "EditorCaption": "" + }, + { + "$type": "Document", + "DocumentIndex": 9, + "Title": "README.md", + "DocumentMoniker": "C:\\Users\\JonAd\\source\\repos\\HMVocaloid\\Speedy-Eggbert-2-Source-Code-Decomp\\README.md", + "RelativeDocumentMoniker": "README.md", + "ToolTip": "C:\\Users\\JonAd\\source\\repos\\HMVocaloid\\Speedy-Eggbert-2-Source-Code-Decomp\\README.md", + "RelativeToolTip": "README.md", + "ViewState": "AQIAAAAAAAAAAAAAAAAAABUAAABhAAAA", + "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.001818|", + "WhenOpened": "2024-06-06T16:12:51.994Z", + "EditorCaption": "" + }, + { + "$type": "Document", + "DocumentIndex": 10, + "Title": "actions.h", + "DocumentMoniker": "C:\\Users\\JonAd\\source\\repos\\HMVocaloid\\Speedy-Eggbert-2-Source-Code-Decomp\\actions.h", + "RelativeDocumentMoniker": "actions.h", + "ToolTip": "C:\\Users\\JonAd\\source\\repos\\HMVocaloid\\Speedy-Eggbert-2-Source-Code-Decomp\\actions.h", + "RelativeToolTip": "actions.h", + "ViewState": "AQIAAAAAAAAAAAAAAAAAAAAAAAAAAAAA", + "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000680|", + "WhenOpened": "2024-06-06T14:52:07.261Z", + "EditorCaption": "" + }, + { + "$type": "Document", + "DocumentIndex": 11, + "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" + }, + { + "$type": "Bookmark", + "Name": "ST:0:0:{1c4feeaa-4718-4aa9-859d-94ce25d182ba}" + }, + { + "$type": "Document", + "DocumentIndex": 12, "Title": "button.cpp", "DocumentMoniker": "C:\\Users\\JonAd\\source\\repos\\HMVocaloid\\Speedy-Eggbert-2-Source-Code-Decomp\\button.cpp", "RelativeDocumentMoniker": "button.cpp", @@ -113,7 +271,19 @@ }, { "$type": "Document", - "DocumentIndex": 8, + "DocumentIndex": 13, + "Title": "button.h", + "DocumentMoniker": "C:\\Users\\JonAd\\source\\repos\\HMVocaloid\\Speedy-Eggbert-2-Source-Code-Decomp\\button.h", + "RelativeDocumentMoniker": "button.h", + "ToolTip": "C:\\Users\\JonAd\\source\\repos\\HMVocaloid\\Speedy-Eggbert-2-Source-Code-Decomp\\button.h", + "RelativeToolTip": "button.h", + "ViewState": "AQIAAAMAAAAAAAAAAAAAAA0AAAAqAAAA", + "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000680|", + "WhenOpened": "2024-06-06T13:15:55.289Z" + }, + { + "$type": "Document", + "DocumentIndex": 17, "Title": "CppProperties.json", "DocumentMoniker": "C:\\Users\\JonAd\\source\\repos\\HMVocaloid\\Speedy-Eggbert-2-Source-Code-Decomp\\CppProperties.json", "RelativeDocumentMoniker": "CppProperties.json", @@ -125,7 +295,7 @@ }, { "$type": "Document", - "DocumentIndex": 7, + "DocumentIndex": 16, "Title": "blupi.cpp", "DocumentMoniker": "C:\\Users\\JonAd\\source\\repos\\HMVocaloid\\Speedy-Eggbert-2-Source-Code-Decomp\\blupi.cpp", "RelativeDocumentMoniker": "blupi.cpp", @@ -137,7 +307,7 @@ }, { "$type": "Document", - "DocumentIndex": 5, + "DocumentIndex": 15, "Title": "ddutil.cpp", "DocumentMoniker": "C:\\Users\\JonAd\\source\\repos\\HMVocaloid\\Speedy-Eggbert-2-Source-Code-Decomp\\ddutil.cpp", "RelativeDocumentMoniker": "ddutil.cpp", @@ -146,18 +316,6 @@ "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/VSWorkspaceState.json b/.vs/VSWorkspaceState.json index 2c4bc34..d78d347 100644 --- a/.vs/VSWorkspaceState.json +++ b/.vs/VSWorkspaceState.json @@ -2,6 +2,6 @@ "ExpandedNodes": [ "" ], - "SelectedNode": "\\event.cpp", + "SelectedNode": "\\decor.cpp", "PreviewInSolutionExplorer": false } \ No newline at end of file diff --git a/.vs/slnx.sqlite b/.vs/slnx.sqlite index 00f27be..9062559 100644 Binary files a/.vs/slnx.sqlite and b/.vs/slnx.sqlite differ diff --git a/README.md b/README.md index 34ee281..d4a3b91 100644 --- a/README.md +++ b/README.md @@ -19,4 +19,4 @@ | text.cpp | 85% complete | - + Credit to jummy over at the Blupi Games Fan Server for doing the decompilation work on the game. diff --git a/decor.cpp b/decor.cpp index 087fd00..ea5b9f8 100644 --- a/decor.cpp +++ b/decor.cpp @@ -29,10 +29,16 @@ CDecor::CDecor() { + int i; + m_hWnd = NULL; m_pSound = NULL; m_pPixmap = NULL; + for (i = 0; i < 200; i++) + { + m_lastDecorIcon[i] = 0; + } m_time = 0; m_bAllMissions = FALSE; m_bInvincible = FALSE; @@ -75,6 +81,8 @@ void CDecor::Create(HWND hWnd, CSound* pSound, CPixmap* pPixmap, CNetwork* pNetw void CDecor::Init(int channel, int icon) { + int i; + m_cameraPos.x = 0; m_cameraPos.y = 0; m_worldDims.x = 100; @@ -82,7 +90,62 @@ void CDecor::Init(int channel, int icon) m_music = 1; m_region = 2; m_missionTitle[0] = '\0'; - m_bScreenShake = 0; + for (int i = 0; i < 100; i++) + { + for (int j = 0; j < 100; j++) + { + m_decor[i, j]->icon = -1; + m_bigDecor[i, j]->icon = 1; + } + } + m_decor[3, 4]->icon = 40; + m_decor[4, 4]->icon = 38; + m_decor[5, 4]->icon = 39; + for (int k = 0; k < Decor.MAXMOVEOBJECT; k++) + { + m_moveObject[k]->type = 0; + } + m_moveObject[0]->type = 5; + m_moveObject[0]->stepAdvance = 1; + m_moveObject[0]->stepRecede = 1; + m_moveObject[0]->timeStopStart = 0; + m_moveObject[0]->timeStopEnd = 0; + m_moveObject[0]->posStart.x = 258; + m_moveObject[0]->posStart.y = 196; + m_moveObject[0]->posEnd = m_moveObject[0]->posStart; + m_moveObject[0]->posCurrent = m_moveObject[0]->posStart; + m_moveObject[0]->phrase = 0; + m_moveObject[0]->step = 1; + m_moveObject[0]->time = 0; + m_moveObject[0]->channel = 10; + m_moveObject[0]->icon = 0; + m_moveObject[1]->type = 7; + m_moveObject[1]->stepAdvance = 1; + m_moveObject[1]->timeStopStart = 0; + m_moveObject[1]->timeStopEnd = 0; + m_moveObject[1]->posStart.x = 450; + m_moveObject[1]->posStart.y = 196; + m_moveObject[1]->posEnd = m_moveObject[1]->posStart; + m_moveObject[1]->posCurrent = m_moveObject[1]->posStart; + m_moveObject[1]->phrase = 0; + m_moveObject[1]->step = 1; + m_moveObject[1]->time = 0; + m_moveObject[1]->channel = 10; + m_moveObject[1]->icon = 29; + m_blupiStartPos.x = 66; + m_blupiStartPos.y = 192 + Decor.BLUPIOFFY; + m_blupiStartDir = 2; + m_blupiAction = 1; + m_blupiPhase = 0; + m_blupiIcon = 0; + m_blupiChannel = 2; + m_blupiFocus = TRUE; + m_blupiAir = FALSE; + m_blupiHelico = FALSE; + m_blupiOver = FALSE; + m_blupiJeep = FALSE; + m_blupiTank = FALSE; + } @@ -259,12 +322,12 @@ void CDecor::SetTeam(int team) m_team = team; } -void CDecor::SetBlupiState(BOOL helicopter, UINT drive, BOOL skateboard, UINT water) +void CDecor::GetBlupiInfo(BOOL bHelico, BOOL bJeep, BOOL bSkate, BOOL bNage) { - m_bHelicopter = helicopter; - m_bJeep || m_bTank = drive; - m_bSkateboard = skateboard; - m_bInDeepWater || m_bInSurfaceWater = water; + bHelico = m_blupiHelico; + bJeep = (m_blupiJeep | m_blupiTank); + bSkate = m_blupiSkate; + bNage = (m_blupiNage | m_blupiSurf); } int CDecor::GetMissionTitle() diff --git a/decor.h b/decor.h index c0ace0f..d8acfbb 100644 --- a/decor.h +++ b/decor.h @@ -35,6 +35,7 @@ typedef struct short rankMove; // rang dans m_move short workBlupi; // rang du blupi travaillant ici short fire; + int icon; } Cellule; // Cette structure doit �tre la plus petite possible, car @@ -127,6 +128,25 @@ Blupi; // 2 -> en jeep // 3 -> armure +typedef struct +{ + int type; + int stepAdvance; + int stepRecede; + int timeStopStart; + int timeStopEnd; + POINT posStart; + POINT posEnd; + POINT posCurrent; + int step; + int time; + int phrase; + int channel; + int icon; +} +MoveObject; + + typedef struct { short move_frames_forward; @@ -444,7 +464,7 @@ public: int GetInfoHeight(); int GetTargetLevel(); - void SetBlupiState(BOOL helicopter, UINT drive, BOOL skateboard, UINT water); + void GetBlupiInfo(BOOL bHelico, BOOL bJeep, BOOL bSkate, BOOL bNage); char* GetButtonExist(); @@ -503,7 +523,7 @@ protected: CSound* m_pSound; CPixmap* m_pPixmap; CNetwork* m_pNetwork; - Object m_objects[100][100]; + MoveObject m_moveObject[100][100]; Explo m_explos[100][100]; Perso m_persos[200]; int m_input; @@ -525,24 +545,32 @@ protected: int m_actionFrameCount; POINT m_velocity; Icon4 m_blupiIcon; + POINT m_blupiStartPos; + int m_blupiStartDir; + int m_blupiAction; + int m_blupiPhase; /* undefined undefined undefined undefined */ + int m_decor; + int m_bigDecor; + int m_decorAction; IconChannel m_blupiChannel; POINT m_activeConveyorVelocity; int m_activeLiftIndex; - BOOL m_bPlayerHasControl; - BOOL m_bIsFalling; - BOOL m_bHelicopter; - BOOL m_bHovercraft; - BOOL m_bJeep; - BOOL m_bTank; - BOOL m_bSkateboard; - BOOL m_bInDeepWater; - BOOL m_bInSurfaceWater; + int m_blupiChannel; + BOOL m_blupiFocus; + BOOL m_blupiAir; + BOOL m_blupiHelico; + BOOL m_blupiOver; + BOOL m_blupiJeep; + BOOL m_blupiTank; + BOOL m_blupiSkate; + BOOL m_blupiNage; + BOOL m_blupiSurf; BOOL m_bInWind; BOOL m_bIsHangingFromBar; BOOL m_bHeadache; @@ -555,6 +583,7 @@ protected: BOOL m_bCrushed; BOOL m_bUseSafePosition; BOOL m_bIsTerminating; + int m_lastDecorIcon; int m_glue; int m_keys; int m_personalBombs; diff --git a/event.cpp b/event.cpp index 9aaf004..9b1efe0 100644 --- a/event.cpp +++ b/event.cpp @@ -2310,20 +2310,20 @@ BOOL CEvent::GetPause() return m_bPause; } -int CEvent::SomethingMissions() +int CEvent::MissionBack() { - int tmp = m_mission; + int num = m_mission; - if (tmp % 10 == 0 || - tmp == 99) + if (num % 10 == 0 || + num == 99) { m_mission = 1; - return tmp / 10; + return num / 10; } else { - m_mission = tmp / 10 * 10; - return (tmp < 0); + m_mission = num / 10 * 10; + return (num < 0); } } diff --git a/event.h b/event.h index ae3e61d..ad52922 100644 --- a/event.h +++ b/event.h @@ -68,7 +68,7 @@ public: void TryInsert(); void SomethingUserMissions(LPCSTR lpFileName, LPCSTR thing); void RestoreGame(); - int SomethingMissions(); + int MissionBack(); void TableSomething(); int GetButtonIndex(int button); diff --git a/jauge.cpp b/jauge.cpp index 6fe1c68..0a868d3 100644 --- a/jauge.cpp +++ b/jauge.cpp @@ -52,38 +52,25 @@ BOOL CJauge::Create(HWND hWnd, CPixmap *pPixmap, CDecor *pDecor, void CJauge::Draw() { - int part; - RECT rect; + int part; + RECT rect; - if ( m_bMinimizeRedraw && !m_bRedraw ) return; - m_bRedraw = FALSE; + if (m_bMinimizeRedraw && !m_bRedraw) return; + m_bRedraw = FALSE; - if ( m_bHide ) // bouton cach� ? - { - rect.left = m_pos.x; - rect.right = m_pos.x+m_dim.x; - rect.top = m_pos.y; - rect.bottom = m_pos.y+m_dim.y; - m_pPixmap->DrawPart(-1, CHBACK, m_pos, rect, 1); // dessine le fond - return; - } + if (m_bHide) // bouton cach� ? + { + m_pPixmap->DrawPart(-1, 0, m_pos, rect); + return; + } + int num = m_level * 114 / 100; - part = (m_level*(DIMJAUGEX-6-4))/100; + m_pPixmap->DrawPart(-1, 5, m_pos, rect); + if (num > 0) + { + m_pPixmap->DrawPart(-1, 5, m_pos, rect); + } - rect.left = 0; - rect.right = DIMJAUGEX; - rect.top = DIMJAUGEY*0; - rect.bottom = DIMJAUGEY*1; - m_pPixmap->DrawPart(-1, CHJAUGE, m_pos, rect); // partie noire - - if ( part > 0 ) - { - rect.left = 0; - rect.right = 6+part; - rect.top = DIMJAUGEY*m_type; - rect.bottom = DIMJAUGEY*(m_type+1); - m_pPixmap->DrawPart(-1, CHJAUGE, m_pos, rect); // partie color�e - } } void CJauge::Redraw()