Project modernization (#630)
* Fixed boats falling and a TP glitch #266 * Replaced every C-style cast with C++ ones * Replaced every C-style cast with C++ ones * Fixed boats falling and a TP glitch #266 * Updated NULL to nullptr and fixing some type issues * Modernized and fixed a few bugs - Replaced most instances of `NULL` with `nullptr`. - Replaced most `shared_ptr(new ...)` with `make_shared`. - Removed the `nullptr` macro as it was interfering with the actual nullptr keyword in some instances. * Fixing more conflicts * Replace int loops with size_t and start work on overrides
This commit is contained in:
@@ -4,7 +4,7 @@
|
||||
|
||||
|
||||
|
||||
TLSStorageOrbis* TLSStorageOrbis::m_pInstance = NULL;
|
||||
TLSStorageOrbis* TLSStorageOrbis::m_pInstance = nullptr;
|
||||
|
||||
BOOL TLSStorageOrbis::m_activeList[sc_maxSlots];
|
||||
__thread LPVOID TLSStorageOrbis::m_values[sc_maxSlots];
|
||||
@@ -16,7 +16,7 @@ TLSStorageOrbis::TLSStorageOrbis()
|
||||
for(int i=0;i<sc_maxSlots; i++)
|
||||
{
|
||||
m_activeList[i] = false;
|
||||
m_values[i] = NULL;
|
||||
m_values[i] = nullptr;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -37,7 +37,7 @@ int TLSStorageOrbis::Alloc()
|
||||
if(m_activeList[i] == false)
|
||||
{
|
||||
m_activeList[i] = true;
|
||||
m_values[i] = NULL;
|
||||
m_values[i] = nullptr;
|
||||
return i;
|
||||
}
|
||||
}
|
||||
@@ -50,7 +50,7 @@ BOOL TLSStorageOrbis::Free( DWORD _index )
|
||||
return false; // not been allocated
|
||||
|
||||
m_activeList[_index] = false;
|
||||
m_values[_index] = NULL;
|
||||
m_values[_index] = nullptr;
|
||||
return true;
|
||||
}
|
||||
|
||||
@@ -65,7 +65,7 @@ BOOL TLSStorageOrbis::SetValue( DWORD _index, LPVOID _val )
|
||||
LPVOID TLSStorageOrbis::GetValue( DWORD _index )
|
||||
{
|
||||
if(m_activeList[_index] == false)
|
||||
return NULL;
|
||||
return nullptr;
|
||||
return m_values[_index];
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user