[custom-train-tracks] Fixed some crashes

multitheftauto · Jan 31, 2014 · 92a1f42 · 92a1f42
1 parent dc8f3ca
commit 92a1f42
Show file tree

Hide file tree

Showing 6 changed files with 22 additions and 12 deletions.
diff --git a/MTA10/game_sa/CTrainTrackManagerSA.cpp b/MTA10/game_sa/CTrainTrackManagerSA.cpp
@@ -11723,6 +11723,7 @@ CTrainTrackManagerSA::~CTrainTrackManagerSA ( )
     {
         // there are 4 train tracks so delete them all
         delete m_pTrainTracks[i];
+        m_pTrainTracks[i] = NULL;
     }
 }
 
@@ -11786,6 +11787,7 @@ void CTrainTrackManagerSA::Initialise ( )
         MemPut <DWORD> ( 0x6F5C32, (DWORD)&m_fRailTrackLengths ); // 4
         MemPut <DWORD> ( 0x6F745D, (DWORD)&m_fRailTrackLengths ); // 5
         MemPut <DWORD> ( 0x6F8712, (DWORD)&m_fRailTrackLengths ); // 6
+        MemPut <DWORD> ( 0x6F6FE8, (DWORD)&m_fRailTrackLengths ); // 7
 
         // iNumberOfTrackNodes 0xC38014
         MemPut <DWORD> ( 0x6F59EB, (DWORD)&m_dwNumberOfTrackNodes ); // 1
@@ -11947,6 +11949,12 @@ bool CTrainTrackManagerSA::Reallocate ( CTrainTrackSA * pTrainTrack, unsigned in
         GetOriginalRailNode ( 0, i, pNode );
     }
 
+    // Fill gaps with zeroes
+    for ( unsigned int i = uiNodes; i < MAX_TOTAL_TRACKS; ++i )
+    {
+        m_pRailNodePointers[i] = NULL;
+    }
+
     // If there was a previous allocation delete it
     void * pRailNodes = m_pRailNodePointers[dwTrackID];
     if ( pRailNodes != NULL )

diff --git a/MTA10/mods/shared_logic/CClientVehicle.cpp b/MTA10/mods/shared_logic/CClientVehicle.cpp
@@ -131,7 +131,7 @@ CClientVehicle::CClientVehicle ( CClientManager* pManager, ElementID ID, unsigne
     m_bTrainDirection = false;
     m_fTrainSpeed = 0.0f;
     m_fTrainPosition = -1.0f;
-    m_ucTrackID = -1;
+    m_ucTrackID = 0xFF;
     m_bChainEngine = false;
     m_bTaxiLightOn = false;
     m_vecGravity = CVector ( 0.0f, 0.0f, -1.0f );
@@ -2561,10 +2561,10 @@ void CClientVehicle::Create ( void )
             m_pVehicle->SetDerailable ( m_bIsDerailable );
             m_pVehicle->SetTrainDirection ( m_bTrainDirection );
             m_pVehicle->SetTrainSpeed ( m_fTrainSpeed );
-            if ( m_ucTrackID >= 0 )
+            if ( m_ucTrackID != 0xFF )
                 m_pVehicle->SetRailTrack ( m_ucTrackID );
 
-            if ( m_fTrainPosition >= 0 )
+            if ( m_fTrainPosition >= 0.0f )
                 m_pVehicle->SetTrainPosition ( m_fTrainPosition, false );
 
             if ( m_bChainEngine )

diff --git a/MTA10_Server/mods/deathmatch/logic/CTrainTrack.cpp b/MTA10_Server/mods/deathmatch/logic/CTrainTrack.cpp
@@ -31,6 +31,11 @@ CTrainTrack::CTrainTrack( unsigned char ucTrackID, CTrainTrackManager * pManager
     SetTypeName ( "train-track" );
 }
 
+CTrainTrack::~CTrainTrack ( void )
+{
+    m_pManager->UnreferenceTrainTrack ( m_ucTrackID );
+}
+
 SRailNode * CTrainTrack::GetRailNode ( unsigned int uiNode )
 {
     // Make sure we are within the realm of possibility

diff --git a/MTA10_Server/mods/deathmatch/logic/CTrainTrack.h b/MTA10_Server/mods/deathmatch/logic/CTrainTrack.h
@@ -37,6 +37,7 @@ class CTrainTrack : public CElement
     friend class CTrainTrackManager;
 public:
                     CTrainTrack                     ( unsigned char ucTrackID, CTrainTrackManager * pManager, CElement * pParent, CXMLNode * pNode );
+                    ~CTrainTrack                    ( void );
 
 private:
     void            Recalculate                     ( );

diff --git a/MTA10_Server/mods/deathmatch/logic/CTrainTrackManager.cpp b/MTA10_Server/mods/deathmatch/logic/CTrainTrackManager.cpp
@@ -11734,6 +11734,7 @@ CTrainTrackManager::~CTrainTrackManager ( )
     {
         // there are 4 train tracks so delete them all
         delete m_pTrainTracks[i];
+        m_pTrainTracks[i] = NULL;
     }
 }
 
@@ -11760,7 +11761,7 @@ void CTrainTrackManager::Initialise ( )
             else
             {
                 m_pTrainTracks[i] = NULL;
-                DestroyTrainTrack ( i );
+                UnreferenceTrainTrack ( i );
             }
         }
 
@@ -11816,20 +11817,15 @@ CTrainTrack * CTrainTrackManager::CreateTrainTrack ( unsigned int uiNodes, CElem
     return NULL;
 }
 
-bool CTrainTrackManager::DestroyTrainTrack ( DWORD dwTrackID )
+bool CTrainTrackManager::UnreferenceTrainTrack ( DWORD dwTrackID )
 {
     if ( dwTrackID < MAX_TOTAL_TRACKS )
     {
         // Set our data to default
         m_fRailTrackLengths[dwTrackID]      = 0;
         m_dwNumberOfTrackNodes[dwTrackID]   = 1;
 
-        // Delete our train track
-        if ( m_pTrainTracks[dwTrackID] != NULL )
-        {
-            delete m_pTrainTracks[dwTrackID];
-        }
-
+        // Unreference our train track
         m_pTrainTracks[dwTrackID] = NULL;
 
         return true;

diff --git a/MTA10_Server/mods/deathmatch/logic/CTrainTrackManager.h b/MTA10_Server/mods/deathmatch/logic/CTrainTrackManager.h
@@ -36,7 +36,7 @@ class CTrainTrackManager
     CTrainTrack *       CreateTrainTrack                ( unsigned int uiNodes, CElement * pParent, CXMLNode * pNode );
 
 
-    bool                DestroyTrainTrack               ( DWORD dwTrackID );
+    bool                UnreferenceTrainTrack           ( DWORD dwTrackID );
 
 private:
     bool                Reallocate                      ( CTrainTrack * pTrainTrack, unsigned int uiNodes );