Skip to content

Commit ad915f6

Browse files
committed
stop intellisense being annoying
(cherry picked from commit e363854)
1 parent e68a029 commit ad915f6

File tree

3 files changed

+14
-22
lines changed

3 files changed

+14
-22
lines changed

MTA10/mods/deathmatch/logic/CStaticFunctionDefinitions.cpp

Lines changed: 0 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -4578,26 +4578,6 @@ bool CStaticFunctionDefinitions::GetCursorPosition ( CVector2D& vecCursor, CVect
45784578
return false;
45794579
}
45804580

4581-
4582-
void CStaticFunctionDefinitions::DrawText ( float fLeft, float fTop,
4583-
float fRight, float fBottom,
4584-
unsigned long dwColor,
4585-
const char* szText,
4586-
float fScaleX,
4587-
float fScaleY,
4588-
unsigned long ulFormat,
4589-
ID3DXFont* pDXFont,
4590-
bool bPostGUI,
4591-
bool bColorCoded,
4592-
bool bSubPixelPositioning,
4593-
float fRotation,
4594-
float fRotationCenterX,
4595-
float fRotationCenterY )
4596-
{
4597-
g_pCore->GetGraphics ()->DrawTextQueued ( fLeft, fTop, fRight, fBottom, dwColor, szText, fScaleX, fScaleY, ulFormat, pDXFont, bPostGUI, bColorCoded, bSubPixelPositioning, fRotation, fRotationCenterX, fRotationCenterY );
4598-
}
4599-
4600-
46014581
// Find custom font from an element, or a standard font from a name.
46024582
ID3DXFont* CStaticFunctionDefinitions::ResolveD3DXFont ( eFontType fontType, CClientDxFont* pDxFontElement )
46034583
{

MTA10/mods/deathmatch/logic/CStaticFunctionDefinitions.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -376,7 +376,6 @@ class CStaticFunctionDefinitions
376376
static bool SetCursorAlpha ( float fAlpha );
377377

378378
// Drawing funcs
379-
static void DrawText ( float fLeft, float fTop, float fRight, float fBottom, unsigned long dwColor, const char* szText, float fScaleX, float fScaleY, unsigned long ulFormat, ID3DXFont* pDXFont, bool bPostGUI, bool bColorCoded, bool bSubPixelPositioning, float fRotation, float fRotationCenterX, float fRotationCenterY );
380379
static CClientDxFont* CreateDxFont ( const SString& strFullFilePath, uint uiSize, bool bBold, const SString& strMetaPath, CResource* pResource );
381380
static CClientGuiFont* CreateGuiFont ( const SString& strFullFilePath, uint uiSize, const SString& strMetaPath, CResource* pResource );
382381
static ID3DXFont* ResolveD3DXFont ( eFontType fontType, CClientDxFont* pDxFontElement );

MTA10/mods/shared_logic/luadefs/CLuaDrawingDefs.cpp

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -312,7 +312,20 @@ int CLuaDrawingDefs::DxDrawText ( lua_State* luaVM )
312312
if ( bWordBreak ) ulFormat |= DT_WORDBREAK;
313313
if ( !bClip ) ulFormat |= DT_NOCLIP;
314314

315-
CStaticFunctionDefinitions::DrawText ( vecTopLeft.fX, vecTopLeft.fY, vecBottomRight.fX, vecBottomRight.fY, color, strText, fScaleX, fScaleY, ulFormat, pD3DXFont, bPostGUI, bColorCoded, bSubPixelPositioning, fRotation, vecRotationOrigin.fX, vecRotationOrigin.fY );
315+
g_pCore->GetGraphics ()->DrawTextQueued (
316+
vecTopLeft.fX, vecTopLeft.fY,
317+
vecBottomRight.fX, vecBottomRight.fY,
318+
color,
319+
strText,
320+
fScaleX, fScaleY,
321+
ulFormat,
322+
pD3DXFont,
323+
bPostGUI,
324+
bColorCoded,
325+
bSubPixelPositioning,
326+
fRotation,
327+
vecRotationOrigin.fX, vecRotationOrigin.fY
328+
);
316329

317330
lua_pushboolean ( luaVM, true );
318331
return 1;

0 commit comments

Comments
 (0)