Remove getTrack/Pos & fileGetPath from luadefs

Author: qaisjp

MTA10_Server/mods/deathmatch/logic/luadefs/CLuaFileDefs.cpp

@@ -33,7 +33,6 @@ void CLuaFileDefs::LoadFunctions ( void )
     CLuaCFunctions::AddFunction ( "fileDelete", fileDelete );
     CLuaCFunctions::AddFunction ( "fileRename", fileRename );
     CLuaCFunctions::AddFunction ( "fileCopy", fileCopy );
-    CLuaCFunctions::AddFunction ( "fileGetPath", fileGetPath );
 }
 
 
@@ -779,45 +778,4 @@ int CLuaFileDefs::fileCopy ( lua_State* luaVM )
     // Failed
     lua_pushboolean ( luaVM, false );
     return 1;
-}
-
-
-int CLuaFileDefs::fileGetPath( lua_State* luaVM )
-{
-    //  string fileGetPath ( file theFile )
-    CScriptFile* pFile;
-
-    CScriptArgReader argStream( luaVM );
-    argStream.ReadUserData( pFile );
-
-    if ( !argStream.HasErrors( ) )
-    {
-        // Grab our lua VM
-        CLuaMain* pLuaMain = m_pLuaManager->GetVirtualMachine( luaVM );
-        if ( pLuaMain )
-        {
-            // We have a resource argument?
-            CResource* pThisResource = pLuaMain->GetResource( );
-            CResource* pFileResource = pFile->GetResource( );
-
-            const SString& strFilePath = pFile->GetFilePath( );
-            SString outPath = strFilePath;
-            
-            // If the calling resource is not the resource the file resides in 
-            // we need to prepend :resourceName to the path
-            if ( pThisResource != pFileResource )
-            {
-                outPath = ":" + pFileResource->GetName() + "/" + outPath;
-            }
-            
-            lua_pushlstring( luaVM, outPath.c_str( ), outPath.length( ) );
-            return 1;
-        }
-    }
-    else
-        m_pScriptDebugging->LogCustom( luaVM, argStream.GetFullErrorMessage( ) );
-
-    // Failed
-    lua_pushboolean( luaVM, false );
-    return 1;
-}
+}

MTA10_Server/mods/deathmatch/logic/luadefs/CLuaFileDefs.h

@@ -36,5 +36,4 @@ class CLuaFileDefs: public CLuaDefs
     LUA_DECLARE ( fileDelete );
     LUA_DECLARE ( fileRename );
     LUA_DECLARE ( fileCopy );
-    LUA_DECLARE ( fileGetPath );
 };

MTA10_Server/mods/deathmatch/logic/luadefs/CLuaVehicleDefs.cpp

@@ -56,8 +56,6 @@ void CLuaVehicleDefs::LoadFunctions()
     CLuaCFunctions::AddFunction ( "isTrainDerailable", IsTrainDerailable );
     CLuaCFunctions::AddFunction ( "getTrainDirection", GetTrainDirection );
     CLuaCFunctions::AddFunction ( "getTrainSpeed", GetTrainSpeed );
-    CLuaCFunctions::AddFunction ( "getTrainTrack", GetTrainTrack );
-    CLuaCFunctions::AddFunction ( "getTrainPosition", GetTrainPosition );
     CLuaCFunctions::AddFunction ( "isVehicleBlown", IsVehicleBlown );
     CLuaCFunctions::AddFunction ( "getVehicleHeadLightColor", GetVehicleHeadLightColor );
     CLuaCFunctions::AddFunction ( "getVehicleDoorOpenRatio", GetVehicleDoorOpenRatio );
@@ -101,8 +99,6 @@ void CLuaVehicleDefs::LoadFunctions()
     CLuaCFunctions::AddFunction ( "setTrainDerailable", SetTrainDerailable );
     CLuaCFunctions::AddFunction ( "setTrainDirection", SetTrainDirection );
     CLuaCFunctions::AddFunction ( "setTrainSpeed", SetTrainSpeed );
-    CLuaCFunctions::AddFunction ( "setTrainTrack", SetTrainTrack );
-    CLuaCFunctions::AddFunction ( "setTrainPosition", SetTrainPosition );
     CLuaCFunctions::AddFunction ( "setVehicleHeadLightColor", SetVehicleHeadLightColor );
     CLuaCFunctions::AddFunction ( "setVehicleTurretPosition", SetVehicleTurretPosition );
     CLuaCFunctions::AddFunction ( "setVehicleDoorOpenRatio", SetVehicleDoorOpenRatio );
@@ -156,8 +152,6 @@ void CLuaVehicleDefs::AddClass ( lua_State* luaVM )
     lua_classfunction ( luaVM, "getSirens", "getVehicleSirens" );
     lua_classfunction ( luaVM, "getDirection", "getTrainDirection" );
     lua_classfunction ( luaVM, "getTrainSpeed", "getTrainSpeed" );
-    lua_classfunction ( luaVM, "getTrack", "getTrainTrack" );
-    lua_classfunction ( luaVM, "getTrainPosition", "getTrainPosition" );
     lua_classfunction ( luaVM, "getHeadLightColor", "getVehicleHeadLightColor" );
     lua_classfunction ( luaVM, "getColor", "getVehicleColor" );
     lua_classfunction ( luaVM, "getCompatibleUpgrades", "getVehicleCompatibleUpgrades" );
@@ -215,8 +209,6 @@ void CLuaVehicleDefs::AddClass ( lua_State* luaVM )
     lua_classfunction ( luaVM, "setDerailable", "setTrainDerailable" );
     lua_classfunction ( luaVM, "setDerailed", "setTrainDerailed" );
     lua_classfunction ( luaVM, "setDirection", "setTrainDirection" );
-    lua_classfunction ( luaVM, "setTrack", "setTrainTrack" );
-    lua_classfunction ( luaVM, "setTrainPosition", "setTrainPosition" );
     lua_classfunction ( luaVM, "setTrainSpeed", "setTrainSpeed" ); // Reduce confusion
 
     lua_classvariable ( luaVM, "damageProof", "setVehicleDamageProof", "isVehicleDamageProof" );
@@ -226,8 +218,6 @@ void CLuaVehicleDefs::AddClass ( lua_State* luaVM )
     lua_classvariable ( luaVM, "blown", "blowVehicle", "isVehicleBlown" );
     lua_classvariable ( luaVM, "direction", "setTrainDirection", "getTrainDirection" );
     lua_classvariable ( luaVM, "trainSpeed", "setTrainSpeed", "getTrainSpeed" );
-    lua_classvariable ( luaVM, "track", "setTrainTrack", "getTrainTrack" );
-    lua_classvariable ( luaVM, "trainPosition", "getTrainPosition", "getTrainPosition" );
     lua_classvariable ( luaVM, "taxiLightOn", "setVehicleTaxiLightOn", "isVehicleTaxiLightOn" );
     lua_classvariable ( luaVM, "fuelTankExplodable", "setVehicleFuelTankExplodable", "isVehicleFuelTankExplodable" );
     lua_classvariable ( luaVM, "plateText", "setVehiclePlateText", "getVehiclePlateText" );
@@ -1715,54 +1705,6 @@ int CLuaVehicleDefs::GetTrainSpeed ( lua_State* luaVM )
 }
 
 
-int CLuaVehicleDefs::GetTrainPosition ( lua_State* luaVM )
-{
-    CVehicle* pVehicle;
-
-    CScriptArgReader argStream ( luaVM );
-    argStream.ReadUserData ( pVehicle );
-
-    if ( !argStream.HasErrors () )
-    {
-        float fPosition;
-        if ( CStaticFunctionDefinitions::GetTrainPosition ( pVehicle, fPosition ) )
-        {
-            lua_pushnumber ( luaVM, fPosition );
-            return 1;
-        }
-    }
-    else
-        m_pScriptDebugging->LogCustom ( luaVM, argStream.GetFullErrorMessage () );
-
-    lua_pushboolean ( luaVM, false );
-    return 1;
-}
-
-
-int CLuaVehicleDefs::GetTrainTrack ( lua_State* luaVM )
-{
-    CVehicle* pVehicle;
-
-    CScriptArgReader argStream ( luaVM );
-    argStream.ReadUserData ( pVehicle );
-
-    if ( !argStream.HasErrors () )
-    {
-        uchar ucTrack;
-        if ( CStaticFunctionDefinitions::GetTrainTrack ( pVehicle, ucTrack ) )
-        {
-            lua_pushnumber ( luaVM, ucTrack );
-            return 1;
-        }
-    }
-    else
-        m_pScriptDebugging->LogCustom ( luaVM, argStream.GetFullErrorMessage () );
-
-    lua_pushboolean ( luaVM, false );
-    return 1;
-}
-
-
 int CLuaVehicleDefs::FixVehicle ( lua_State* luaVM )
 {
     CElement* pElement;
@@ -2766,59 +2708,6 @@ int CLuaVehicleDefs::SetTrainSpeed ( lua_State* luaVM )
 }
 
 
-int CLuaVehicleDefs::SetTrainTrack ( lua_State* luaVM )
-{
-    CVehicle* pVehicle;
-    uchar ucTrack;
-
-    CScriptArgReader argStream ( luaVM );
-    argStream.ReadUserData ( pVehicle );
-    argStream.ReadNumber ( ucTrack );
-
-    if ( !argStream.HasErrors () )
-    {
-        if ( ( ucTrack >= 0 ) && ( ucTrack <= 3 ) ) {
-            if ( CStaticFunctionDefinitions::SetTrainTrack ( pVehicle, ucTrack ) )
-            {
-                lua_pushboolean ( luaVM, true );
-                return 1;
-            }
-        }
-        m_pScriptDebugging->LogCustom ( luaVM, "track number should be between 0 and 3 inclusive" );
-    }
-    else
-        m_pScriptDebugging->LogCustom ( luaVM, argStream.GetFullErrorMessage () );
-
-    lua_pushboolean ( luaVM, false );
-    return 1;
-}
-
-
-int CLuaVehicleDefs::SetTrainPosition ( lua_State* luaVM )
-{
-    CVehicle* pVehicle;
-    float fPosition;
-
-    CScriptArgReader argStream ( luaVM );
-    argStream.ReadUserData ( pVehicle );
-    argStream.ReadNumber ( fPosition );
-
-    if ( !argStream.HasErrors () )
-    {
-        if ( CStaticFunctionDefinitions::SetTrainPosition ( pVehicle, fPosition ) )
-        {
-            lua_pushboolean ( luaVM, true );
-            return 1;
-        }
-    }
-    else
-        m_pScriptDebugging->LogCustom ( luaVM, argStream.GetFullErrorMessage () );
-
-    lua_pushboolean ( luaVM, false );
-    return 1;
-}
-
-
 int CLuaVehicleDefs::SetVehicleHeadLightColor ( lua_State* luaVM )
 {
     CVehicle* pVehicle;

MTA10_Server/mods/deathmatch/logic/luadefs/CLuaVehicleDefs.h

@@ -61,8 +61,6 @@ class CLuaVehicleDefs : public CLuaDefs
     LUA_DECLARE ( IsTrainDerailable );
     LUA_DECLARE ( GetTrainDirection );
     LUA_DECLARE ( GetTrainSpeed );
-    LUA_DECLARE ( GetTrainTrack );
-    LUA_DECLARE ( GetTrainPosition );
     LUA_DECLARE ( IsVehicleBlown );
     LUA_DECLARE ( GetVehicleHeadLightColor );
     LUA_DECLARE ( GetVehicleDoorOpenRatio );
@@ -107,8 +105,6 @@ class CLuaVehicleDefs : public CLuaDefs
     LUA_DECLARE ( SetTrainDerailable );
     LUA_DECLARE ( SetTrainDirection );
     LUA_DECLARE ( SetTrainSpeed );
-    LUA_DECLARE ( SetTrainTrack );
-    LUA_DECLARE ( SetTrainPosition );
     LUA_DECLARE ( SetVehicleHeadLightColor );
     LUA_DECLARE ( SetVehicleTurretPosition );
     LUA_DECLARE ( SetVehicleDoorOpenRatio );