isledecomp/isle
1
0
Fork 0
mirror of https://github.com/isledecomp/isle.git synced 2026-02-03 05:31:17 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Match BuildErrorString and _DoEnumerate

Browse Source
This commit is contained in:
Christian Semmler 2023-09-10 08:46:50 -04:00
parent 171a1f022e
commit 3229859c99
3 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
CMakeLists.txt
View File

@ -46,9 +46,9 @@ add_library(lego1 SHARED
LEGO1/jukeboxentity.cpp LEGO1/jukeboxentity.cpp
LEGO1/jukeboxstate.cpp LEGO1/jukeboxstate.cpp
LEGO1/legoact2state.cpp LEGO1/legoact2state.cpp
LEGO1/legoactor.cpp
LEGO1/legoactioncontrolpresenter.cpp LEGO1/legoactioncontrolpresenter.cpp
LEGO1/legoactor.cpp LEGO1/legoactor.cpp
LEGO1/legoactor.cpp
LEGO1/legoanimactor.cpp LEGO1/legoanimactor.cpp
LEGO1/legoanimationmanager.cpp LEGO1/legoanimationmanager.cpp
LEGO1/legoanimmmpresenter.cpp LEGO1/legoanimmmpresenter.cpp
@ -102,8 +102,8 @@ add_library(lego1 SHARED
LEGO1/mxcontrolpresenter.cpp LEGO1/mxcontrolpresenter.cpp
LEGO1/mxcore.cpp LEGO1/mxcore.cpp
LEGO1/mxcriticalsection.cpp LEGO1/mxcriticalsection.cpp
LEGO1/mxdirectdraw.cpp
LEGO1/mxdirect3d.cpp LEGO1/mxdirect3d.cpp
LEGO1/mxdirectdraw.cpp
LEGO1/mxdiskstreamcontroller.cpp LEGO1/mxdiskstreamcontroller.cpp
LEGO1/mxdiskstreamprovider.cpp LEGO1/mxdiskstreamprovider.cpp
LEGO1/mxdisplaysurface.cpp LEGO1/mxdisplaysurface.cpp
@ -119,10 +119,10 @@ add_library(lego1 SHARED
LEGO1/mxdsparallelaction.cpp LEGO1/mxdsparallelaction.cpp
LEGO1/mxdsselectaction.cpp LEGO1/mxdsselectaction.cpp
LEGO1/mxdsserialaction.cpp LEGO1/mxdsserialaction.cpp
LEGO1/mxdsstreamingaction.cpp
LEGO1/mxdssound.cpp LEGO1/mxdssound.cpp
LEGO1/mxdssource.cpp LEGO1/mxdssource.cpp
LEGO1/mxdsstill.cpp LEGO1/mxdsstill.cpp
LEGO1/mxdsstreamingaction.cpp
LEGO1/mxdssubscriber.cpp LEGO1/mxdssubscriber.cpp
LEGO1/mxentity.cpp LEGO1/mxentity.cpp
LEGO1/mxeventmanager.cpp LEGO1/mxeventmanager.cpp

11
LEGO1/mxdirect3d.cpp
View File

@ -144,10 +144,15 @@ BOOL MxDeviceEnumerate::FUN_1009c070()
} }
// OFFSET: LEGO1 0x1009c4c0 // OFFSET: LEGO1 0x1009c4c0
void MxDirect3D::BuildErrorString(const char *p_format, char *p_msg) void MxDirect3D::BuildErrorString(const char *p_format, ...)
{ {
va_list args;
char buf[512]; char buf[512];
vsprintf(buf, p_format, p_msg);
va_start(args, p_format);
vsprintf(buf, p_format, args);
va_end(args);
OutputDebugString(buf); OutputDebugString(buf);
} }
@ -177,7 +182,7 @@ BOOL FAR PASCAL EnumerateCallback(GUID FAR *, LPSTR, LPSTR, LPVOID)
} }
// OFFSET: LEGO1 0x1009c730 STUB // OFFSET: LEGO1 0x1009c730 STUB
char *MxDeviceEnumerate::EnumerateErrorToString(HRESULT p_error) char* MxDeviceEnumerate::EnumerateErrorToString(HRESULT p_error)
{ {
// TODO: This is a list of error messages, similar to the function in // TODO: This is a list of error messages, similar to the function in
// MxDirectDraw, except that this one now contains the Direct3D errors. // MxDirectDraw, except that this one now contains the Direct3D errors.

4
LEGO1/mxdirect3d.h
View File

@ -27,7 +27,7 @@ class MxDeviceEnumerate
virtual MxResult _DoEnumerate(); virtual MxResult _DoEnumerate();
BOOL FUN_1009c070(); BOOL FUN_1009c070();
static char *EnumerateErrorToString(HRESULT p_error); char *EnumerateErrorToString(HRESULT p_error);
undefined4 m_unk004; undefined4 m_unk004;
undefined4 m_unk008; undefined4 m_unk008;
@ -63,7 +63,7 @@ class MxDirect3D : public MxDirectDraw
BOOL CreateIDirect3D(); BOOL CreateIDirect3D();
BOOL D3DSetMode(); BOOL D3DSetMode();
static void BuildErrorString(const char *, char *); static void BuildErrorString(const char *, ...);
private: private:
MxDeviceModeFinder *m_pDeviceModeFinder; // +0x880 MxDeviceModeFinder *m_pDeviceModeFinder; // +0x880