jonny_bro/SilentPatch
1
0
Fork 0
mirror of https://github.com/CookiePLMonster/SilentPatch.git synced 2025-01-01 08:43:01 +05:00
Code Issues Projects Releases Packages Wiki Activity Actions

safer ini reading

Browse source
This commit is contained in:
Silent 2017-04-09 18:13:52 +02:00
parent 40726059f6
commit f170201068
2 changed files with 16 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
SilentPatchSA/SilentPatchSA.cpp
View file

@ -1064,7 +1064,7 @@ void DrawScriptSpritesAndRectangles( uint8_t arg )
orgDrawScriptSpritesAndRectangles( arg ); orgDrawScriptSpritesAndRectangles( arg );
} }
std::vector< std::pair<int32_t, bool> > doubleRearWheelsList; std::vector< std::pair<uint32_t, bool> > doubleRearWheelsList;
void ReadDoubleRearWheels(const wchar_t* pPath) void ReadDoubleRearWheels(const wchar_t* pPath)
{ {
const size_t SCRATCH_PAD_SIZE = 32767; const size_t SCRATCH_PAD_SIZE = 32767;
@ -1073,17 +1073,23 @@ void ReadDoubleRearWheels(const wchar_t* pPath)
GetPrivateProfileSectionW( L"DoubleRearWheels", reader.GetBuffer(), reader.GetSize(), pPath ); GetPrivateProfileSectionW( L"DoubleRearWheels", reader.GetBuffer(), reader.GetSize(), pPath );
while ( const wchar_t* str = reader.GetString() ) while ( const wchar_t* str = reader.GetString() )
{ {
wchar_t textLine[32]; wchar_t textLine[64];
wchar_t* context = nullptr; wchar_t* context = nullptr;
wchar_t* token; wchar_t* token;
wcscpy_s( textLine, str ); wcscpy_s( textLine, str );
token = wcstok_s( textLine, L"=", &context ); token = wcstok_s( textLine, L"=", &context );
int toList = _wtoi( token ); uint32_t toList = wcstoul( token, nullptr, 0 );
if ( toList != 0 ) if ( toList == 0 ) continue;
wchar_t* begin = wcstok_s( nullptr, L"=", &context );
if ( begin == nullptr ) continue;
wchar_t* end = nullptr;
bool value = wcstoul( begin, &end, 0 ) != 0;
if ( begin != end )
{ {
bool value = _wtoi( wcstok_s( nullptr, L"=", &context ) ) != 0;
doubleRearWheelsList.emplace_back( toList, value ); doubleRearWheelsList.emplace_back( toList, value );
} }
} }
@ -1097,7 +1103,7 @@ bool __stdcall CheckDoubleRWheelsList( void* modelInfo, uint8_t* handlingData )
if ( modelInfo == lastModelInfo ) return lastResult; if ( modelInfo == lastModelInfo ) return lastResult;
lastModelInfo = modelInfo; lastModelInfo = modelInfo;
ptrdiff_t modelID = std::distance( ms_modelInfoPtrs, std::find( ms_modelInfoPtrs, ms_modelInfoPtrs+m_numModelInfoPtrs, modelInfo ) ); uint32_t modelID = std::distance( ms_modelInfoPtrs, std::find( ms_modelInfoPtrs, ms_modelInfoPtrs+m_numModelInfoPtrs, modelInfo ) );
auto it = std::find_if( doubleRearWheelsList.begin(), doubleRearWheelsList.end(), [modelID]( const auto& item ) { auto it = std::find_if( doubleRearWheelsList.begin(), doubleRearWheelsList.end(), [modelID]( const auto& item ) {
return item.first == modelID; return item.first == modelID;

6
SilentPatchSA/VehicleSA.cpp
View file

@ -7,9 +7,9 @@
#include "TimerSA.h" #include "TimerSA.h"
#include "DelimStringReader.h" #include "DelimStringReader.h"
std::vector<unsigned int> vecRotorExceptions; std::vector<uint32_t> vecRotorExceptions;
static bool ShouldIgnoreRotor( unsigned int id ) static bool ShouldIgnoreRotor( uint32_t id )
{ {
return std::find( vecRotorExceptions.begin(), vecRotorExceptions.end(), id ) != vecRotorExceptions.end(); return std::find( vecRotorExceptions.begin(), vecRotorExceptions.end(), id ) != vecRotorExceptions.end();
} }
@ -78,7 +78,7 @@ void ReadRotorFixExceptions(const wchar_t* pPath)
GetPrivateProfileSectionW( L"RotorFixExceptions", reader.GetBuffer(), reader.GetSize(), pPath ); GetPrivateProfileSectionW( L"RotorFixExceptions", reader.GetBuffer(), reader.GetSize(), pPath );
while ( const wchar_t* str = reader.GetString() ) while ( const wchar_t* str = reader.GetString() )
{ {
unsigned int toList = _wtoi( str ); uint32_t toList = wcstoul( str, nullptr, 0 );
if ( toList != 0 ) if ( toList != 0 )
vecRotorExceptions.push_back( toList ); vecRotorExceptions.push_back( toList );
} }