speed-dreams/speed-dreams-code
6
1
Fork 1
Code Issues 9 Pull requests Projects Releases Packages Wiki Activity Actions

- update raceinit

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

Former-commit-id: c150948b7501660a060dcaa9c03c89f18b1e2982
Former-commit-id: 0a33d7c19bb41e580e45a201ff5305e0b67b7114
This commit is contained in:
torcs-ng 2015-07-27 19:37:46 +00:00
parent e7f55cb4c1
commit 1e31db3d2a
2 changed files with 650 additions and 614 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1259
src/modules/racing/genparoptv1/raceinit.cpp
View file

File diff suppressed because it is too large Load diff

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

@ -652,7 +652,8 @@ static tCarElt* reLoadSingleCar( int carindex, int listindex, int modindex, int
} }
category = GfParmGetStr(carhdle, SECT_CAR, PRM_CATEGORY, NULL); category = GfParmGetStr(carhdle, SECT_CAR, PRM_CATEGORY, NULL);
if (category) { if (category)
{
GfLogTrace("Checking/Merging %s specs into %s base setup for %s ...\n", GfLogTrace("Checking/Merging %s specs into %s base setup for %s ...\n",
category, elt->_carName, curModInfo->name); category, elt->_carName, curModInfo->name);
strncpy(elt->_category, category, MAX_NAME_LEN - 1); strncpy(elt->_category, category, MAX_NAME_LEN - 1);
@ -661,6 +662,7 @@ static tCarElt* reLoadSingleCar( int carindex, int listindex, int modindex, int
snprintf(buf2, sizeof(buf2), "cars/categories/%s.xml", elt->_category); snprintf(buf2, sizeof(buf2), "cars/categories/%s.xml", elt->_category);
cathdle = GfParmReadFile(buf2, GFPARM_RMODE_STD | GFPARM_RMODE_CREAT); cathdle = GfParmReadFile(buf2, GFPARM_RMODE_STD | GFPARM_RMODE_CREAT);
int errorcode = 0; int errorcode = 0;
if ((errorcode = GfParmCheckHandle(cathdle, carhdle))) if ((errorcode = GfParmCheckHandle(cathdle, carhdle)))
{ {
switch (errorcode) switch (errorcode)
@ -683,6 +685,7 @@ static tCarElt* reLoadSingleCar( int carindex, int listindex, int modindex, int
} }
return NULL; return NULL;
} }
carhdle = GfParmMergeHandles(cathdle, carhdle, carhdle = GfParmMergeHandles(cathdle, carhdle,
GFPARM_MMODE_SRC | GFPARM_MMODE_DST | GFPARM_MMODE_RELSRC | GFPARM_MMODE_RELDST); GFPARM_MMODE_SRC | GFPARM_MMODE_DST | GFPARM_MMODE_RELSRC | GFPARM_MMODE_RELDST);