diff --git a/idb/saco/samp.idb b/idb/saco/samp.idb index afdd8b6..4f412a7 100644 Binary files a/idb/saco/samp.idb and b/idb/saco/samp.idb differ diff --git a/saco/main.cpp b/saco/main.cpp index 0c1d42b..7cf5f0d 100644 --- a/saco/main.cpp +++ b/saco/main.cpp @@ -23,7 +23,7 @@ CNetGame *pNetGame=0; //DWORD dword_1026EB98=0; CFontRender *pDefaultFont=0; CUnkClass13 *pUnkClass13=0; -CUnkClass14 *pUnkClass14=0; +CObjectText *pObjectText=0; CUnkClass15 *pUnkClass15=0; BOOL bGameInited=FALSE; @@ -373,7 +373,7 @@ void DoInitStuff() pUnkClass11 = new CUnkClass11(); pUnkClass12 = new CUnkClass12(); pUnkClass13 = new CUnkClass13(pD3DDevice); - pUnkClass14 = new CUnkClass14(pD3DDevice); + pObjectText = new CObjectText(pD3DDevice); pUnkClass15 = new CUnkClass15(); // Setting up the commands. diff --git a/saco/main.h b/saco/main.h index d7397e8..38096ac 100644 --- a/saco/main.h +++ b/saco/main.h @@ -83,7 +83,7 @@ typedef struct _GAME_SETTINGS { #include "unkclass11.h" #include "unkclass12.h" #include "unkclass13.h" -#include "unkclass14.h" +#include "objecttext.h" #include "unkclass15.h" void SetStringFromCommandLine(char *szCmdLine, char *szString); diff --git a/saco/unkclass14.cpp b/saco/objecttext.cpp similarity index 66% rename from saco/unkclass14.cpp rename to saco/objecttext.cpp index 3aa39e4..648cbe5 100644 --- a/saco/unkclass14.cpp +++ b/saco/objecttext.cpp @@ -1,7 +1,7 @@ #include "main.h" -CUnkClass14::CUnkClass14(IDirect3DDevice9 *pD3DDevice) +CObjectText::CObjectText(IDirect3DDevice9 *pD3DDevice) { m_pD3DDevice = pD3DDevice; m_pD3DSprite1 = NULL; @@ -10,18 +10,18 @@ CUnkClass14::CUnkClass14(IDirect3DDevice9 *pD3DDevice) RestoreDeviceObjects(); } -CUnkClass14::~CUnkClass14() +CObjectText::~CObjectText() { DeleteDeviceObjects(); } -void CUnkClass14::DeleteDeviceObjects() +void CObjectText::DeleteDeviceObjects() { SAFE_RELEASE(m_pD3DSprite2); SAFE_RELEASE(m_pD3DSprite1); } -void CUnkClass14::RestoreDeviceObjects() +void CObjectText::RestoreDeviceObjects() { D3DXCreateSprite(m_pD3DDevice, &m_pD3DSprite1); D3DXCreateSprite(m_pD3DDevice, &m_pD3DSprite2); diff --git a/saco/unkclass14.h b/saco/objecttext.h similarity index 70% rename from saco/unkclass14.h rename to saco/objecttext.h index 34d0bcd..5913464 100644 --- a/saco/unkclass14.h +++ b/saco/objecttext.h @@ -1,7 +1,7 @@ #pragma once -class CUnkClass14 +class CObjectText { private: IDirect3DDevice9 *m_pD3DDevice; @@ -9,8 +9,8 @@ private: ID3DXSprite *m_pD3DSprite2; public: - CUnkClass14(IDirect3DDevice9 *pD3DDevice); - ~CUnkClass14(); + CObjectText(IDirect3DDevice9 *pD3DDevice); + ~CObjectText(); void DeleteDeviceObjects(); void RestoreDeviceObjects(); diff --git a/saco/saco.vcproj b/saco/saco.vcproj index debf053..1b1e59b 100644 --- a/saco/saco.vcproj +++ b/saco/saco.vcproj @@ -1059,10 +1059,10 @@ RelativePath=".\unkclass13.h"> + RelativePath=".\objecttext.cpp"> + RelativePath=".\objecttext.h"> diff --git a/saco/unkclass10.cpp b/saco/unkclass10.cpp index c80fae2..91ce770 100644 --- a/saco/unkclass10.cpp +++ b/saco/unkclass10.cpp @@ -24,3 +24,43 @@ CUnkClass10::CUnkClass10(IDirect3DDevice9 *pD3DDevice) D3DXCreateFont(m_pD3DDevice, 28, 0, FW_NORMAL, 1, FALSE, SYMBOL_CHARSET, OUT_DEFAULT_PRECIS, DEFAULT_QUALITY, DEFAULT_PITCH, "SAMPAUX3", &m_pD3DFont2); } + +void CUnkClass10::FUNC10072BC0(int a2) +{ + +} + +void CUnkClass10::FUNC100724E0(int a2) +{ + +} + +int CUnkClass10::FUNC10071D20(int a2, float a3) +{ + +} + +void CUnkClass10::FUNC10073460(int a2, float a3) +{ + +} + +int CUnkClass10::WndProc(int a2, int a3, int a4) +{ + +} + +void CUnkClass10::FUNC10073780() +{ + +} + +void CUnkClass10::FUNC10072AC0(int a2) +{ + +} + +void CUnkClass10::FUNC100728B0(int a2) +{ + +} diff --git a/saco/unkclass10.h b/saco/unkclass10.h index c7430e3..0889d42 100644 --- a/saco/unkclass10.h +++ b/saco/unkclass10.h @@ -1,6 +1,13 @@ #pragma once +/* +https://sampwiki.blast.hk/wiki/EditObject +Suggested names: +CObjectEditor +CEditObject +*/ + class CUnkClass10 { private: @@ -27,4 +34,13 @@ private: public: CUnkClass10(IDirect3DDevice9 *pD3DDevice); + // TODO: review args and implement + void FUNC10072BC0(int a2); + void FUNC100724E0(int a2); + int FUNC10071D20(int a2, float a3); + void FUNC10073460(int a2, float a3); + int WndProc(int a2, int a3, int a4); // 0x10073550 + void FUNC10073780(); + void FUNC10072AC0(int a2); + void FUNC100728B0(int a2); };