Skip to content

Commit

Permalink
Clean up client Engine/GUI luadefs
Browse files Browse the repository at this point in the history
  • Loading branch information
@qaisjp
qaisjp committed Jul 31, 2016
1 parent 1358890 commit c0a0662
Show file tree
Hide file tree
Showing 11 changed files with 4,755 additions and 4,720 deletions.
2 changes: 2 additions & 0 deletions MTA10/mods/deathmatch/StdInc.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -114,8 +114,10 @@
#include <luadefs/CLuaColShapeDefs.h>
#include <luadefs/CLuaDrawingDefs.h>
#include <luadefs/CLuaElementDefs.h>
#include <luadefs/CLuaEngineDefs.h>
#include <luadefs/CLuaFileDefs.h>
#include <luadefs/CLuaFxDefs.h>
#include <luadefs/CLuaGUIDefs.h>
#include <luadefs/CLuaMarkerDefs.h>
#include <luadefs/CLuaMatrixDefs.h>
#include <luadefs/CLuaObjectDefs.h>
Expand Down
6 changes: 4 additions & 2 deletions MTA10/mods/deathmatch/_Deathmatch 2008.vcxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -373,6 +373,8 @@
<ClCompile Include="..\shared_logic\luadefs\CLuaColShapeDefs.cpp" />
<ClCompile Include="..\shared_logic\luadefs\CLuaDrawingDefs.cpp" />
<ClCompile Include="..\shared_logic\luadefs\CLuaElementDefs.cpp" />
<ClCompile Include="..\shared_logic\luadefs\CLuaEngineDefs.cpp" />
<ClCompile Include="..\shared_logic\luadefs\CLuaGUIDefs.cpp" />
<ClCompile Include="..\shared_logic\luadefs\CLuaMarkerDefs.cpp" />
<ClCompile Include="..\shared_logic\luadefs\CLuaObjectDefs.cpp" />
<ClCompile Include="..\shared_logic\luadefs\CLuaPickupDefs.cpp" />
Expand Down Expand Up @@ -578,9 +580,7 @@
<ClCompile Include="..\shared_logic\lua\CLuaFunctionDefs.BodyClothes.cpp" />
<ClCompile Include="..\shared_logic\lua\CLuaFunctionDefs.Commands.cpp" />
<ClCompile Include="..\shared_logic\lua\CLuaFunctionDefs.cpp" />
<ClCompile Include="..\shared_logic\lua\CLuaFunctionDefs.Engine.cpp" />
<ClCompile Include="..\shared_logic\lua\CLuaFunctionDefs.Event.cpp" />
<ClCompile Include="..\shared_logic\lua\CLuaFunctionDefs.GUI.cpp" />
<ClCompile Include="..\shared_logic\lua\CLuaFunctionDefs.Input.cpp" />
<ClCompile Include="..\shared_logic\lua\CLuaFunctionDefs.Output.cpp" />
<ClCompile Include="..\shared_logic\lua\CLuaFunctionDefs.Util.cpp" />
Expand Down Expand Up @@ -764,6 +764,8 @@
<ClInclude Include="..\shared_logic\luadefs\CLuaColShapeDefs.h" />
<ClInclude Include="..\shared_logic\luadefs\CLuaDrawingDefs.h" />
<ClInclude Include="..\shared_logic\luadefs\CLuaElementDefs.h" />
<ClInclude Include="..\shared_logic\luadefs\CLuaEngineDefs.h" />
<ClInclude Include="..\shared_logic\luadefs\CLuaGUIDefs.h" />
<ClInclude Include="..\shared_logic\luadefs\CLuaMarkerDefs.h" />
<ClInclude Include="..\shared_logic\luadefs\CLuaObjectDefs.h" />
<ClInclude Include="..\shared_logic\luadefs\CLuaPickupDefs.h" />
Expand Down
18 changes: 12 additions & 6 deletions MTA10/mods/deathmatch/_Deathmatch 2008.vcxproj.filters
View file
Original file line number Diff line number Diff line change
Expand Up @@ -575,15 +575,9 @@
<ClCompile Include="..\shared_logic\lua\CLuaFunctionDefs.cpp">
<Filter>Source Files\shared_logic\lua</Filter>
</ClCompile>
<ClCompile Include="..\shared_logic\lua\CLuaFunctionDefs.Engine.cpp">
<Filter>Source Files\shared_logic\lua</Filter>
</ClCompile>
<ClCompile Include="..\shared_logic\lua\CLuaFunctionDefs.Event.cpp">
<Filter>Source Files\shared_logic\lua</Filter>
</ClCompile>
<ClCompile Include="..\shared_logic\lua\CLuaFunctionDefs.GUI.cpp">
<Filter>Source Files\shared_logic\lua</Filter>
</ClCompile>
<ClCompile Include="..\shared_logic\lua\CLuaFunctionDefs.Input.cpp">
<Filter>Source Files\shared_logic\lua</Filter>
</ClCompile>
Expand Down Expand Up @@ -926,6 +920,12 @@
<ClCompile Include="..\shared_logic\luadefs\CLuaWaterDefs.cpp">
<Filter>Source Files\shared_logic\luadefs</Filter>
</ClCompile>
<ClCompile Include="..\shared_logic\luadefs\CLuaEngineDefs.cpp">
<Filter>Source Files\shared_logic\luadefs</Filter>
</ClCompile>
<ClCompile Include="..\shared_logic\luadefs\CLuaGUIDefs.cpp">
<Filter>Source Files\shared_logic\luadefs</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup>
<ClInclude Include="CClient.h">
Expand Down Expand Up @@ -1714,6 +1714,12 @@
<ClInclude Include="..\shared_logic\luadefs\CLuaWaterDefs.h">
<Filter>Header Files\shared_logic\luadefs</Filter>
</ClInclude>
<ClInclude Include="..\shared_logic\luadefs\CLuaEngineDefs.h">
<Filter>Header Files\shared_logic\luadefs</Filter>
</ClInclude>
<ClInclude Include="..\shared_logic\luadefs\CLuaGUIDefs.h">
<Filter>Header Files\shared_logic\luadefs</Filter>
</ClInclude>
</ItemGroup>
<ItemGroup>
<None Include="..\..\..\Shared\mods\deathmatch\logic\luascripts\coroutine_debug.lua">
Expand Down
150 changes: 0 additions & 150 deletions MTA10/mods/shared_logic/lua/CLuaFunctionDefs.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -91,31 +91,6 @@ class CLuaFunctionDefs

LUA_DECLARE ( ShowCursor );

// Engine (RenderWare lower-level) functions
LUA_DECLARE ( EngineLoadDFF );
LUA_DECLARE ( EngineLoadTXD );
LUA_DECLARE ( EngineLoadCOL );
LUA_DECLARE ( EngineImportTXD );
LUA_DECLARE ( EngineReplaceCOL );
LUA_DECLARE ( EngineRestoreCOL );
LUA_DECLARE ( EngineReplaceModel );
LUA_DECLARE ( EngineRestoreModel );
LUA_DECLARE ( EngineReplaceMatchingAtomics );
LUA_DECLARE ( EngineReplaceWheelAtomics );
LUA_DECLARE ( EnginePositionAtomic );
LUA_DECLARE ( EnginePositionSeats );
LUA_DECLARE ( EngineAddAllAtomics );
LUA_DECLARE ( EngineReplaceVehiclePart );
LUA_DECLARE ( EngineGetModelLODDistance );
LUA_DECLARE ( EngineSetModelLODDistance );
LUA_DECLARE ( EngineSetAsynchronousLoading );
LUA_DECLARE ( EngineApplyShaderToWorldTexture );
LUA_DECLARE ( EngineRemoveShaderFromWorldTexture );
LUA_DECLARE ( EngineGetModelNameFromID );
LUA_DECLARE ( EngineGetModelIDFromName );
LUA_DECLARE ( EngineGetModelTextureNames );
LUA_DECLARE ( EngineGetVisibleTextureNames );

// Util functions to make scripting easier for the end user
// Some of these are based on standard mIRC script funcs as a lot of people will be used to them
LUA_DECLARE ( GetTok );
Expand All @@ -136,131 +111,6 @@ class CLuaFunctionDefs
LUA_DECLARE ( SetDevelopmentMode );
LUA_DECLARE ( GetDevelopmentMode );

// GUI funcs
LUA_DECLARE ( GUIGetInputEnabled );
LUA_DECLARE ( GUIGetInputMode );
LUA_DECLARE ( GUISetInputEnabled );
LUA_DECLARE ( GUISetInputMode );
LUA_DECLARE ( GUIIsChatBoxInputActive );
LUA_DECLARE ( GUIIsConsoleActive );
LUA_DECLARE ( GUIIsDebugViewActive );
LUA_DECLARE ( GUIIsMainMenuActive );
LUA_DECLARE ( GUIIsMTAWindowActive );
LUA_DECLARE ( GUIIsTransferBoxActive );
LUA_DECLARE ( GUICreateWindow );
LUA_DECLARE ( GUICreateLabel );
LUA_DECLARE ( GUICreateButton );
LUA_DECLARE ( GUICreateEdit );
LUA_DECLARE ( GUICreateMemo );
LUA_DECLARE ( GUICreateGridList );
LUA_DECLARE ( GUICreateScrollBar );
LUA_DECLARE ( GUICreateScrollPane );
LUA_DECLARE ( GUICreateTabPanel );
LUA_DECLARE ( GUICreateTab );
LUA_DECLARE ( GUICreateProgressBar );
LUA_DECLARE ( GUICreateCheckBox );
LUA_DECLARE ( GUICreateRadioButton );
LUA_DECLARE ( GUICreateStaticImage );
LUA_DECLARE ( GUICreateFont );
LUA_DECLARE ( GUIStaticImageLoadImage );
LUA_DECLARE ( GUIStaticImageGetNativeSize );
LUA_DECLARE ( GUIGetSelectedTab );
LUA_DECLARE ( GUISetSelectedTab );
LUA_DECLARE ( GUIDeleteTab );
LUA_DECLARE ( GUIScrollBarSetScrollPosition );
LUA_DECLARE ( GUIScrollBarGetScrollPosition );
LUA_DECLARE ( GUIGridListSetSortingEnabled );
LUA_DECLARE ( GUIGridListAddColumn );
LUA_DECLARE ( GUIGridListRemoveColumn );
LUA_DECLARE ( GUIGridListSetColumnWidth );
LUA_DECLARE ( GUIGridListGetColumnWidth );
LUA_DECLARE ( GUIGridListSetColumnTitle );
LUA_DECLARE ( GUIGridListGetColumnTitle );
LUA_DECLARE ( GUIGridListSetScrollBars );
LUA_DECLARE ( GUIGridListGetRowCount );
LUA_DECLARE ( GUIGridListGetColumnCount );
LUA_DECLARE ( GUIGridListAddRow );
LUA_DECLARE ( GUIGridListInsertRowAfter );
LUA_DECLARE ( GUIGridListRemoveRow );
LUA_DECLARE ( GUIGridListAutoSizeColumn );
LUA_DECLARE ( GUIGridListClear );
LUA_DECLARE ( GUIGridListSetItemText );
LUA_DECLARE ( GUIGridListGetItemText );
LUA_DECLARE ( GUIGridListSetItemData );
LUA_DECLARE ( GUIGridListGetItemData );
LUA_DECLARE ( GUIGridListSetItemColor );
LUA_DECLARE ( GUIGridListGetItemColor );
LUA_DECLARE ( GUIGridListSetSelectionMode );
LUA_DECLARE ( GUIGridListGetSelectedItem );
LUA_DECLARE ( GUIGridListGetSelectedItems );
LUA_DECLARE ( GUIGridListGetSelectedCount );
LUA_DECLARE ( GUIGridListSetSelectedItem );
LUA_DECLARE ( GUIGridListSetHorizontalScrollPosition );
LUA_DECLARE ( GUIGridListGetHorizontalScrollPosition );
LUA_DECLARE ( GUIGridListSetVerticalScrollPosition );
LUA_DECLARE ( GUIGridListGetVerticalScrollPosition );
LUA_DECLARE ( GUIScrollPaneSetScrollBars );
LUA_DECLARE ( GUIScrollPaneSetHorizontalScrollPosition );
LUA_DECLARE ( GUIScrollPaneGetHorizontalScrollPosition );
LUA_DECLARE ( GUIScrollPaneSetVerticalScrollPosition );
LUA_DECLARE ( GUIScrollPaneGetVerticalScrollPosition );
LUA_DECLARE ( GUIDestroyElement );
LUA_DECLARE ( GUISetEnabled );
LUA_DECLARE ( GUISetText );
LUA_DECLARE ( GUISetFont );
LUA_DECLARE ( GUISetSize );
LUA_DECLARE ( GUISetPosition );
LUA_DECLARE ( GUISetVisible );
LUA_DECLARE ( GUISetAlpha );
LUA_DECLARE ( GUISetProperty );
LUA_DECLARE ( GUIBringToFront );
LUA_DECLARE ( GUIMoveToBack );
LUA_DECLARE ( GUICheckBoxSetSelected );
LUA_DECLARE ( GUIRadioButtonSetSelected );
LUA_DECLARE ( GUIGetEnabled );
LUA_DECLARE ( GUIGetText );
LUA_DECLARE ( GUIGetFont );
LUA_DECLARE ( GUIGetSize );
LUA_DECLARE ( GUIGetPosition );
LUA_DECLARE ( GUIGetVisible );
LUA_DECLARE ( GUIGetAlpha );
LUA_DECLARE ( GUIGetProperty );
LUA_DECLARE ( GUIGetProperties );
LUA_DECLARE ( GUICheckBoxGetSelected );
LUA_DECLARE ( GUIRadioButtonGetSelected );
LUA_DECLARE ( GUIGetScreenSize );
LUA_DECLARE ( GUIProgressBarSetProgress );
LUA_DECLARE ( GUIProgressBarGetProgress );
LUA_DECLARE ( GUIEditSetReadOnly );
LUA_DECLARE ( GUIEditSetMasked );
LUA_DECLARE ( GUIEditSetMaxLength );
LUA_DECLARE ( GUIEditSetCaretIndex );
LUA_DECLARE ( GUIEditGetCaretIndex );
LUA_DECLARE ( GUIMemoSetReadOnly );
LUA_DECLARE ( GUIMemoSetCaretIndex );
LUA_DECLARE ( GUIMemoGetCaretIndex );
LUA_DECLARE ( GUIWindowSetMovable );
LUA_DECLARE ( GUIWindowSetSizable );
LUA_DECLARE ( GUIWindowGetMovable );
LUA_DECLARE ( GUIWindowGetSizable );
LUA_DECLARE ( GUIWindowGetCloseButtonEnabled );
LUA_DECLARE ( GUIWindowGetTitleBarEnabled );
LUA_DECLARE ( GUILabelSetColor );
LUA_DECLARE ( GUILabelGetColor );
LUA_DECLARE ( GUILabelSetVerticalAlign );
LUA_DECLARE ( GUILabelSetHorizontalAlign );
LUA_DECLARE ( GUILabelGetTextExtent );
LUA_DECLARE ( GUILabelGetFontHeight );
LUA_DECLARE ( GUIGetChatboxLayout );
LUA_DECLARE ( GUICreateComboBox );
LUA_DECLARE ( GUIComboBoxAddItem );
LUA_DECLARE ( GUIComboBoxRemoveItem );
LUA_DECLARE ( GUIComboBoxClear );
LUA_DECLARE ( GUIComboBoxGetSelected );
LUA_DECLARE ( GUIComboBoxSetSelected );
LUA_DECLARE ( GUIComboBoxGetItemText );
LUA_DECLARE ( GUIComboBoxSetItemText );

// World functions
LUA_DECLARE ( GetTime_ );
LUA_DECLARE ( GetGroundPosition );
Expand Down

0 comments on commit c0a0662

Please sign in to comment.