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

use GfParmReadFileLocal in more places

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

Former-commit-id: 97655edbd56a27b36c9ed026e03b398771e59c3c
Former-commit-id: b2e0d1379197740609a3315b852248f909f47825
This commit is contained in:
iobyte 2021-09-18 22:02:43 +00:00
parent c7a94c59cb
commit cadde727e7
14 changed files with 51 additions and 73 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/drivers/dandroid/src/driver.cpp
View file

@ -195,9 +195,7 @@ void TDriver::InitTrack(PTrack Track, PCarHandle CarHandle, PCarSettings* CarPar
GfParmSetNum(*CarParmHandle, SECT_CAR, PRM_FUEL, (char*)NULL, (tdble)mFuelStart);
// Get skill level
handle = NULL;
sprintf(buffer, "%sconfig/raceman/extra/skill.xml", GetLocalDir());
handle = GfParmReadFile(buffer, GFPARM_RMODE_REREAD);
handle = GfParmReadFileLocal("config/raceman/extra/skill.xml", GFPARM_RMODE_REREAD);
double globalskill = 0.0;
if (handle != NULL)
{

3
src/drivers/shadow/src/Driver.cpp
View file

@ -312,8 +312,7 @@ void Driver::InitTrack(
//SetRandomSeed(10);
// load the global skill level, range 0 - 10
snprintf(buf, sizeof(buf), "%sconfig/raceman/extra/skill.xml", GetLocalDir());
void *skillHandle = GfParmReadFile(buf, GFPARM_RMODE_REREAD);
void *skillHandle = GfParmReadFileLocal("config/raceman/extra/skill.xml", GFPARM_RMODE_REREAD);
if(!skillHandle)
{

3
src/drivers/usr/src/driver.cpp
View file

@ -172,8 +172,7 @@ void Driver::InitTrack(tTrack* Track, void* carHandle, void** carParmHandle, tSi
param.setNum(SECT_CAR, PRM_FUEL, startfuel);
// load the global skill level, range 0 - 10
snprintf(buffer, sizeof(buffer), "%sconfig/raceman/extra/skill.xml", GetLocalDir());
void *skillHandle = GfParmReadFile(buffer, GFPARM_RMODE_REREAD);
void *skillHandle = GfParmReadFileLocal("config/raceman/extra/skill.xml", GFPARM_RMODE_REREAD);
if(!skillHandle)
{

5
src/libs/tgfclient/musicplayer.cpp
View file

@ -181,11 +181,8 @@ void setDefaultMusic(const char* filename)
static void readConfig()
{
char fnbuf[1024];
snprintf(fnbuf, sizeof(fnbuf), "%s%s", GfLocalDir(), SND_PARAM_FILE);
GfLogInfo("Reading music player config\n");
void *paramHandle = GfParmReadFile(fnbuf, GFPARM_RMODE_REREAD | GFPARM_RMODE_CREAT);
void *paramHandle = GfParmReadFileLocal(SND_PARAM_FILE, GFPARM_RMODE_REREAD | GFPARM_RMODE_CREAT);
const char *musicenabled = GfParmGetStr(paramHandle, SND_SCT_MUSIC, SND_ATT_MUSIC_STATE, musicDisabledStr);
float music_volume = GfParmGetNum(paramHandle, SND_SCT_MUSIC, SND_ATT_MUSIC_VOLUME, "%", 100.0f);

6
src/libs/tgfdata/drivers.cpp
View file

@ -119,14 +119,12 @@ void GfDrivers::reload()
// Load the module XML descriptor file (try user settings first, and then installed one)
std::ostringstream ossRobotFileName;
ossRobotFileName << GfLocalDir() << "drivers/" << strModName
ossRobotFileName << "drivers/" << strModName
<< '/' << strModName << PARAMEXT;
void *hparmRobot =
GfParmReadFile(ossRobotFileName.str().c_str(), GFPARM_RMODE_STD | GFPARM_RMODE_REREAD);
GfParmReadFileLocal(ossRobotFileName.str().c_str(), GFPARM_RMODE_STD | GFPARM_RMODE_REREAD);
if (!hparmRobot)
{
ossRobotFileName.str("");
ossRobotFileName << "drivers/" << strModName << '/' << strModName << PARAMEXT;
hparmRobot =
GfParmReadFile(ossRobotFileName.str().c_str(), GFPARM_RMODE_STD | GFPARM_RMODE_REREAD);
}

6
src/libs/tgfdata/race.cpp
View file

@ -653,9 +653,9 @@ void GfRace::store()
// Save also the chosen car as the default one for this human driver
// (may be needed later for races where it is not specified in <race>.xml)
std::ostringstream ossFilePath;
ossFilePath << GetLocalDir() << "drivers/" << (*itComp)->getModuleName()
<< '/' << (*itComp)->getModuleName() << PARAMEXT;
void* hparmRobot = GfParmReadFile(ossFilePath.str().c_str(), GFPARM_RMODE_STD);
ossFilePath << "drivers/" << (*itComp)->getModuleName()
<< '/' << (*itComp)->getModuleName() << PARAMEXT;
void* hparmRobot = GfParmReadFileLocal(ossFilePath.str().c_str(), GFPARM_RMODE_STD);
ossDrvSecPath.str("");
ossDrvSecPath << ROB_SECT_ROBOTS << '/' << ROB_LIST_INDEX
<< '/' << (*itComp)->getInterfaceIndex();

20
src/libs/tgfdata/racemanagers.cpp
View file

@ -96,22 +96,16 @@ GfRaceManagers::GfRaceManagers()
do
{
// Open the XML descriptor file (look first in user settings, then in the install folder).
std::ostringstream ossRaceManFileName;
ossRaceManFileName << GfLocalDir() << "config/raceman/" << pFile->name;
void* hparmRaceMan = GfParmReadFile(ossRaceManFileName.str().c_str(), GFPARM_RMODE_STD);
std::string strRaceManFileName("config/raceman/");
strRaceManFileName.append(pFile->name);
void* hparmRaceMan = GfParmReadFileLocal(strRaceManFileName.c_str(), GFPARM_RMODE_STD);
if (!hparmRaceMan)
{
ossRaceManFileName.str("");
ossRaceManFileName << "config/raceman/" << pFile->name;
hparmRaceMan = GfParmReadFile(ossRaceManFileName.str().c_str(), GFPARM_RMODE_STD);
hparmRaceMan = GfParmReadFile(strRaceManFileName.c_str(), GFPARM_RMODE_STD);
// We got if from the data folder : write it to the user settings.
if (hparmRaceMan)
{
ossRaceManFileName.str("");
ossRaceManFileName << GfLocalDir() << "config/raceman/" << pFile->name;
GfParmWriteFile(ossRaceManFileName.str().c_str(), hparmRaceMan, NULL);
}
GfParmWriteFileLocal(strRaceManFileName.c_str(), hparmRaceMan, NULL);
}
std::string strRaceManId(pFile->name);
@ -333,8 +327,8 @@ void GfRaceManager::load() const
if (psz1stSubFileName)
{
std::ostringstream ossSubFilePath;
ossSubFilePath << GfLocalDir() << "config/raceman/" << psz1stSubFileName;
hparmHandle = GfParmReadFile(ossSubFilePath.str().c_str(), GFPARM_RMODE_STD);
ossSubFilePath << "config/raceman/" << psz1stSubFileName;
hparmHandle = GfParmReadFileLocal(ossSubFilePath.str().c_str(), GFPARM_RMODE_STD);
}
if (!psz1stSubFileName || !hparmHandle)
{

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

@ -469,8 +469,8 @@ static tCarElt* reLoadSingleCar( int carindex, int listindex, int modindex, int
/* Retrieve and load the robotXML file :
1) from user settings dir (local dir)
2) from installed data dir */
snprintf(buf, sizeof(buf), "%sdrivers/%s/%s.xml", GfLocalDir(), cardllname, cardllname);
robhdle = GfParmReadFile(buf, GFPARM_RMODE_STD);
snprintf(buf, sizeof(buf), "drivers/%s/%s.xml", cardllname, cardllname);
robhdle = GfParmReadFileLocal(buf, GFPARM_RMODE_STD);
if (!robhdle) {
snprintf(buf, sizeof(buf), "drivers/%s/%s.xml", cardllname, cardllname);
robhdle = GfParmReadFile(buf, GFPARM_RMODE_STD);
@ -790,9 +790,9 @@ ReInitCars(void)
else
{
GfLogTrace("Loading robot %s descriptor file\n", robotModuleName );
snprintf(buf, sizeof(buf), "%sdrivers/%s/%s.xml",
GfLocalDir(), robotModuleName, robotModuleName);
robhdle = GfParmReadFile(buf, GFPARM_RMODE_STD);
snprintf(buf, sizeof(buf), "drivers/%s/%s.xml",
robotModuleName, robotModuleName);
robhdle = GfParmReadFileLocal(buf, GFPARM_RMODE_STD);
if (!robhdle)
{
snprintf(buf, sizeof(buf), "drivers/%s/%s.xml",

34
src/modules/racing/genparoptv1/racemain.cpp
View file

@ -1019,9 +1019,9 @@ ReInitialiseGeneticOptimisation()
if (!Data->Handle)
{
// ... use default setup file ...
snprintf(buf,FILENAME_MAX,"%sdrivers/%s/%s/default.xml",
GetLocalDir(),Data->RobotName,Data->CarType);
void* Handle = GfParmReadFile(buf, GFPARM_RMODE_REREAD);
snprintf(buf, sizeof(buf), "drivers/%s/%s/default.xml",
Data->RobotName,Data->CarType);
void* Handle = GfParmReadFileLocal(buf, GFPARM_RMODE_REREAD);
if (Handle) // ... if existing ...
{ // ... use it to create a track specific setup file.
@ -1041,9 +1041,9 @@ ReInitialiseGeneticOptimisation()
}
else
{
snprintf(buf,FILENAME_MAX,"%sdrivers/%s/%s/default.xml",
GetLocalDir(),Data->RobotName,Data->CarType);
Data->Handle = GfParmReadFile(buf, GFPARM_RMODE_REREAD);
snprintf(buf, sizeof(buf), "drivers/%s/%s/default.xml",
Data->RobotName,Data->CarType);
Data->Handle = GfParmReadFileLocal(buf, GFPARM_RMODE_REREAD);
}
ReImportGeneticParameters();
@ -1085,28 +1085,28 @@ ReImportGeneticParameters()
if (SingleTrackOptimization)
{
// Build path to meta data file
snprintf(buf,sizeof(buf),"%sdrivers/%s/%s/genetic-%s.xml",
GetLocalDir(),Data->RobotName,Data->CarType,Data->TrackName);
snprintf(buf, sizeof(buf),"drivers/%s/%s/genetic-%s.xml",
Data->RobotName,Data->CarType,Data->TrackName);
// Read meta data file
void* MetaDataFile = GfParmReadFile(buf, GFPARM_RMODE_REREAD);
void* MetaDataFile = GfParmReadFileLocal(buf, GFPARM_RMODE_REREAD);
if (!MetaDataFile)
{
// Build path to meta data file
snprintf(buf,sizeof(buf),"%sdrivers/%s/%s/genetic-template.xml",
GetLocalDir(),Data->RobotName,Data->CarType);
snprintf(buf, sizeof(buf),"drivers/%s/%s/genetic-template.xml",
Data->RobotName,Data->CarType);
}
}
else
{
// C:\Users\wdb\Documents\speed-dreams-2.settings\drivers\simplix_srw\srw-sector-p4
// Build path to meta data file
snprintf(buf,sizeof(buf),"%sdrivers/%s/%s/genetic-template.xml",
GetLocalDir(),Data->RobotName,Data->CarType);
snprintf(buf, sizeof(buf),"drivers/%s/%s/genetic-template.xml",
Data->RobotName,Data->CarType);
}
// Read meta data file
void* MetaDataFile = GfParmReadFile(buf, GFPARM_RMODE_REREAD);
void* MetaDataFile = GfParmReadFileLocal(buf, GFPARM_RMODE_REREAD);
if (!MetaDataFile)
{
ReLogOptim.fatal("Couldn't load : %s\n", buf);
@ -1135,9 +1135,9 @@ ReImportGeneticParameters()
Data->GetInitialVal = false;
// Get tank capacity from car type setup file
snprintf(buf,sizeof(buf),"%scars/models/%s/%s.xml",
GetDataDir(),Data->CarType,Data->CarType);
void* Handle = GfParmReadFile(buf, GFPARM_RMODE_REREAD);
snprintf(buf,sizeof(buf),"cars/models/%s/%s.xml",
Data->CarType,Data->CarType);
void* Handle = GfParmReadFileLocal(buf, GFPARM_RMODE_REREAD);
Data->MaxFuel = (float) GfParmGetNum(Handle,
SECT_CAR, PRM_TANK, "l", (float) 60.0);
GfParmReleaseHandle(Handle);

5
src/modules/racing/genparoptv1/raceresults.cpp
View file

@ -66,8 +66,7 @@ ReInitResults(void)
t = time(NULL);
stm = localtime(&t);
snprintf(buf, sizeof(buf), "%sresults/%s/results-%4d-%02d-%02d-%02d-%02d.xml",
GfLocalDir(),
snprintf(buf, sizeof(buf), "results/%s/results-%4d-%02d-%02d-%02d-%02d.xml",
ReInfo->_reFilename,
stm->tm_year+1900,
stm->tm_mon+1,
@ -75,7 +74,7 @@ ReInitResults(void)
stm->tm_hour,
stm->tm_min);
ReInfo->results = GfParmReadFile(buf, GFPARM_RMODE_STD | GFPARM_RMODE_CREAT);
ReInfo->results = GfParmReadFileLocal(buf, GFPARM_RMODE_STD | GFPARM_RMODE_CREAT);
ReInfo->mainResults = ReInfo->results;
results = ReInfo->results;
GfParmSetNum(results, RE_SECT_HEADER, RE_ATTR_DATE, NULL, (tdble)t);

4
src/modules/racing/genparoptv1/raceutil.cpp
View file

@ -83,8 +83,8 @@ int RmGetFeaturesList( void* param )
sprintf( path, "%s/%d", RM_SECT_DRIVERS, xx );
cardllname = GfParmGetStr( param, path, RM_ATTR_MODULE, "" );
caridx = (int)GfParmGetNum( param, path, RM_ATTR_IDX, NULL, 0 );
sprintf( buf, "%s/drivers/%s/%s.xml", GfLocalDir(), cardllname, cardllname );
robhdle = GfParmReadFile( buf, GFPARM_RMODE_STD );
sprintf( buf, "drivers/%s/%s.xml", cardllname, cardllname );
robhdle = GfParmReadFileLocal( buf, GFPARM_RMODE_STD );
if( !robhdle )
{

4
src/modules/racing/standardgame/racecareer.cpp
View file

@ -404,8 +404,8 @@ static void* ReCareerNewClass( const char* filename, void *prevParam, void **fir
int xx;
/* Open subfile */
snprintf( buf, sizeof(buf), "%sconfig/raceman/%s", GfLocalDir(), GfParmGetCurStr(ReInfo->params, RM_SECT_CLASSES, RM_ATTR_SUBFILE, "") );
subparam = GfParmReadFile( buf, GFPARM_RMODE_STD );
snprintf( buf, sizeof(buf), "config/raceman/%s", GfParmGetCurStr(ReInfo->params, RM_SECT_CLASSES, RM_ATTR_SUBFILE, "") );
subparam = GfParmReadFileLocal( buf, GFPARM_RMODE_STD );
if( !subparam ) {
GfLogError( "Subfile %s not found\n", buf );
return prevParam;

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

@ -536,12 +536,10 @@ static tCarElt* reLoadSingleCar( int carindex, int listindex, int modindex, int
/* Retrieve and load the robotXML file :
1) from user settings dir (local dir)
2) from installed data dir */
snprintf(buf, sizeof(buf), "%sdrivers/%s/%s.xml", GfLocalDir(), cardllname, cardllname);
robhdle = GfParmReadFile(buf, GFPARM_RMODE_STD);
if (!robhdle) {
snprintf(buf, sizeof(buf), "drivers/%s/%s.xml", cardllname, cardllname);
snprintf(buf, sizeof(buf), "drivers/%s/%s.xml", cardllname, cardllname);
robhdle = GfParmReadFileLocal(buf, GFPARM_RMODE_STD);
if (!robhdle)
robhdle = GfParmReadFile(buf, GFPARM_RMODE_STD);
}
if (normal_carname || isHuman)
snprintf(path, sizeof(path), "%s/%s/%d", ROB_SECT_ROBOTS, ROB_LIST_INDEX, robotIdx);
@ -706,8 +704,7 @@ static tCarElt* reLoadSingleCar( int carindex, int listindex, int modindex, int
/* The code below stores the carnames to a separate xml-file
such that at newTrack it is known which car is used.
TODO: find a better method for this */
snprintf (buf, sizeof(buf), "%sdrivers/curcarnames.xml", GfLocalDir());
handle = GfParmReadFile(buf, GFPARM_RMODE_CREAT);
handle = GfParmReadFileLocal("drivers/curcarnames.xml", GFPARM_RMODE_CREAT);
if (handle) {
snprintf(path, sizeof(path), "drivers/%s/%d", cardllname, elt->_driverIndex);
GfParmSetStr (handle, path, RM_ATTR_CARNAME, elt->_carName);
@ -849,13 +846,11 @@ ReInitCars(void)
else
{
GfLogTrace("Loading robot %s descriptor file\n", robotModuleName );
snprintf(buf, sizeof(buf), "%sdrivers/%s/%s.xml", GfLocalDir(), robotModuleName, robotModuleName);
robhdle = GfParmReadFile(buf, GFPARM_RMODE_STD);
snprintf(buf, sizeof(buf), "drivers/%s/%s.xml", robotModuleName, robotModuleName);
robhdle = GfParmReadFileLocal(buf, GFPARM_RMODE_STD);
if (!robhdle)
{
snprintf(buf, sizeof(buf), "drivers/%s/%s.xml", robotModuleName, robotModuleName);
robhdle = GfParmReadFile(buf, GFPARM_RMODE_STD);
}
if (robhdle && ( strcmp( robotModuleName, "human" ) == 0 || strcmp( robotModuleName, "networkhuman" ) == 0 ) )
{
/* Human driver */

1
src/modules/userinterface/legacymenu/racescreens/networkingmenu.cpp
View file

@ -359,7 +359,6 @@ UpdateNetworkPlayers()
if (pMod == NULL)
{
//try again in other path
sprintf(robpath,"drivers/%s/%s.xml",robot,robot);
pMod = GfParmReadFile(robpath,GFPARM_RMODE_REREAD);
if (pMod == NULL)
continue;