Skip to content

Commit 9631567

Browse files
jusharjushar
committed
Let GUI-functions accept vectors
1 parent 7e9324b commit 9631567

File tree

4 files changed

+120
-150
lines changed

4 files changed

+120
-150
lines changed

‎Client/mods/deathmatch/logic/CStaticFunctionDefinitions.cpp

Lines changed: 45 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -4811,11 +4811,11 @@ eCursorType CStaticFunctionDefinitions::GUIGetCursorType ( void )
48114811
}
48124812

48134813

4814-
CClientGUIElement* CStaticFunctionDefinitions::GUICreateWindow ( CLuaMain& LuaMain, float fX, float fY, float fWidth, float fHeight, const char* szCaption, bool bRelative )
4814+
CClientGUIElement* CStaticFunctionDefinitions::GUICreateWindow ( CLuaMain& LuaMain, const CVector2D& position, const CVector2D& size, const char* szCaption, bool bRelative )
48154815
{
48164816
CGUIElement *pElement = m_pGUI->CreateWnd ( NULL, szCaption );
4817-
pElement->SetPosition ( CVector2D ( fX, fY ), bRelative );
4818-
pElement->SetSize ( CVector2D ( fWidth, fHeight ), bRelative );
4817+
pElement->SetPosition ( position, bRelative );
4818+
pElement->SetSize ( size, bRelative );
48194819

48204820
// register to the gui manager
48214821
CClientGUIElement *pGUIElement = new CClientGUIElement ( m_pManager, &LuaMain, pElement );
@@ -4830,11 +4830,11 @@ CClientGUIElement* CStaticFunctionDefinitions::GUICreateWindow ( CLuaMain& LuaMa
48304830
}
48314831

48324832

4833-
CClientGUIElement* CStaticFunctionDefinitions::GUICreateStaticImage ( CLuaMain& LuaMain, float fX, float fY, float fWidth, float fHeight, const SString& strPath, bool bRelative, CClientGUIElement* pParent )
4833+
CClientGUIElement* CStaticFunctionDefinitions::GUICreateStaticImage ( CLuaMain& LuaMain, const CVector2D& position, const CVector2D& size, const SString& strPath, bool bRelative, CClientGUIElement* pParent )
48344834
{
48354835
CGUIElement *pElement = m_pGUI->CreateStaticImage ( pParent ? pParent->GetCGUIElement () : NULL );
4836-
pElement->SetPosition ( CVector2D ( fX, fY ), bRelative );
4837-
pElement->SetSize ( CVector2D ( fWidth, fHeight ), bRelative );
4836+
pElement->SetPosition ( position, bRelative );
4837+
pElement->SetSize ( size, bRelative );
48384838

48394839
// Register to the gui manager
48404840
CClientGUIElement *pGUIElement = new CClientGUIElement ( m_pManager, &LuaMain, pElement );
@@ -4905,11 +4905,11 @@ bool CStaticFunctionDefinitions::GUIStaticImageGetNativeSize ( CClientEntity& En
49054905
}
49064906

49074907

4908-
CClientGUIElement* CStaticFunctionDefinitions::GUICreateLabel ( CLuaMain& LuaMain, float fX, float fY, float fWidth, float fHeight, const char* szCaption, bool bRelative, CClientGUIElement* pParent )
4908+
CClientGUIElement* CStaticFunctionDefinitions::GUICreateLabel ( CLuaMain& LuaMain, const CVector2D& position, const CVector2D& size, const char* szCaption, bool bRelative, CClientGUIElement* pParent )
49094909
{
49104910
CGUIElement *pElement = m_pGUI->CreateLabel ( pParent ? pParent->GetCGUIElement () : NULL, szCaption );
4911-
pElement->SetPosition ( CVector2D ( fX, fY ), bRelative );
4912-
pElement->SetSize ( CVector2D ( fWidth, fHeight ), bRelative );
4911+
pElement->SetPosition ( position, bRelative );
4912+
pElement->SetSize ( size, bRelative );
49134913

49144914
// register to the gui manager
49154915
CClientGUIElement *pGUIElement = new CClientGUIElement ( m_pManager, &LuaMain, pElement );
@@ -4919,11 +4919,11 @@ CClientGUIElement* CStaticFunctionDefinitions::GUICreateLabel ( CLuaMain& LuaMai
49194919
}
49204920

49214921

4922-
CClientGUIElement* CStaticFunctionDefinitions::GUICreateButton ( CLuaMain& LuaMain, float fX, float fY, float fWidth, float fHeight, const char* szCaption, bool bRelative, CClientGUIElement* pParent )
4922+
CClientGUIElement* CStaticFunctionDefinitions::GUICreateButton ( CLuaMain& LuaMain, const CVector2D& position, const CVector2D& size, const char* szCaption, bool bRelative, CClientGUIElement* pParent )
49234923
{
49244924
CGUIElement *pElement = m_pGUI->CreateButton ( pParent ? pParent->GetCGUIElement () : NULL, szCaption );
4925-
pElement->SetPosition ( CVector2D ( fX, fY ), bRelative );
4926-
pElement->SetSize ( CVector2D ( fWidth, fHeight ), bRelative );
4925+
pElement->SetPosition ( position, bRelative );
4926+
pElement->SetSize ( size, bRelative );
49274927

49284928
// register to the gui manager
49294929
CClientGUIElement *pGUIElement = new CClientGUIElement ( m_pManager, &LuaMain, pElement );
@@ -4937,11 +4937,11 @@ CClientGUIElement* CStaticFunctionDefinitions::GUICreateButton ( CLuaMain& LuaMa
49374937
}
49384938

49394939

4940-
CClientGUIElement* CStaticFunctionDefinitions::GUICreateProgressBar ( CLuaMain& LuaMain, float fX, float fY, float fWidth, float fHeight, bool bRelative, CClientGUIElement* pParent )
4940+
CClientGUIElement* CStaticFunctionDefinitions::GUICreateProgressBar ( CLuaMain& LuaMain, const CVector2D& position, const CVector2D& size, bool bRelative, CClientGUIElement* pParent )
49414941
{
49424942
CGUIElement *pElement = m_pGUI->CreateProgressBar ( pParent ? pParent->GetCGUIElement () : NULL );
4943-
pElement->SetPosition ( CVector2D ( fX, fY ), bRelative );
4944-
pElement->SetSize ( CVector2D ( fWidth, fHeight ), bRelative );
4943+
pElement->SetPosition ( position, bRelative );
4944+
pElement->SetSize ( size, bRelative );
49454945

49464946
// register to the gui manager
49474947
CClientGUIElement *pGUIElement = new CClientGUIElement ( m_pManager, &LuaMain, pElement );
@@ -4951,11 +4951,11 @@ CClientGUIElement* CStaticFunctionDefinitions::GUICreateProgressBar ( CLuaMain&
49514951
}
49524952

49534953

4954-
CClientGUIElement* CStaticFunctionDefinitions::GUICreateScrollBar ( CLuaMain& LuaMain, float fX, float fY, float fWidth, float fHeight, bool bHorizontal, bool bRelative, CClientGUIElement* pParent )
4954+
CClientGUIElement* CStaticFunctionDefinitions::GUICreateScrollBar ( CLuaMain& LuaMain, const CVector2D& position, const CVector2D& size, bool bHorizontal, bool bRelative, CClientGUIElement* pParent )
49554955
{
49564956
CGUIElement *pElement = m_pGUI->CreateScrollBar ( bHorizontal, pParent ? pParent->GetCGUIElement () : NULL );
4957-
pElement->SetPosition ( CVector2D ( fX, fY ), bRelative );
4958-
pElement->SetSize ( CVector2D ( fWidth, fHeight ), bRelative );
4957+
pElement->SetPosition ( position, bRelative );
4958+
pElement->SetSize ( size, bRelative );
49594959

49604960
// register to the gui manager
49614961
CClientGUIElement *pGUIElement = new CClientGUIElement ( m_pManager, &LuaMain, pElement );
@@ -4969,11 +4969,11 @@ CClientGUIElement* CStaticFunctionDefinitions::GUICreateScrollBar ( CLuaMain& Lu
49694969
}
49704970

49714971

4972-
CClientGUIElement* CStaticFunctionDefinitions::GUICreateCheckBox ( CLuaMain& LuaMain, float fX, float fY, float fWidth, float fHeight, const char* szCaption, bool bChecked, bool bRelative, CClientGUIElement* pParent )
4972+
CClientGUIElement* CStaticFunctionDefinitions::GUICreateCheckBox ( CLuaMain& LuaMain, const CVector2D& position, const CVector2D& size, const char* szCaption, bool bChecked, bool bRelative, CClientGUIElement* pParent )
49734973
{
49744974
CGUIElement *pElement = m_pGUI->CreateCheckBox ( pParent ? pParent->GetCGUIElement () : NULL, szCaption, bChecked );
4975-
pElement->SetPosition ( CVector2D ( fX, fY ), bRelative );
4976-
pElement->SetSize ( CVector2D ( fWidth, fHeight ), bRelative );
4975+
pElement->SetPosition ( position, bRelative );
4976+
pElement->SetSize ( size, bRelative );
49774977

49784978
// register to the gui manager
49794979
CClientGUIElement *pGUIElement = new CClientGUIElement ( m_pManager, &LuaMain, pElement );
@@ -4987,11 +4987,11 @@ CClientGUIElement* CStaticFunctionDefinitions::GUICreateCheckBox ( CLuaMain& Lua
49874987
}
49884988

49894989

4990-
CClientGUIElement* CStaticFunctionDefinitions::GUICreateRadioButton ( CLuaMain& LuaMain, float fX, float fY, float fWidth, float fHeight, const char* szCaption, bool bRelative, CClientGUIElement* pParent )
4990+
CClientGUIElement* CStaticFunctionDefinitions::GUICreateRadioButton ( CLuaMain& LuaMain, const CVector2D& position, const CVector2D& size, const char* szCaption, bool bRelative, CClientGUIElement* pParent )
49914991
{
49924992
CGUIElement *pElement = m_pGUI->CreateRadioButton ( pParent ? pParent->GetCGUIElement () : NULL, szCaption );
4993-
pElement->SetPosition ( CVector2D ( fX, fY ), bRelative );
4994-
pElement->SetSize ( CVector2D ( fWidth, fHeight ), bRelative );
4993+
pElement->SetPosition ( position, bRelative );
4994+
pElement->SetSize ( size, bRelative );
49954995

49964996
// register to the gui manager
49974997
CClientGUIElement *pGUIElement = new CClientGUIElement ( m_pManager, &LuaMain, pElement );
@@ -5005,11 +5005,11 @@ CClientGUIElement* CStaticFunctionDefinitions::GUICreateRadioButton ( CLuaMain&
50055005
}
50065006

50075007

5008-
CClientGUIElement* CStaticFunctionDefinitions::GUICreateEdit ( CLuaMain& LuaMain, float fX, float fY, float fWidth, float fHeight, const char* szCaption, bool bRelative, CClientGUIElement* pParent )
5008+
CClientGUIElement* CStaticFunctionDefinitions::GUICreateEdit ( CLuaMain& LuaMain, const CVector2D& position, const CVector2D& size, const char* szCaption, bool bRelative, CClientGUIElement* pParent )
50095009
{
50105010
CGUIElement *pElement = m_pGUI->CreateEdit ( pParent ? pParent->GetCGUIElement () : NULL, szCaption );
5011-
pElement->SetPosition ( CVector2D ( fX, fY ), bRelative );
5012-
pElement->SetSize ( CVector2D ( fWidth, fHeight ), bRelative );
5011+
pElement->SetPosition ( position, bRelative );
5012+
pElement->SetSize ( size, bRelative );
50135013
pElement->SetText ( szCaption );
50145014

50155015
// register to the gui manager
@@ -5025,11 +5025,11 @@ CClientGUIElement* CStaticFunctionDefinitions::GUICreateEdit ( CLuaMain& LuaMain
50255025
}
50265026

50275027

5028-
CClientGUIElement* CStaticFunctionDefinitions::GUICreateMemo ( CLuaMain& LuaMain, float fX, float fY, float fWidth, float fHeight, const char* szCaption, bool bRelative, CClientGUIElement* pParent )
5028+
CClientGUIElement* CStaticFunctionDefinitions::GUICreateMemo ( CLuaMain& LuaMain, const CVector2D& position, const CVector2D& size, const char* szCaption, bool bRelative, CClientGUIElement* pParent )
50295029
{
50305030
CGUIElement *pElement = m_pGUI->CreateMemo ( pParent ? pParent->GetCGUIElement () : NULL, szCaption );
5031-
pElement->SetPosition ( CVector2D ( fX, fY ), bRelative );
5032-
pElement->SetSize ( CVector2D ( fWidth, fHeight ), bRelative );
5031+
pElement->SetPosition ( position, bRelative );
5032+
pElement->SetSize ( size, bRelative );
50335033
pElement->SetText ( szCaption );
50345034

50355035
// register to the gui manager
@@ -5044,11 +5044,11 @@ CClientGUIElement* CStaticFunctionDefinitions::GUICreateMemo ( CLuaMain& LuaMain
50445044
}
50455045

50465046

5047-
CClientGUIElement* CStaticFunctionDefinitions::GUICreateGridList ( CLuaMain& LuaMain, float fX, float fY, float fWidth, float fHeight, bool bRelative, CClientGUIElement* pParent )
5047+
CClientGUIElement* CStaticFunctionDefinitions::GUICreateGridList ( CLuaMain& LuaMain, const CVector2D& position, const CVector2D& size, bool bRelative, CClientGUIElement* pParent )
50485048
{
50495049
CGUIElement *pElement = m_pGUI->CreateGridList ( pParent ? pParent->GetCGUIElement () : NULL, true );
5050-
pElement->SetPosition ( CVector2D ( fX, fY ), bRelative );
5051-
pElement->SetSize ( CVector2D ( fWidth, fHeight ), bRelative );
5050+
pElement->SetPosition ( position, bRelative );
5051+
pElement->SetSize ( size, bRelative );
50525052

50535053
// register to the gui manager
50545054
CClientGUIElement *pGUIElement = new CClientGUIElement ( m_pManager, &LuaMain, pElement );
@@ -5058,11 +5058,11 @@ CClientGUIElement* CStaticFunctionDefinitions::GUICreateGridList ( CLuaMain& Lua
50585058
}
50595059

50605060

5061-
CClientGUIElement* CStaticFunctionDefinitions::GUICreateTabPanel ( CLuaMain& LuaMain, float fX, float fY, float fWidth, float fHeight, bool bRelative, CClientGUIElement* pParent )
5061+
CClientGUIElement* CStaticFunctionDefinitions::GUICreateTabPanel ( CLuaMain& LuaMain, const CVector2D& position, const CVector2D& size, bool bRelative, CClientGUIElement* pParent )
50625062
{
50635063
CGUIElement *pElement = m_pGUI->CreateTabPanel ( pParent ? pParent->GetCGUIElement () : NULL );
5064-
pElement->SetPosition ( CVector2D ( fX, fY ), bRelative );
5065-
pElement->SetSize ( CVector2D ( fWidth, fHeight ), bRelative );
5064+
pElement->SetPosition ( position, bRelative );
5065+
pElement->SetSize ( size, bRelative );
50665066

50675067
// register to the gui manager
50685068
CClientGUIElement *pGUIElement = new CClientGUIElement ( m_pManager, &LuaMain, pElement );
@@ -5076,11 +5076,11 @@ CClientGUIElement* CStaticFunctionDefinitions::GUICreateTabPanel ( CLuaMain& Lua
50765076
}
50775077

50785078

5079-
CClientGUIElement* CStaticFunctionDefinitions::GUICreateScrollPane ( CLuaMain& LuaMain, float fX, float fY, float fWidth, float fHeight, bool bRelative, CClientGUIElement* pParent )
5079+
CClientGUIElement* CStaticFunctionDefinitions::GUICreateScrollPane ( CLuaMain& LuaMain, const CVector2D& position, const CVector2D& size, bool bRelative, CClientGUIElement* pParent )
50805080
{
50815081
CGUIElement *pElement = m_pGUI->CreateScrollPane ( pParent ? pParent->GetCGUIElement () : NULL );
5082-
pElement->SetPosition ( CVector2D ( fX, fY ), bRelative );
5083-
pElement->SetSize ( CVector2D ( fWidth, fHeight ), bRelative );
5082+
pElement->SetPosition ( position, bRelative );
5083+
pElement->SetSize ( size, bRelative );
50845084

50855085
// register to the gui manager
50865086
CClientGUIElement *pGUIElement = new CClientGUIElement ( m_pManager, &LuaMain, pElement );
@@ -5154,11 +5154,11 @@ bool CStaticFunctionDefinitions::GUIDeleteTab ( CLuaMain& LuaMain, CClientGUIEle
51545154
return true;
51555155
}
51565156

5157-
CClientGUIElement* CStaticFunctionDefinitions::GUICreateComboBox ( CLuaMain& LuaMain, float fX, float fY, float fWidth, float fHeight, const char* szCaption, bool bRelative, CClientGUIElement* pParent )
5157+
CClientGUIElement* CStaticFunctionDefinitions::GUICreateComboBox ( CLuaMain& LuaMain, const CVector2D& position, const CVector2D& size, const char* szCaption, bool bRelative, CClientGUIElement* pParent )
51585158
{
51595159
CGUIElement *pElement = m_pGUI->CreateComboBox ( pParent ? pParent->GetCGUIElement () : NULL, szCaption );
5160-
pElement->SetPosition ( CVector2D ( fX, fY ), bRelative );
5161-
pElement->SetSize ( CVector2D ( fWidth, fHeight ), bRelative );
5160+
pElement->SetPosition ( position, bRelative );
5161+
pElement->SetSize ( size, bRelative );
51625162

51635163
// Disable editing of the box...
51645164
//CClientGUIElement& GUIElement = static_cast < CClientGUIElement& > ( pElement );
@@ -5318,11 +5318,11 @@ bool CStaticFunctionDefinitions::GUIComboBoxSetItemText ( CClientEntity& Entity,
53185318
return false;
53195319
}
53205320

5321-
CClientGUIElement* CStaticFunctionDefinitions::GUICreateBrowser ( CLuaMain& LuaMain, float fX, float fY, float fWidth, float fHeight, bool bIsLocal, bool bIsTransparent, bool bRelative, CClientGUIElement* pParent )
5321+
CClientGUIElement* CStaticFunctionDefinitions::GUICreateBrowser ( CLuaMain& LuaMain, const CVector2D& position, const CVector2D& size, bool bIsLocal, bool bIsTransparent, bool bRelative, CClientGUIElement* pParent )
53225322
{
53235323
CGUIWebBrowser* pElement = m_pGUI->CreateWebBrowser ( pParent ? pParent->GetCGUIElement () : nullptr );
5324-
pElement->SetPosition ( CVector2D ( fX, fY ), bRelative );
5325-
pElement->SetSize ( CVector2D ( fWidth, fHeight ), bRelative );
5324+
pElement->SetPosition ( position, bRelative );
5325+
pElement->SetSize ( size, bRelative );
53265326

53275327
// Register to the gui manager
53285328
CVector2D absoluteSize;

0 commit comments

Comments
 (0)