Skip to content

Commit

Permalink
Clean up client Effect/Timer/XML luadefs
Browse files Browse the repository at this point in the history
  • Loading branch information
@qaisjp
qaisjp committed Jul 31, 2016
1 parent c0a0662 commit c52da7b
Show file tree
Hide file tree
Showing 14 changed files with 1,619 additions and 1,607 deletions.
6 changes: 4 additions & 2 deletions MTA10/mods/deathmatch/StdInc.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -113,10 +113,10 @@
#include <luadefs/CLuaCameraDefs.h>
#include <luadefs/CLuaColShapeDefs.h>
#include <luadefs/CLuaDrawingDefs.h>
#include <luadefs/CLuaEffectDefs.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>
Expand All @@ -131,12 +131,14 @@
#include <luadefs/CLuaSearchLightDefs.h>
#include <luadefs/CLuaTaskDefs.h>
#include <luadefs/CLuaTeamDefs.h>
#include <luadefs/CLuaWaterDefs.h>
#include <luadefs/CLuaTimerDefs.h>
#include <luadefs/CLuaVector2Defs.h>
#include <luadefs/CLuaVector3Defs.h>
#include <luadefs/CLuaVector4Defs.h>
#include <luadefs/CLuaVehicleDefs.h>
#include <luadefs/CLuaWaterDefs.h>
#include <luadefs/CLuaWeaponDefs.h>
#include <luadefs/CLuaXMLDefs.h>
#include <CRemoteCalls.h>

// Shared includes
Expand Down
9 changes: 6 additions & 3 deletions MTA10/mods/deathmatch/_Deathmatch 2008.vcxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -372,6 +372,7 @@
<ClCompile Include="..\shared_logic\luadefs\CLuaCameraDefs.cpp" />
<ClCompile Include="..\shared_logic\luadefs\CLuaColShapeDefs.cpp" />
<ClCompile Include="..\shared_logic\luadefs\CLuaDrawingDefs.cpp" />
<ClCompile Include="..\shared_logic\luadefs\CLuaEffectDefs.cpp" />
<ClCompile Include="..\shared_logic\luadefs\CLuaElementDefs.cpp" />
<ClCompile Include="..\shared_logic\luadefs\CLuaEngineDefs.cpp" />
<ClCompile Include="..\shared_logic\luadefs\CLuaGUIDefs.cpp" />
Expand All @@ -386,12 +387,14 @@
<ClCompile Include="..\shared_logic\luadefs\CLuaResourceDefs.cpp" />
<ClCompile Include="..\shared_logic\luadefs\CLuaSearchLightDefs.cpp" />
<ClCompile Include="..\shared_logic\luadefs\CLuaTeamDefs.cpp" />
<ClCompile Include="..\shared_logic\luadefs\CLuaTimerDefs.cpp" />
<ClCompile Include="..\shared_logic\luadefs\CLuaVector2Defs.cpp" />
<ClCompile Include="..\shared_logic\luadefs\CLuaVector3Defs.cpp" />
<ClCompile Include="..\shared_logic\luadefs\CLuaVector4Defs.cpp" />
<ClCompile Include="..\shared_logic\luadefs\CLuaVehicleDefs.cpp" />
<ClCompile Include="..\shared_logic\luadefs\CLuaWaterDefs.cpp" />
<ClCompile Include="..\shared_logic\luadefs\CLuaWeaponDefs.cpp" />
<ClCompile Include="..\shared_logic\luadefs\CLuaXMLDefs.cpp" />
<ClCompile Include="..\shared_logic\lua\CLuaVector2.cpp" />
<ClCompile Include="..\shared_logic\lua\CLuaVector3.cpp" />
<ClCompile Include="..\shared_logic\lua\CLuaVector4.cpp" />
Expand Down Expand Up @@ -586,7 +589,6 @@
<ClCompile Include="..\shared_logic\lua\CLuaFunctionDefs.Util.cpp" />
<ClCompile Include="..\shared_logic\lua\CLuaFunctionDefs.Voice.cpp" />
<ClCompile Include="..\shared_logic\lua\CLuaFunctionDefs.World.cpp" />
<ClCompile Include="..\shared_logic\lua\CLuaFunctionDefs.XML.cpp" />
<ClCompile Include="..\shared_logic\lua\CLuaFunctionParseHelpers.cpp" />
<ClCompile Include="..\shared_logic\lua\CLuaFunctionRef.cpp" />
<ClCompile Include="..\shared_logic\lua\CLuaMain.cpp" />
Expand All @@ -599,7 +601,6 @@
<ClCompile Include="..\shared_logic\luadefs\CLuaClassDefs.cpp" />
<ClCompile Include="..\shared_logic\luadefs\CLuaDefs.cpp" />
<ClCompile Include="..\shared_logic\luadefs\CLuaFileDefs.cpp" />
<ClCompile Include="..\shared_logic\luadefs\CLuaFxDefs.cpp" />
<ClCompile Include="..\shared_logic\luadefs\CLuaMatrixDefs.cpp" />
<ClCompile Include="..\shared_logic\luadefs\CLuaTaskDefs.cpp" />
<ClCompile Include="..\..\..\vendor\bob_withers\base64.cpp" />
Expand Down Expand Up @@ -763,6 +764,7 @@
<ClInclude Include="..\shared_logic\luadefs\CLuaCameraDefs.h" />
<ClInclude Include="..\shared_logic\luadefs\CLuaColShapeDefs.h" />
<ClInclude Include="..\shared_logic\luadefs\CLuaDrawingDefs.h" />
<ClInclude Include="..\shared_logic\luadefs\CLuaEffectDefs.h" />
<ClInclude Include="..\shared_logic\luadefs\CLuaElementDefs.h" />
<ClInclude Include="..\shared_logic\luadefs\CLuaEngineDefs.h" />
<ClInclude Include="..\shared_logic\luadefs\CLuaGUIDefs.h" />
Expand All @@ -777,12 +779,14 @@
<ClInclude Include="..\shared_logic\luadefs\CLuaResourceDefs.h" />
<ClInclude Include="..\shared_logic\luadefs\CLuaSearchLightDefs.h" />
<ClInclude Include="..\shared_logic\luadefs\CLuaTeamDefs.h" />
<ClInclude Include="..\shared_logic\luadefs\CLuaTimerDefs.h" />
<ClInclude Include="..\shared_logic\luadefs\CLuaVector2Defs.h" />
<ClInclude Include="..\shared_logic\luadefs\CLuaVector3Defs.h" />
<ClInclude Include="..\shared_logic\luadefs\CLuaVector4Defs.h" />
<ClInclude Include="..\shared_logic\luadefs\CLuaVehicleDefs.h" />
<ClInclude Include="..\shared_logic\luadefs\CLuaWaterDefs.h" />
<ClInclude Include="..\shared_logic\luadefs\CLuaWeaponDefs.h" />
<ClInclude Include="..\shared_logic\luadefs\CLuaXMLDefs.h" />
<ClInclude Include="..\shared_logic\lua\CLuaVector2.h" />
<ClInclude Include="..\shared_logic\lua\CLuaVector3.h" />
<ClInclude Include="..\shared_logic\lua\CLuaVector4.h" />
Expand Down Expand Up @@ -1001,7 +1005,6 @@
<ClInclude Include="..\shared_logic\luadefs\CLuaClassDefs.h" />
<ClInclude Include="..\shared_logic\luadefs\CLuaDefs.h" />
<ClInclude Include="..\shared_logic\luadefs\CLuaFileDefs.h" />
<ClInclude Include="..\shared_logic\luadefs\CLuaFxDefs.h" />
<ClInclude Include="..\shared_logic\luadefs\CLuaMatrixDefs.h" />
<ClInclude Include="..\shared_logic\luadefs\CLuaTaskDefs.h" />
<ClInclude Include="..\shared_logic\lua\oopdefs\CLuaOOPDefs.h" />
Expand Down
27 changes: 18 additions & 9 deletions MTA10/mods/deathmatch/_Deathmatch 2008.vcxproj.filters
View file
Original file line number Diff line number Diff line change
Expand Up @@ -593,9 +593,6 @@
<ClCompile Include="..\shared_logic\lua\CLuaFunctionDefs.World.cpp">
<Filter>Source Files\shared_logic\lua</Filter>
</ClCompile>
<ClCompile Include="..\shared_logic\lua\CLuaFunctionDefs.XML.cpp">
<Filter>Source Files\shared_logic\lua</Filter>
</ClCompile>
<ClCompile Include="..\shared_logic\lua\CLuaFunctionParseHelpers.cpp">
<Filter>Source Files\shared_logic\lua</Filter>
</ClCompile>
Expand Down Expand Up @@ -632,9 +629,6 @@
<ClCompile Include="..\shared_logic\luadefs\CLuaFileDefs.cpp">
<Filter>Source Files\shared_logic\luadefs</Filter>
</ClCompile>
<ClCompile Include="..\shared_logic\luadefs\CLuaFxDefs.cpp">
<Filter>Source Files\shared_logic\luadefs</Filter>
</ClCompile>
<ClCompile Include="..\shared_logic\luadefs\CLuaMatrixDefs.cpp">
<Filter>Source Files\shared_logic\luadefs</Filter>
</ClCompile>
Expand Down Expand Up @@ -926,6 +920,15 @@
<ClCompile Include="..\shared_logic\luadefs\CLuaGUIDefs.cpp">
<Filter>Source Files\shared_logic\luadefs</Filter>
</ClCompile>
<ClCompile Include="..\shared_logic\luadefs\CLuaTimerDefs.cpp">
<Filter>Source Files\shared_logic\luadefs</Filter>
</ClCompile>
<ClCompile Include="..\shared_logic\luadefs\CLuaXMLDefs.cpp">
<Filter>Source Files\shared_logic\luadefs</Filter>
</ClCompile>
<ClCompile Include="..\shared_logic\luadefs\CLuaEffectDefs.cpp">
<Filter>Source Files\shared_logic\luadefs</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup>
<ClInclude Include="CClient.h">
Expand Down Expand Up @@ -1567,9 +1570,6 @@
<ClInclude Include="..\shared_logic\luadefs\CLuaFileDefs.h">
<Filter>Header Files\shared_logic\luadefs</Filter>
</ClInclude>
<ClInclude Include="..\shared_logic\luadefs\CLuaFxDefs.h">
<Filter>Header Files\shared_logic\luadefs</Filter>
</ClInclude>
<ClInclude Include="..\shared_logic\luadefs\CLuaMatrixDefs.h">
<Filter>Header Files\shared_logic\luadefs</Filter>
</ClInclude>
Expand Down Expand Up @@ -1720,6 +1720,15 @@
<ClInclude Include="..\shared_logic\luadefs\CLuaGUIDefs.h">
<Filter>Header Files\shared_logic\luadefs</Filter>
</ClInclude>
<ClInclude Include="..\shared_logic\luadefs\CLuaTimerDefs.h">
<Filter>Header Files\shared_logic\luadefs</Filter>
</ClInclude>
<ClInclude Include="..\shared_logic\luadefs\CLuaXMLDefs.h">
<Filter>Header Files\shared_logic\luadefs</Filter>
</ClInclude>
<ClInclude Include="..\shared_logic\luadefs\CLuaEffectDefs.h">
<Filter>Header Files\shared_logic\luadefs</Filter>
</ClInclude>
</ItemGroup>
<ItemGroup>
<None Include="..\..\..\Shared\mods\deathmatch\logic\luascripts\coroutine_debug.lua">
Expand Down
187 changes: 0 additions & 187 deletions MTA10/mods/shared_logic/lua/CLuaFunctionDefs.Util.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -136,193 +136,6 @@ int CLuaFunctionDefs::Split ( lua_State* luaVM )
return 1;
}


int CLuaFunctionDefs::SetTimer ( lua_State* luaVM )
{
// timer setTimer ( function theFunction, int timeInterval, int timesToExecute, [ var arguments... ] )
CLuaFunctionRef iLuaFunction; double dTimeInterval; uint uiTimesToExecute; CLuaArguments Arguments;

CScriptArgReader argStream ( luaVM );
argStream.ReadFunction ( iLuaFunction );
argStream.ReadNumber ( dTimeInterval );
argStream.ReadNumber ( uiTimesToExecute );
argStream.ReadLuaArguments ( Arguments );
argStream.ReadFunctionComplete ();

if ( !argStream.HasErrors () )
{
CLuaMain * luaMain = m_pLuaManager->GetVirtualMachine ( luaVM );
if ( luaMain )
{
// Check for the minimum interval
if ( dTimeInterval < LUA_TIMER_MIN_INTERVAL )
{
argStream.SetCustomError( "Interval is below 50" );
}
else
{
CLuaTimer* pLuaTimer = luaMain->GetTimerManager ()->AddTimer ( iLuaFunction, CTickCount ( dTimeInterval ), uiTimesToExecute, Arguments );
if ( pLuaTimer )
{
// Set our timer debug info (in case we don't have any debug info which is usually when you do setTimer(destroyElement, 50, 1) or such)
pLuaTimer->SetLuaDebugInfo ( g_pClientGame->GetScriptDebugging()->GetLuaDebugInfo( luaVM ) );

lua_pushtimer ( luaVM, pLuaTimer );
return 1;
}
}
}
}
if ( argStream.HasErrors () )
m_pScriptDebugging->LogCustom ( luaVM, argStream.GetFullErrorMessage() );

lua_pushboolean ( luaVM, false );
return 1;
}


int CLuaFunctionDefs::KillTimer ( lua_State* luaVM )
{
// bool killTimer ( timer theTimer )
CLuaTimer* pLuaTimer;

CScriptArgReader argStream ( luaVM );
argStream.ReadUserData ( pLuaTimer );

if ( !argStream.HasErrors () )
{
CLuaMain * luaMain = m_pLuaManager->GetVirtualMachine ( luaVM );
if ( luaMain )
{
luaMain->GetTimerManager ()->RemoveTimer ( pLuaTimer );

lua_pushboolean ( luaVM, true );
return 1;
}
}
else
m_pScriptDebugging->LogCustom ( luaVM, argStream.GetFullErrorMessage() );

lua_pushboolean ( luaVM, false );
return 1;
}


int CLuaFunctionDefs::ResetTimer ( lua_State* luaVM )
{
// bool resetTimer ( timer theTimer )
CLuaTimer* pLuaTimer;

CScriptArgReader argStream ( luaVM );
argStream.ReadUserData ( pLuaTimer );

if ( !argStream.HasErrors () )
{
CLuaMain * luaMain = m_pLuaManager->GetVirtualMachine ( luaVM );
if ( luaMain )
{
luaMain->GetTimerManager ()->ResetTimer ( pLuaTimer );

lua_pushboolean ( luaVM, true );
return 1;
}
}
else
m_pScriptDebugging->LogCustom ( luaVM, argStream.GetFullErrorMessage() );

lua_pushboolean ( luaVM, false );
return 1;
}


int CLuaFunctionDefs::GetTimers ( lua_State* luaVM )
{
// table getTimers ( [ time ] )
double dTime;

CScriptArgReader argStream ( luaVM );
argStream.ReadNumber ( dTime, 0 );

if ( !argStream.HasErrors () )
{
// Find our VM
CLuaMain* pLuaMain = m_pLuaManager->GetVirtualMachine ( luaVM );
if ( pLuaMain )
{
// Create a new table
lua_newtable ( luaVM );

// Add all the timers with less than ulTime left
CLuaTimerManager* pLuaTimerManager = pLuaMain->GetTimerManager ();
CTickCount llCurrentTime = CTickCount::Now ();
unsigned int uiIndex = 0;
CFastList < CLuaTimer* > ::const_iterator iter = pLuaTimerManager->IterBegin ();
for ( ; iter != pLuaTimerManager->IterEnd () ; iter++ )
{
CLuaTimer* pLuaTimer = *iter;

// If the time left is less than the time specified, or the time specifed is 0
CTickCount llTimeLeft = ( pLuaTimer->GetStartTime () + pLuaTimer->GetDelay () ) - llCurrentTime;
if ( dTime == 0 || llTimeLeft.ToDouble () <= dTime )
{
// Add it to the table
lua_pushnumber ( luaVM, ++uiIndex );
lua_pushtimer ( luaVM, pLuaTimer );
lua_settable ( luaVM, -3 );
}
}
return 1;
}
}
else
m_pScriptDebugging->LogCustom ( luaVM, argStream.GetFullErrorMessage() );

lua_pushboolean ( luaVM, false );
return 1;
}


int CLuaFunctionDefs::IsTimer ( lua_State* luaVM )
{
// bool isTimer ( timer theTimer )
CLuaTimer* pLuaTimer;

CScriptArgReader argStream ( luaVM );
argStream.ReadUserData ( pLuaTimer );

if ( !argStream.HasErrors () )
{
lua_pushboolean ( luaVM, true );
return 1;
}

lua_pushboolean ( luaVM, false );
return 1;
}

int CLuaFunctionDefs::GetTimerDetails ( lua_State* luaVM )
{
// int, int, int getTimerDetails ( timer theTimer )
CLuaTimer* pLuaTimer;

CScriptArgReader argStream ( luaVM );
argStream.ReadUserData ( pLuaTimer );

if ( !argStream.HasErrors () )
{
lua_pushnumber( luaVM, pLuaTimer->GetTimeLeft ().ToDouble () );
lua_pushnumber( luaVM, pLuaTimer->GetRepeats () );
lua_pushnumber( luaVM, pLuaTimer->GetDelay ().ToDouble () );
return 3;
}
else
m_pScriptDebugging->LogCustom ( luaVM, argStream.GetFullErrorMessage() );

lua_pushboolean ( luaVM, false );
return 1;
}


int CLuaFunctionDefs::GetTickCount_ ( lua_State* luaVM )
{
double dCount;
Expand Down
25 changes: 0 additions & 25 deletions MTA10/mods/shared_logic/lua/CLuaFunctionDefs.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -95,12 +95,6 @@ class CLuaFunctionDefs
// Some of these are based on standard mIRC script funcs as a lot of people will be used to them
LUA_DECLARE ( GetTok );
LUA_DECLARE ( Split );
LUA_DECLARE ( SetTimer );
LUA_DECLARE ( KillTimer );
LUA_DECLARE ( ResetTimer );
LUA_DECLARE ( GetTimers );
LUA_DECLARE ( IsTimer );
LUA_DECLARE ( GetTimerDetails );
LUA_DECLARE ( GetTickCount_ );
LUA_DECLARE ( GetCTime );
LUA_DECLARE ( tocolor );
Expand Down Expand Up @@ -219,25 +213,6 @@ class CLuaFunctionDefs
LUA_DECLARE ( ToggleControl );
LUA_DECLARE ( ToggleAllControls );

// XML Functions
LUA_DECLARE ( XMLNodeFindChild );
LUA_DECLARE ( XMLNodeGetChildren );
LUA_DECLARE ( XMLNodeGetValue );
LUA_DECLARE ( XMLNodeSetValue );
LUA_DECLARE ( XMLNodeGetAttributes );
LUA_DECLARE ( XMLNodeGetAttribute );
LUA_DECLARE ( XMLNodeSetAttribute );
LUA_DECLARE ( XMLNodeGetParent );
LUA_DECLARE ( XMLLoadFile );
LUA_DECLARE ( XMLCreateFile );
LUA_DECLARE ( XMLUnloadFile );
LUA_DECLARE ( XMLSaveFile );
LUA_DECLARE ( XMLCreateChild );
LUA_DECLARE ( XMLDestroyNode );
LUA_DECLARE ( XMLCopyFile );
LUA_DECLARE ( XMLNodeGetName );
LUA_DECLARE ( XMLNodeSetName );

// Command funcs
LUA_DECLARE ( AddCommandHandler );
LUA_DECLARE ( RemoveCommandHandler );
Expand Down

0 comments on commit c52da7b

Please sign in to comment.