mirror of
https://github.com/isledecomp/isle.git
synced 2026-01-21 15:21:15 +00:00
Fix merge error
This commit is contained in:
parent
df290061d4
commit
67b6a618c6
23
.vscode/settings.json
vendored
Normal file
23
.vscode/settings.json
vendored
Normal file
@ -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"
|
||||||
|
}
|
||||||
|
}
|
||||||
@ -17,7 +17,6 @@ MxMediaManager::MxMediaManager()
|
|||||||
MxMediaManager::~MxMediaManager()
|
MxMediaManager::~MxMediaManager()
|
||||||
{
|
{
|
||||||
Destroy();
|
Destroy();
|
||||||
Destroy();
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// OFFSET: LEGO1 0x100b85d0
|
// OFFSET: LEGO1 0x100b85d0
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user