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

Display real car name in race loading screen (not the name of the car XML file) + cosmetics and comments

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

Former-commit-id: 391bb620c27e056f08436f550b31a2c58b9a2611
Former-commit-id: 650284d5694edbfea489263a4fc5b8193b0ee6df
This commit is contained in:
pouillot 2009-10-05 21:46:44 +00:00
parent dd9a64d03a
commit f87cbbb13c
2 changed files with 29 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

40
src/libs/raceengineclient/raceinit.cpp
View file

@ -489,7 +489,7 @@ ReInitCars(void)
int focusedIdx; int focusedIdx;
void *params = ReInfo->params; void *params = ReInfo->params;
/* Get the number of cars racing */ /* Get the number of cars (= drivers) racing */
nCars = GfParmGetEltNb(params, RM_SECT_DRIVERS_RACING); nCars = GfParmGetEltNb(params, RM_SECT_DRIVERS_RACING);
GfOut("Loading %d cars\n", nCars); GfOut("Loading %d cars\n", nCars);
@ -501,35 +501,45 @@ ReInitCars(void)
focusedIdx = (int)GfParmGetNum(ReInfo->params, RM_SECT_DRIVERS, RM_ATTR_FOCUSEDIDX, NULL, 0); focusedIdx = (int)GfParmGetNum(ReInfo->params, RM_SECT_DRIVERS, RM_ATTR_FOCUSEDIDX, NULL, 0);
index = 0; index = 0;
/* For each car/driver : */
for (i = 1; i < nCars + 1; i++) { for (i = 1; i < nCars + 1; i++) {
/* Get Shared library name */
/* Get the name of the module (= shared library) of the driver type */
sprintf(path, "%s/%d", RM_SECT_DRIVERS_RACING, i); sprintf(path, "%s/%d", RM_SECT_DRIVERS_RACING, i);
cardllname = GfParmGetStr(ReInfo->params, path, RM_ATTR_MODULE, ""); cardllname = GfParmGetStr(ReInfo->params, path, RM_ATTR_MODULE, "");
robotIdx = (int)GfParmGetNum(ReInfo->params, path, RM_ATTR_IDX, NULL, 0); robotIdx = (int)GfParmGetNum(ReInfo->params, path, RM_ATTR_IDX, NULL, 0);
sprintf(path, "%sdrivers/%s/%s.%s", GetLibDir (), cardllname, cardllname, DLLEXT); sprintf(path, "%sdrivers/%s/%s.%s", GetLibDir (), cardllname, cardllname, DLLEXT);
/* load the robot shared library */ /* Load the driver type shared library */
if (GfModLoad(CAR_IDENT, path, ReInfo->modList)) { if (GfModLoad(CAR_IDENT, path, ReInfo->modList)) {
GfError("Failed to load %s driver\n", path); GfError("Failed to load %s driver\n", path);
break; break;
} }
/* search for corresponding index */ /* Search for the index of the racing driver in the list of interfaces
of the module */
for (j = 0; j < (*(ReInfo->modList))->modInfoSize; j++) { for (j = 0; j < (*(ReInfo->modList))->modInfoSize; j++) {
if ((*(ReInfo->modList))->modInfo[j].name if ((*(ReInfo->modList))->modInfo[j].name
&& (*(ReInfo->modList))->modInfo[j].index == robotIdx) { && (*(ReInfo->modList))->modInfo[j].index == robotIdx) {
/* good robot found */
/* We have the right driver */
curModInfo = &((*(ReInfo->modList))->modInfo[j]); curModInfo = &((*(ReInfo->modList))->modInfo[j]);
GfOut("Driver's name: %s\n", curModInfo->name); GfOut("Driver's name: %s\n", curModInfo->name);
/* retrieve the robot interface (function pointers) */ /* Retrieve the driver interface (function pointers) */
curRobot = (tRobotItf*)calloc(1, sizeof(tRobotItf)); curRobot = (tRobotItf*)calloc(1, sizeof(tRobotItf));
/* ... and initialize the driver */
curModInfo->fctInit(robotIdx, (void*)(curRobot)); curModInfo->fctInit(robotIdx, (void*)(curRobot));
/* Retrieve and load the driver type XML file :
1) from user settings dir (local dir)
2) from installed data dir */
sprintf(buf, "%sdrivers/%s/%s.xml", GetLocalDir(), cardllname, cardllname); sprintf(buf, "%sdrivers/%s/%s.xml", GetLocalDir(), cardllname, cardllname);
robhdle = GfParmReadFile(buf, GFPARM_RMODE_STD); robhdle = GfParmReadFile(buf, GFPARM_RMODE_STD);
if (!robhdle) { if (!robhdle) {
sprintf(buf, "drivers/%s/%s.xml", cardllname, cardllname); sprintf(buf, "drivers/%s/%s.xml", cardllname, cardllname);
robhdle = GfParmReadFile(buf, GFPARM_RMODE_STD); robhdle = GfParmReadFile(buf, GFPARM_RMODE_STD);
} }
/* Load car/driver info (in race engine data structure) */
if (robhdle) { if (robhdle) {
elt = &(ReInfo->carList[index]); elt = &(ReInfo->carList[index]);
GF_TAILQ_INIT(&(elt->_penaltyList)); GF_TAILQ_INIT(&(elt->_penaltyList));
@ -548,7 +558,7 @@ ReInitCars(void)
elt->_teamname[MAX_NAME_LEN - 1] = 0; elt->_teamname[MAX_NAME_LEN - 1] = 0;
strncpy(elt->_carName, GfParmGetStr(robhdle, path, ROB_ATTR_CAR, ""), MAX_NAME_LEN - 1); strncpy(elt->_carName, GfParmGetStr(robhdle, path, ROB_ATTR_CAR, ""), MAX_NAME_LEN - 1);
elt->_carName[MAX_NAME_LEN - 1] = 0; elt->_carName[MAX_NAME_LEN - 1] = 0; /* XML file name */
elt->_raceNumber = (int)GfParmGetNum(robhdle, path, ROB_ATTR_RACENUM, (char*)NULL, 0); elt->_raceNumber = (int)GfParmGetNum(robhdle, path, ROB_ATTR_RACENUM, (char*)NULL, 0);
if (strcmp(GfParmGetStr(robhdle, path, ROB_ATTR_TYPE, ROB_VAL_ROBOT), ROB_VAL_ROBOT)) { if (strcmp(GfParmGetStr(robhdle, path, ROB_ATTR_TYPE, ROB_VAL_ROBOT), ROB_VAL_ROBOT)) {
elt->_driverType = RM_DRV_HUMAN; elt->_driverType = RM_DRV_HUMAN;
@ -567,16 +577,16 @@ ReInitCars(void)
elt->_pos = index+1; elt->_pos = index+1;
elt->_remainingLaps = ReInfo->s->_totLaps; elt->_remainingLaps = ReInfo->s->_totLaps;
/* handle contains the drivers modifications to the car */ /* Retrieve and load car specs : merge car default specs,
category specs and driver modifications (=> handle) */
/* Read Car model specifications */ /* Read Car model specifications */
sprintf(buf, "cars/%s/%s.xml", elt->_carName, elt->_carName); sprintf(buf, "cars/%s/%s.xml", elt->_carName, elt->_carName);
GfOut("Car file: %s\n", buf); GfOut("Car file: %s\n", buf);
carhdle = GfParmReadFile(buf, GFPARM_RMODE_STD | GFPARM_RMODE_CREAT); carhdle = GfParmReadFile(buf, GFPARM_RMODE_STD | GFPARM_RMODE_CREAT);
category = GfParmGetStr(carhdle, SECT_CAR, PRM_CATEGORY, NULL); category = GfParmGetStr(carhdle, SECT_CAR, PRM_CATEGORY, NULL);
//sprintf(buf, "Loading driver %s (%s) ...", curModInfo->name, elt->_carName); sprintf(buf, "Loading/merging %s specs for %s ...\n", elt->_carName, curModInfo->name);
//RmLoadingScreenSetText(buf); GfOut(buf);
GfOut("Loading driver %s (%s) ...", curModInfo->name, elt->_carName); if (category) {
if (category != 0) {
strncpy(elt->_category, category, MAX_NAME_LEN - 1); strncpy(elt->_category, category, MAX_NAME_LEN - 1);
elt->_category[MAX_NAME_LEN - 1] = '\0'; elt->_category[MAX_NAME_LEN - 1] = '\0';
@ -591,7 +601,7 @@ ReInitCars(void)
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);
curRobot->rbNewTrack(robotIdx, ReInfo->track, carhdle, &handle, ReInfo->s); curRobot->rbNewTrack(robotIdx, ReInfo->track, carhdle, &handle, ReInfo->s);
if (handle != NULL) { if (handle) {
if (GfParmCheckHandle(carhdle, handle)) { if (GfParmCheckHandle(carhdle, handle)) {
GfError("Bad car parameters for driver %s\n", elt->_name); GfError("Bad car parameters for driver %s\n", elt->_name);
break; break;
@ -602,7 +612,7 @@ ReInitCars(void)
handle = carhdle; handle = carhdle;
} }
elt->_carHandle = handle; elt->_carHandle = handle;
//GfParmWriteFile("toto.xml", handle, "toto"); //GfParmWriteFile("/tmp/toto.xml", handle, 0);
} else { } else {
elt->_category[0] = '\0'; elt->_category[0] = '\0';
GfError("Bad car category for driver %s\n", elt->_name); GfError("Bad car category for driver %s\n", elt->_name);
@ -622,7 +632,7 @@ ReInitCars(void)
GfError("No driver for that race ; exiting ...\n"); GfError("No driver for that race ; exiting ...\n");
return -1; return -1;
} else { } else {
GfOut("%d drivers ready to race\n", nCars); GfOut("%d driver(s) ready to race\n", nCars);
} }
ReInfo->s->_ncars = nCars; ReInfo->s->_ncars = nCars;

5
src/libs/raceengineclient/racemain.cpp
View file

@ -179,6 +179,7 @@ reRaceRealStart(void)
void *params = ReInfo->params; void *params = ReInfo->params;
void *results = ReInfo->results; void *results = ReInfo->results;
tSituation *s = ReInfo->s; tSituation *s = ReInfo->s;
void* carHdle;
dllname = GfParmGetStr(ReInfo->_reParam, "Modules", "simu", ""); dllname = GfParmGetStr(ReInfo->_reParam, "Modules", "simu", "");
sprintf(buf, "Loading simulation engine (%s) ...", dllname); sprintf(buf, "Loading simulation engine (%s) ...", dllname);
@ -216,7 +217,9 @@ reRaceRealStart(void)
} }
for (i = 0; i < s->_ncars; i++) { for (i = 0; i < s->_ncars; i++) {
sprintf(buf, "Loading driver %s (%s) ...", s->cars[i]->_name, s->cars[i]->_carName); sprintf(buf, "cars/%s/%s.xml", s->cars[i]->_carName, s->cars[i]->_carName);
carHdle = GfParmReadFile(buf, GFPARM_RMODE_STD);
sprintf(buf, "Loading driver %s (%s) ...", s->cars[i]->_name, GfParmGetName(carHdle));
RmLoadingScreenSetText(buf); RmLoadingScreenSetText(buf);
robot = s->cars[i]->robot; robot = s->cars[i]->robot;
robot->rbNewRace(robot->index, s->cars[i], s); robot->rbNewRace(robot->index, s->cars[i], s);