From 67b6a618c6910015972c0b3ec0bf2541ea3dec95 Mon Sep 17 00:00:00 2001 From: Christian Semmler Date: Sun, 17 Sep 2023 06:33:19 -0400 Subject: [PATCH] Fix merge error --- .vscode/settings.json | 23 ++++ LEGO1/mxmediamanager.cpp | 1 - out.html | 264 +++++++++++++++++++++++++++++++++++++++ 3 files changed, 287 insertions(+), 1 deletion(-) create mode 100644 .vscode/settings.json create mode 100644 out.html diff --git a/.vscode/settings.json b/.vscode/settings.json new file mode 100644 index 00000000..f2dd311d --- /dev/null +++ b/.vscode/settings.json @@ -0,0 +1,23 @@ +{ + "files.associations": { + "xmemory": "cpp", + "list": "cpp", + "xutility": "cpp", + "xhash": "cpp", + "algorithm": "cpp", + "deque": "cpp", + "functional": "cpp", + "map": "cpp", + "memory": "cpp", + "queue": "cpp", + "set": "cpp", + "stack": "cpp", + "type_traits": "cpp", + "unordered_map": "cpp", + "utility": "cpp", + "vector": "cpp", + "xstring": "cpp", + "xtr1common": "cpp", + "xtree": "cpp" + } +} \ No newline at end of file diff --git a/LEGO1/mxmediamanager.cpp b/LEGO1/mxmediamanager.cpp index 17ac48d1..dc66c549 100644 --- a/LEGO1/mxmediamanager.cpp +++ b/LEGO1/mxmediamanager.cpp @@ -17,7 +17,6 @@ MxMediaManager::MxMediaManager() MxMediaManager::~MxMediaManager() { Destroy(); - Destroy(); } // OFFSET: LEGO1 0x100b85d0 diff --git a/out.html b/out.html new file mode 100644 index 00000000..a603a06d --- /dev/null +++ b/out.html @@ -0,0 +1,264 @@ + + + + Decompilation Status + + + + +
+

Decompilation Status

+ +
+ + +
+ + +
AddressNameMatching
+
+ +