iceflower/speed-dreams-code
1
0
Fork 0
forked from speed-dreams/speed-dreams-code
Code Pull requests Activity

don't merge a car config file with itself

Browse source 
git-svn-id: https://svn.code.sf.net/p/speed-dreams/code/trunk@7026 30fe4595-0a0c-4342-8851-515496e4dcbd

Former-commit-id: fc048b32761ce197c22ba671526b1ca0911973ea
Former-commit-id: b3a0bc1905ecfcbf63c2512e7c9f70905f8a0ade
This commit is contained in:
iobyte 2020-05-06 17:43:26 +00:00
parent 9728e6a84d
commit 581e9c5ed9
1 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/modules/racing/standardgame/raceinit.cpp
View file

@ -715,6 +715,7 @@ static tCarElt* reLoadSingleCar( int carindex, int listindex, int modindex, int
GfParmSetStr (handle, path, RM_ATTR_CARNAME, elt->_carName); GfParmSetStr (handle, path, RM_ATTR_CARNAME, elt->_carName);
GfParmWriteFile (0, handle, "Car names"); GfParmWriteFile (0, handle, "Car names");
GfParmReleaseHandle (handle); GfParmReleaseHandle (handle);
handle = NULL;
} }
if (!(ReInfo->_displayMode & RM_DISP_MODE_SIMU_SIMU)) if (!(ReInfo->_displayMode & RM_DISP_MODE_SIMU_SIMU))
{ {
@ -724,7 +725,7 @@ static tCarElt* reLoadSingleCar( int carindex, int listindex, int modindex, int
} }
else else
handle = NULL; handle = NULL;
if (handle && !replayReplay) { if (handle && handle != carhdle && !replayReplay) {
GfLogTrace("Checking/Merging %s specific setup into %s setup.\n", GfLogTrace("Checking/Merging %s specific setup into %s setup.\n",
curModInfo->name, elt->_carName); curModInfo->name, elt->_carName);
if (GfParmCheckHandle(carhdle, handle)) { if (GfParmCheckHandle(carhdle, handle)) {