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

Fixes #647 (Liveries selector not working for 'normal' races)

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

Former-commit-id: 5fe0de630b72603875654ee4728c6b8c78b6e554
Former-commit-id: ccb8a1b23e464c83bfd22852015620a27b4bcfea
This commit is contained in:
pouillot 2012-03-31 14:45:22 +00:00
parent 4614d6bb0e
commit 2b4d04ad2e
1 changed files with 9 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/libs/raceengine/racemain.cpp
View file

@ -824,7 +824,8 @@ ReRaceStart(void)
// non-timed Qualification or Practice session => 1 driver at a time = the "current" one. // non-timed Qualification or Practice session => 1 driver at a time = the "current" one.
int nCurrDrvInd = int nCurrDrvInd =
(int)GfParmGetNum(results, RE_SECT_CURRENT, RE_ATTR_CUR_DRIVER, NULL, 1); (int)GfParmGetNum(results, RE_SECT_CURRENT, RE_ATTR_CUR_DRIVER, NULL, 1);
if (nCurrDrvInd == -1) return RM_ERROR; if (nCurrDrvInd == -1)
return RM_ERROR;
if (nCurrDrvInd == 1) if (nCurrDrvInd == 1)
ReUI().addLoadingMessage("Preparing Starting Grid ..."); ReUI().addLoadingMessage("Preparing Starting Grid ...");
@ -853,9 +854,11 @@ ReRaceStart(void)
int currDriver = -1; int currDriver = -1;
int aCars = 0; int aCars = 0;
for (int i = 1; i < nCars + 1; i++) { for (int i = 1; i < nCars + 1; i++)
{
currDriver = ReStartingOrderIdx[i-1]; currDriver = ReStartingOrderIdx[i-1];
if (currDriver == -1) continue; if (currDriver == -1)
continue;
aCars++; aCars++;
snprintf(path, sizeof(path), "%s/%d", RM_SECT_DRIVERS, currDriver); snprintf(path, sizeof(path), "%s/%d", RM_SECT_DRIVERS, currDriver);
snprintf(path2, sizeof(path2), "%s/%d", RM_SECT_DRIVERS_RACING, i); snprintf(path2, sizeof(path2), "%s/%d", RM_SECT_DRIVERS_RACING, i);
@ -867,13 +870,14 @@ ReRaceStart(void)
GfParmGetNum(params, path, RM_ATTR_EXTENDED, NULL, 0)); GfParmGetNum(params, path, RM_ATTR_EXTENDED, NULL, 0));
GfParmSetNum(params, path2, RM_ATTR_SKINTARGETS, NULL, GfParmSetNum(params, path2, RM_ATTR_SKINTARGETS, NULL,
GfParmGetNum(params, path, RM_ATTR_SKINTARGETS, NULL, 0)); GfParmGetNum(params, path, RM_ATTR_SKINTARGETS, NULL, 0));
if (GfParmGetStr(results, path, RM_ATTR_SKINNAME, 0)) if (GfParmGetStr(params, path, RM_ATTR_SKINNAME, 0))
GfParmSetStr(params, path2, RM_ATTR_SKINNAME, GfParmSetStr(params, path2, RM_ATTR_SKINNAME,
GfParmGetStr(params, path, RM_ATTR_SKINNAME, "")); GfParmGetStr(params, path, RM_ATTR_SKINNAME, ""));
} }
//no valid drivers present in the list //no valid drivers present in the list
if (aCars == 0) { if (aCars == 0)
{
GfLogError("No competitor in this race : cancelled.\n"); GfLogError("No competitor in this race : cancelled.\n");
mode = RM_ERROR; mode = RM_ERROR;
} }