xavi
/
speed-dreams
2
1
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

use GfParmReadFileLocal to simplify code 

git-svn-id: https://svn.code.sf.net/p/speed-dreams/code/trunk@7666 30fe4595-0a0c-4342-8851-515496e4dcbd
This commit is contained in:
iobyte 2021-09-18 03:49:20 +00:00
parent 6af2235460
commit d82b77ca9c
39 changed files with 64 additions and 181 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/libs/robottools/rthumandriver.cpp
View File

@ -2203,9 +2203,7 @@ void HumanDriver::human_prefs(const int robot_index, int player_index)
if (!PrefHdle)
{
sprintf(sstring, "%s%s", GfLocalDir(), HM_PREF_FILE);
PrefHdle = GfParmReadFile(sstring,
GFPARM_RMODE_REREAD | GFPARM_RMODE_CREAT);
PrefHdle = GfParmReadFileLocal(HM_PREF_FILE, GFPARM_RMODE_REREAD | GFPARM_RMODE_CREAT);
}
sprintf(sstring, "%s/%s/%d", HM_SECT_PREF, HM_LIST_DRV, player_index);

4
src/libs/robottools/rtutil.cpp
View File

@ -38,9 +38,7 @@ void RtGetCarindexString( int index, const char *bot_dname, char extended, char
}
else
{
snprintf( buffer, BUFFERSIZE, "%sdrivers/curcarnames.xml", GfLocalDir() );
buffer[ BUFFERSIZE - 1 ] = '\0';
carnames_xml = GfParmReadFile( buffer, GFPARM_RMODE_STD );
carnames_xml = GfParmReadFileLocal("drivers/curcarnames.xml", GFPARM_RMODE_STD );
if( carnames_xml )
{
snprintf( buffer, resultLength, "drivers/%s/%d", bot_dname, index );

6
src/libs/tgfclient/forcefeedback.cpp
View File

@ -140,15 +140,11 @@ void ForceFeedbackManager::readConfigurationFromFileSection(const std::string &c
}
void ForceFeedbackManager::saveConfiguration(){
std::string configFileUrl = GfLocalDir();
configFileUrl.append("/drivers/human/preferences.xml");
std::string effectsSectionPathSpecific = "/forceFeedback/";
effectsSectionPathSpecific.append(carName);
//open the file
void *paramHandle = GfParmReadFile(configFileUrl.c_str(), GFPARM_RMODE_STD);
void *paramHandle = GfParmReadFileLocal("/drivers/human/preferences.xml", GFPARM_RMODE_STD);
//delette the current car specific section if it exist
if(GfParmExistsSection(paramHandle, effectsSectionPathSpecific.c_str())){

5
src/libs/tgfclient/glfeatures.cpp
View File

@ -54,10 +54,7 @@ int GfglFeatures::InvalidInt = std::numeric_limits<int>::min();
// Config file management.
void* GfglFeatures::openConfigFile()
{
std::ostringstream ossParm;
ossParm << GfLocalDir() << GFSCR_CONF_FILE;
return GfParmReadFile(ossParm.str().c_str(), GFPARM_RMODE_STD | GFPARM_RMODE_CREAT);
return GfParmReadFileLocal(GFSCR_CONF_FILE, GFPARM_RMODE_STD | GFPARM_RMODE_CREAT);
}
void GfglFeatures::closeConfigFile(void* hparmConfig, bool bWrite)

3
src/libs/tgfclient/gui.cpp
View File

@ -88,8 +88,7 @@ gfuiInitColor(void)
GFSCR_ELT_PROGRESSCOLOR
};
snprintf(buf, sizeof(buf), "%s%s", GfLocalDir(), GFSCR_CONF_FILE);
void* hdle = GfParmReadFile(buf, GFPARM_RMODE_STD | GFPARM_RMODE_CREAT);
void* hdle = GfParmReadFileLocal(GFSCR_CONF_FILE, GFPARM_RMODE_STD | GFPARM_RMODE_CREAT);
for (int i = 0; i < GFUI_COLORNB; i++) {
snprintf(buf, sizeof(buf), "%s/%s/%s", GFSCR_SECT_MENUSETTINGS, GFSCR_LIST_COLORS, clr[i]);

3
src/libs/tgfclient/guibutton.cpp
View File

@ -41,8 +41,7 @@ gfuiInitButton(void)
// Get default layout properties from the screen config file.
// 1) Tips.
snprintf(path, sizeof(path), "%s%s", GfLocalDir(), GFSCR_CONF_FILE);
void* hparmScr = GfParmReadFile(path, GFPARM_RMODE_STD | GFPARM_RMODE_CREAT);
void* hparmScr = GfParmReadFileLocal(GFSCR_CONF_FILE, GFPARM_RMODE_STD | GFPARM_RMODE_CREAT);
// 2) Text buttons.
snprintf(path, sizeof(path), "%s/%s", GFSCR_SECT_MENUSETTINGS, GFSCR_SECT_TEXTBUTTON);

3
src/libs/tgfclient/guiedit.cpp
View File

@ -44,8 +44,7 @@ gfuiInitEditbox(void)
char path[1024];
// Get tip layout properties from the screen config file.
snprintf(path, sizeof(path), "%s%s", GfLocalDir(), GFSCR_CONF_FILE);
void* hparmScr = GfParmReadFile(path, GFPARM_RMODE_STD | GFPARM_RMODE_CREAT);
void* hparmScr = GfParmReadFileLocal(GFSCR_CONF_FILE, GFPARM_RMODE_STD | GFPARM_RMODE_CREAT);
snprintf(path, sizeof(path), "%s/%s", GFSCR_SECT_MENUSETTINGS, GFSCR_SECT_EDITBOX);
NHPadding = (int)GfParmGetNum(hparmScr, path, GFSCR_ATT_HPADDING, 0, 10.0);

3
src/libs/tgfclient/guifont.cpp
View File

@ -79,8 +79,7 @@ void gfuiLoadFonts(void)
int i;
int nFontId;
snprintf(buf, sizeof(buf), "%s%s", GfLocalDir(), GFSCR_CONF_FILE);
param = GfParmReadFile(buf, GFPARM_RMODE_STD | GFPARM_RMODE_CREAT);
param = GfParmReadFileLocal(GFSCR_CONF_FILE, GFPARM_RMODE_STD | GFPARM_RMODE_CREAT);
snprintf(buf, sizeof(buf), "%sdata/fonts/%s", GfDataDir(),
GfParmGetStr(param, "Menu Font", "name", "b5.glf"));

3
src/libs/tgfclient/guilabel.cpp
View File

@ -45,8 +45,7 @@ gfuiInitLabel(void)
char path[1024];
// Get tip layout properties from the screen config file.
snprintf(path, sizeof(path), "%s%s", GfLocalDir(), GFSCR_CONF_FILE);
void* hparmScr = GfParmReadFile(path, GFPARM_RMODE_STD | GFPARM_RMODE_CREAT);
void* hparmScr = GfParmReadFileLocal(GFSCR_CONF_FILE, GFPARM_RMODE_STD | GFPARM_RMODE_CREAT);
snprintf(path, sizeof(path), "%s/%s", GFSCR_SECT_MENUSETTINGS, GFSCR_SECT_TIP);
NTipX = (int)GfParmGetNum(hparmScr, path, GFSCR_ATT_X, 0, 10.0);

3
src/libs/tgfclient/guiobject.cpp
View File

@ -39,8 +39,7 @@ gfuiInitObject(void)
{
//Read mouse pointer settings
char buf[1024];
snprintf(buf, sizeof(buf), "%s%s", GfLocalDir(), GFSCR_CONF_FILE);
void *param = GfParmReadFile(buf, GFPARM_RMODE_STD | GFPARM_RMODE_CREAT);
void *param = GfParmReadFileLocal(GFSCR_CONF_FILE, GFPARM_RMODE_STD | GFPARM_RMODE_CREAT);
NMouseCursorXOffset =
(int)GfParmGetNum(param, GFSCR_SECT_MOUSECURSOR, GFSCR_ATT_XOFFSET, (char*)NULL, 0.0);

8
src/libs/tgfclient/guiscreen.cpp
View File

@ -362,10 +362,8 @@ bool GfScrInitSDL2(int nWinWidth, int nWinHeight, int nFullScreen)
// Get selected frame buffer specs from config file
// 1) Load the config file
std::ostringstream ossConfigFilename;
ossConfigFilename << GfLocalDir() << GFSCR_CONF_FILE;
void* hparmScreen =
GfParmReadFile(ossConfigFilename.str().c_str(), GFPARM_RMODE_STD | GFPARM_RMODE_CREAT);
GfParmReadFileLocal(GFSCR_CONF_FILE, GFPARM_RMODE_STD | GFPARM_RMODE_CREAT);
// 2) Check / update test state of any 'in-test' specs.
if (GfParmExistsSection(hparmScreen, GFSCR_SECT_INTESTPROPS))
@ -673,9 +671,7 @@ void GfScrShutdown(void)
// * if the test state is 'to do', do nothing (will be taken care of in next GfScrInit),
// * if the test state is 'in progress', validate the new screen properties,
// * if the test state is 'failed', revert to the validated screen properties.
std::ostringstream ossConfigFilename;
ossConfigFilename << GfLocalDir() << GFSCR_CONF_FILE;
void* hparmScreen = GfParmReadFile(ossConfigFilename.str().c_str(), GFPARM_RMODE_STD);
void* hparmScreen = GfParmReadFileLocal(GFSCR_CONF_FILE, GFPARM_RMODE_STD);
if (GfParmExistsSection(hparmScreen, GFSCR_SECT_INTESTPROPS))
{

8
src/libs/tgfclient/guitexture.cpp
View File

@ -585,9 +585,7 @@ GfTexWriteImageToPNG(unsigned char *img, const char *filename, int width, int he
png_set_IHDR(png_ptr, info_ptr, width, height, 8, PNG_COLOR_TYPE_RGB,
PNG_INTERLACE_NONE, PNG_COMPRESSION_TYPE_DEFAULT, PNG_FILTER_TYPE_DEFAULT);
#if (ReadGammaFromSettingsFile)
char pszConfFilename[1024];
snprintf(pszConfFilename, sizeof(pszConfFilename), "%s%s", GfLocalDir(), GFSCR_CONF_FILE);
void *handle = GfParmReadFile(pszConfFilename, GFPARM_RMODE_STD | GFPARM_RMODE_CREAT);
void *handle = GfParmReadFileLocal(GFSCR_CONF_FILE, GFPARM_RMODE_STD | GFPARM_RMODE_CREAT);
screen_gamma = (float)GfParmGetNum(handle, GFSCR_SECT_VALIDPROPS, GFSCR_ATT_GAMMA, (char*)NULL, DEFGAMMA);
GfParmReleaseHandle(handle);
#else
@ -634,9 +632,7 @@ GfTexReadTexture(const char *filename, int* pWidth, int* pHeight,
int* pPow2Width, int* pPow2Height)
{
// Get screen gamma value from graphics params.
char buf[1024];
snprintf(buf, sizeof(buf), "%s%s", GfLocalDir(), GFSCR_CONF_FILE);
void *handle = GfParmReadFile(buf, GFPARM_RMODE_STD);
void *handle = GfParmReadFileLocal(GFSCR_CONF_FILE, GFPARM_RMODE_STD);
const float screen_gamma =
(float)GfParmGetNum(handle, GFSCR_SECT_VALIDPROPS, GFSCR_ATT_GAMMA, (char*)NULL, 2.0);
GfParmReleaseHandle(handle);

14
src/libs/tgfclient/webserver.cpp
View File

@ -716,14 +716,8 @@ int WebServer::sendGenericRequest (std::string data, std::string& serverReply)
void WebServer::readConfiguration ()
{
void *configHandle;
char configFileUrl[1024];
//get the preferencies file location
snprintf(configFileUrl, sizeof(configFileUrl), "%s%s", GfLocalDir(), "config/webserver.xml");
//read the preferencies file
configHandle = GfParmReadFile(configFileUrl, GFPARM_RMODE_REREAD);
void *configHandle = GfParmReadFileLocal("config/webserver.xml", GFPARM_RMODE_REREAD);
//get webServer url from the config
this->url = GfParmGetStr(configHandle, "WebServer Settings", "url","val");
@ -734,17 +728,13 @@ void WebServer::readConfiguration ()
int WebServer::readUserConfig (int userId)
{
void *prHandle;
char prefFileUrl[1024];
char xmlPath[1024];
// find the xmlPath to our specific user in the preferencies xml file
snprintf(xmlPath, sizeof(xmlPath), "%s%i", "Preferences/Drivers/", userId);
//get the preferencies file location
snprintf(prefFileUrl, sizeof(prefFileUrl), "%s%s", GfLocalDir(), HM_PREF_FILE);
//read the preferencies file
prHandle = GfParmReadFile(prefFileUrl, GFPARM_RMODE_REREAD);
prHandle = GfParmReadFileLocal(HM_PREF_FILE, GFPARM_RMODE_REREAD);
//get webServer user id for current user
this->username = GfParmGetStr(prHandle, xmlPath, "WebServerUsername","val");

4
src/main/main.cpp
View File

@ -208,10 +208,8 @@ main(int argc, char *argv[])
GfData::initialize();
// Load the race engine module (specified in the user settings : raceengine.xml file).
std::ostringstream ossParm;
ossParm << GfLocalDir() << RACE_ENG_CFG;
void* hREParams =
GfParmReadFile(ossParm.str().c_str(), GFPARM_RMODE_REREAD | GFPARM_RMODE_CREAT);
GfParmReadFileLocal(RACE_ENG_CFG, GFPARM_RMODE_REREAD | GFPARM_RMODE_CREAT);
const char* pszModName = GfParmGetStr(hREParams, "Modules", "racing", "standardgame");
pmodRaceEngine = GfModule::load("modules/racing", pszModName);

3
src/modules/graphic/osggraph/OsgMain.cpp
View File

@ -308,8 +308,7 @@ int initCars(tSituation *s)
if (!grHandle)
{
snprintf(buf, sizeof(buf), "%s%s", GfLocalDir(), GR_PARAM_FILE);
grHandle = GfParmReadFile(buf, GFPARM_RMODE_STD | GFPARM_RMODE_CREAT);
grHandle = GfParmReadFileLocal(GR_PARAM_FILE, GFPARM_RMODE_STD | GFPARM_RMODE_CREAT);
}
return 0;

8
src/modules/graphic/osggraph/Scenery/OsgScenery.cpp
View File

@ -91,8 +91,7 @@ void SDScenery::LoadScene(tTrack *track)
if(grHandle == NULL)
{
snprintf(buf, 256, "%s%s", GetLocalDir(), GR_PARAM_FILE);
grHandle = GfParmReadFile(buf, GFPARM_RMODE_STD | GFPARM_RMODE_REREAD);
grHandle = GfParmReadFileLocal(GR_PARAM_FILE, GFPARM_RMODE_STD | GFPARM_RMODE_REREAD);
}//if grHandle
/* Determine the world limits */
@ -210,12 +209,9 @@ void SDScenery::LoadSkyOptions()
void SDScenery::LoadGraphicsOptions()
{
char buf[256];
if (!grHandle)
{
snprintf(buf, 256, "%s%s", GfLocalDir(), GR_PARAM_FILE);
grHandle = GfParmReadFile(buf, GFPARM_RMODE_STD | GFPARM_RMODE_REREAD);
grHandle = GfParmReadFileLocal(GR_PARAM_FILE, GFPARM_RMODE_STD | GFPARM_RMODE_REREAD);
}//if grHandle
LoadSkyOptions();

3
src/modules/graphic/ssggraph/grboard.cpp
View File

@ -108,8 +108,7 @@ cGrBoard::loadDefaults(const tCarElt *curCar)
{
//Load dash colours from graph.xml
char path[1024];
snprintf(path, sizeof(path), "%s%s", GfLocalDir(), GR_PARAM_FILE);
void *hdle = GfParmReadFile(path, GFPARM_RMODE_STD | GFPARM_RMODE_CREAT);
void *hdle = GfParmReadFileLocal(GR_PARAM_FILE, GFPARM_RMODE_STD | GFPARM_RMODE_CREAT);
const char *pszSpanSplit;
ReadDashColor(hdle, GFSCR_ELT_NORMALCLR, &normal_color_);

4
src/modules/graphic/ssggraph/grmain.cpp
View File

@ -623,7 +623,6 @@ refresh(tSituation *s)
int
initCars(tSituation *s)
{
char buf[1024];
char idx[16];
int index;
int i;
@ -636,8 +635,7 @@ initCars(tSituation *s)
if (!grHandle)
{
snprintf(buf, sizeof(buf), "%s%s", GfLocalDir(), GR_PARAM_FILE);
grHandle = GfParmReadFile(buf, GFPARM_RMODE_STD | GFPARM_RMODE_CREAT);
grHandle = GfParmReadFileLocal(GR_PARAM_FILE, GFPARM_RMODE_STD | GFPARM_RMODE_CREAT);
}
grInitCommonState();

9
src/modules/graphic/ssggraph/grscene.cpp
View File

@ -100,9 +100,7 @@ grInitScene(void)
// Load graphic options if not already done.
if(!grHandle)
{
char buf[256];
sprintf(buf, "%s%s", GfLocalDir(), GR_PARAM_FILE);
grHandle = GfParmReadFile(buf, GFPARM_RMODE_STD | GFPARM_RMODE_CREAT);
grHandle = GfParmReadFileLocal(GR_PARAM_FILE, GFPARM_RMODE_STD | GFPARM_RMODE_CREAT);
}//if grHandle
// Initialize the background, sky ...
@ -132,12 +130,9 @@ grInitScene(void)
static void
grLoadGraphicsOptions()
{
char buf[256];
if (!grHandle)
{
sprintf(buf, "%s%s", GfLocalDir(), GR_PARAM_FILE);
grHandle = GfParmReadFile(buf, GFPARM_RMODE_STD | GFPARM_RMODE_REREAD);
grHandle = GfParmReadFileLocal(GR_PARAM_FILE, GFPARM_RMODE_STD | GFPARM_RMODE_REREAD);
}//if grHandle
grLoadBackgroundGraphicsOptions();

7
src/modules/racing/genparoptv1/raceinit.cpp
View File

@ -74,9 +74,7 @@ ReReset(void)
ReInfo->robModList = &ReRacingRobotsModList;
// Load Race engine params.
char buf[256];
snprintf(buf, sizeof(buf), "%s%s", GfLocalDir(), RACE_ENG_CFG);
ReInfo->_reParam = GfParmReadFile(buf, GFPARM_RMODE_REREAD | GFPARM_RMODE_CREAT);
ReInfo->_reParam = GfParmReadFileLocal(RACE_ENG_CFG, GFPARM_RMODE_REREAD | GFPARM_RMODE_CREAT);
}
@ -636,8 +634,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);

4
src/modules/racing/genparoptv1/racesituation.cpp
View File

@ -434,10 +434,8 @@ ReSituationUpdater::ReSituationUpdater()
// Determine if we have a dedicated separate thread or not
// (according to the user settings, and the actual number of CPUs).
std::ostringstream ossConfFile;
ossConfFile << GfLocalDir() << RACE_ENG_CFG;
void *paramHandle =
GfParmReadFile(ossConfFile.str().c_str(), GFPARM_RMODE_REREAD | GFPARM_RMODE_CREAT);
GfParmReadFileLocal(RACE_ENG_CFG, GFPARM_RMODE_REREAD | GFPARM_RMODE_CREAT);
const char* pszMultiThreadScheme =
GfParmGetStr(paramHandle, RM_SECT_RACE_ENGINE, RM_ATTR_MULTI_THREADING, RM_VAL_AUTO);

7
src/modules/racing/standardgame/raceinit.cpp
View File

@ -97,9 +97,7 @@ ReReset(void)
ReInfo->robModList = &ReRacingRobotsModList;
// Load Race engine params.
char buf[PathLenMax];
snprintf(buf, sizeof(buf), "%s%s", GfLocalDir(), RACE_ENG_CFG);
ReInfo->_reParam = GfParmReadFile(buf, GFPARM_RMODE_REREAD | GFPARM_RMODE_CREAT);
ReInfo->_reParam = GfParmReadFileLocal(RACE_ENG_CFG, GFPARM_RMODE_REREAD | GFPARM_RMODE_CREAT);
}
@ -891,9 +889,8 @@ ReInitCars(void)
replayRecord = 0;
else {
const char *replayRateSchemeName;
snprintf(buf, sizeof(buf), "%s%s", GfLocalDir(), RACE_ENG_CFG);
void *paramHandle = GfParmReadFile(buf, GFPARM_RMODE_REREAD | GFPARM_RMODE_CREAT);
void *paramHandle = GfParmReadFileLocal(RACE_ENG_CFG, GFPARM_RMODE_REREAD | GFPARM_RMODE_CREAT);
replayRateSchemeName = GfParmGetStr(paramHandle, RM_SECT_RACE_ENGINE, RM_ATTR_REPLAY_RATE, "0");
GfParmReleaseHandle(paramHandle);

4
src/modules/racing/standardgame/racesituation.cpp
View File

@ -537,10 +537,8 @@ ReSituationUpdater::ReSituationUpdater()
// Determine if we have a dedicated separate thread or not
// (according to the user settings, and the actual number of CPUs).
std::ostringstream ossConfFile;
ossConfFile << GfLocalDir() << RACE_ENG_CFG;
void *paramHandle =
GfParmReadFile(ossConfFile.str().c_str(), GFPARM_RMODE_REREAD | GFPARM_RMODE_CREAT);
GfParmReadFileLocal(RACE_ENG_CFG, GFPARM_RMODE_REREAD | GFPARM_RMODE_CREAT);
const char* pszMultiThreadScheme =
GfParmGetStr(paramHandle, RM_SECT_RACE_ENGINE, RM_ATTR_MULTI_THREADING, RM_VAL_AUTO);

4
src/modules/sound/snddefault/grsound.cpp
View File

@ -45,9 +45,7 @@ void grInitSound(tSituation* s, int ncars)
char buf[256];
// Check if we want sound (sound.xml).
char fnbuf[1024];
sprintf(fnbuf, "%s%s", GfLocalDir(), SND_PARAM_FILE);
void *paramHandle = GfParmReadFile(fnbuf, GFPARM_RMODE_REREAD | GFPARM_RMODE_CREAT);
void *paramHandle = GfParmReadFileLocal(SND_PARAM_FILE, GFPARM_RMODE_REREAD | GFPARM_RMODE_CREAT);
const char *optionName = GfParmGetStr(paramHandle, SND_SCT_SOUND, SND_ATT_SOUND_STATE, soundOpenALStr);
float global_volume = GfParmGetNum(paramHandle, SND_SCT_SOUND, SND_ATT_SOUND_VOLUME, "%", 100.0f);
if (!strcmp(optionName, soundDisabledStr)) {

6
src/modules/userinterface/legacymenu/confscreens/advancedgraphconfig.cpp
View File

@ -83,8 +83,7 @@ static char buf[512];
static void
loadOptions()
{
snprintf(buf, sizeof(buf), "%s%s", GfLocalDir(), GR_PARAM_FILE);
void* grHandle = GfParmReadFile(buf, GFPARM_RMODE_STD | GFPARM_RMODE_CREAT);
void* grHandle = GfParmReadFileLocal(GR_PARAM_FILE, GFPARM_RMODE_STD | GFPARM_RMODE_CREAT);
BackgroundTypeIndex = 0; // Default value index, in case file value not found in list.
const char* pszBackgroundType =
@ -212,8 +211,7 @@ saveOptions()
// Force current edit to loose focus (if one has it) and update associated variable.
GfuiUnSelectCurrent();
snprintf(buf, sizeof(buf), "%s%s", GfLocalDir(), GR_PARAM_FILE);
void* grHandle = GfParmReadFile(buf, GFPARM_RMODE_STD | GFPARM_RMODE_CREAT);
void* grHandle = GfParmReadFileLocal(GR_PARAM_FILE, GFPARM_RMODE_STD | GFPARM_RMODE_CREAT);
GfParmSetStr(grHandle, GR_SCT_GRAPHIC, GR_ATT_BGSKYTYPE, BackgroundTypeValues[BackgroundTypeIndex]);
GfParmSetStr(grHandle, GR_SCT_GRAPHIC, GR_ATT_SHADOW_TYPE, ShadowValues[ShadowIndex]);

10
src/modules/userinterface/legacymenu/confscreens/aiconfig.cpp
View File

@ -54,10 +54,7 @@ static void ReadAICfg(void)
tdble aiSkillValue;
int i;
char buf[256];
snprintf(buf, 256, "%s%s", GfLocalDir(), AIGlobalSkillFilePathName);
void *paramHandle = GfParmReadFile(buf, GFPARM_RMODE_REREAD | GFPARM_RMODE_CREAT);
void *paramHandle = GfParmReadFileLocal(AIGlobalSkillFilePathName, GFPARM_RMODE_REREAD | GFPARM_RMODE_CREAT);
aiSkillValue = GfParmGetNum(paramHandle, "skill", "level", 0, SkillLevelValues[0]);
CurSkillLevelIndex = NSkillLevels-1; // In case aiSkillValue < 0.
@ -77,10 +74,7 @@ static void ReadAICfg(void)
/* Save the choosen values into the corresponding parameter file */
static void SaveSkillLevel(void * /* dummy */)
{
char buf[256];
snprintf(buf, 256, "%s%s", GfLocalDir(), AIGlobalSkillFilePathName);
void *paramHandle = GfParmReadFile(buf, GFPARM_RMODE_REREAD | GFPARM_RMODE_CREAT);
void *paramHandle = GfParmReadFileLocal(AIGlobalSkillFilePathName, GFPARM_RMODE_REREAD | GFPARM_RMODE_CREAT);
GfParmSetNum(paramHandle, "skill", "level", 0, SkillLevelValues[CurSkillLevelIndex]);
GfParmWriteFile(NULL, paramHandle, "Skill");
GfParmReleaseHandle(paramHandle);

8
src/modules/userinterface/legacymenu/confscreens/displayconfig.cpp
View File

@ -162,10 +162,8 @@ void DisplayMenu::updateControls()
void DisplayMenu::loadSettings()
{
// Open screen config params file.
std::ostringstream ossConfFile;
ossConfFile << GfLocalDir() << GFSCR_CONF_FILE;
void* hScrConfParams =
GfParmReadFile(ossConfFile.str().c_str(), GFPARM_RMODE_STD | GFPARM_RMODE_CREAT);
GfParmReadFileLocal(GFSCR_CONF_FILE, GFPARM_RMODE_STD | GFPARM_RMODE_CREAT);
// Select the screen properties to edit : the 'in-test' ones if present,
// otherwise the 'validated' ones.
@ -211,10 +209,8 @@ void DisplayMenu::loadSettings()
void DisplayMenu::storeSettings() const
{
// Open screen config params file.
std::ostringstream ossConfFile;
ossConfFile << GfLocalDir() << GFSCR_CONF_FILE;
void* hScrConfParams =
GfParmReadFile(ossConfFile.str().c_str(), GFPARM_RMODE_STD | GFPARM_RMODE_CREAT);
GfParmReadFileLocal(GFSCR_CONF_FILE, GFPARM_RMODE_STD | GFPARM_RMODE_CREAT);
// Write new screen properties to the 'in-test' section, with 'to do' test state
// (will become 'validated' after a succesfull restart, once we are sure they are OK :

6
src/modules/userinterface/legacymenu/confscreens/graphconfig.cpp
View File

@ -81,8 +81,7 @@ static char buf[512];
static void
loadOptions()
{
snprintf(buf, sizeof(buf), "%s%s", GfLocalDir(), GR_PARAM_FILE);
void* grHandle = GfParmReadFile(buf, GFPARM_RMODE_STD | GFPARM_RMODE_CREAT);
void* grHandle = GfParmReadFileLocal(GR_PARAM_FILE, GFPARM_RMODE_STD | GFPARM_RMODE_CREAT);
FovFactorValue = (int)GfParmGetNum(grHandle, GR_SCT_GRAPHIC, GR_ATT_FOVFACT, "%", 100.0);
@ -172,8 +171,7 @@ saveOptions()
// Force current edit to loose focus (if one has it) and update associated variable.
GfuiUnSelectCurrent();
snprintf(buf, sizeof(buf), "%s%s", GfLocalDir(), GR_PARAM_FILE);
void* grHandle = GfParmReadFile(buf, GFPARM_RMODE_STD | GFPARM_RMODE_CREAT);
void* grHandle = GfParmReadFileLocal(GR_PARAM_FILE, GFPARM_RMODE_STD | GFPARM_RMODE_CREAT);
GfParmSetNum(grHandle, GR_SCT_GRAPHIC, GR_ATT_FOVFACT, "%", FovFactorValue);
GfParmSetNum(grHandle, GR_SCT_GRAPHIC, GR_ATT_SMOKENB, NULL, SmokeValue);

10
src/modules/userinterface/legacymenu/confscreens/monitorconfig.cpp
View File

@ -127,10 +127,8 @@ void MonitorMenu::updateControls()
void MonitorMenu::loadSettings()
{
std::ostringstream ossConfFile;
ossConfFile << GfLocalDir() << GR_PARAM_FILE;
void* grHandle =
GfParmReadFile(ossConfFile.str().c_str(), GFPARM_RMODE_STD | GFPARM_RMODE_CREAT);
GfParmReadFileLocal(GR_PARAM_FILE, GFPARM_RMODE_STD | GFPARM_RMODE_CREAT);
// Monitor Type : 4:3, 16:9 or 21:9
const char *pszMonitorType =
@ -162,10 +160,8 @@ void MonitorMenu::loadSettings()
// Save graphical settings to XML file.
void MonitorMenu::storeSettings() const
{
std::ostringstream ossConfFile;
ossConfFile << GfLocalDir() << GR_PARAM_FILE;
void* grHandle =
GfParmReadFile(ossConfFile.str().c_str(), GFPARM_RMODE_STD | GFPARM_RMODE_CREAT);
void *grHandle =
GfParmReadFileLocal(GR_PARAM_FILE, GFPARM_RMODE_STD | GFPARM_RMODE_CREAT);
const char* pszMonitorType =
(_eMonitorType == e4by3) ? GR_VAL_MONITOR_4BY3 : (_eMonitorType == e21by9) ? GR_VAL_MONITOR_21BY9 : GR_VAL_MONITOR_16BY9;

8
src/modules/userinterface/legacymenu/confscreens/openglconfig.cpp
View File

@ -141,9 +141,7 @@ static void onAccept(void *)
// Store settings from the GL features layer to the screen.xml file.
GfglFeatures::self().storeSelection();
char buf[1024];
snprintf(buf, sizeof(buf), "%s%s", GfLocalDir(), RACE_ENG_CFG);
void *paramHandle = GfParmReadFile(buf, GFPARM_RMODE_REREAD | GFPARM_RMODE_CREAT);
void *paramHandle = GfParmReadFileLocal(RACE_ENG_CFG, GFPARM_RMODE_REREAD | GFPARM_RMODE_CREAT);
GfParmSetStr(paramHandle, RM_SECT_MODULES, RM_ATTR_MOD_GRAPHIC, GraphicSchemeList[CurGraphicScheme]);
GfParmWriteFile(NULL, paramHandle, "raceengine");
@ -441,10 +439,8 @@ void* OpenGLMenuInit(void *prevMenu)
//Initialize current Graphic Engine
// ssggraph / OsgGraph
char buf[1024];
snprintf(buf, sizeof(buf), "%s%s", GfLocalDir(), RACE_ENG_CFG);
void *paramHandle = GfParmReadFile(buf, GFPARM_RMODE_REREAD | GFPARM_RMODE_CREAT);
void *paramHandle = GfParmReadFileLocal(RACE_ENG_CFG, GFPARM_RMODE_REREAD | GFPARM_RMODE_CREAT);
// graphic engine
graphicSchemeName = GfParmGetStr(paramHandle, RM_SECT_MODULES, RM_ATTR_MOD_GRAPHIC, GraphicSchemeList[1]);

10
src/modules/userinterface/legacymenu/confscreens/playerconfig.cpp
View File

@ -425,9 +425,7 @@ PutPlayerSettings(unsigned index)
snprintf(drvDispSecPath, sizeof(drvDispSecPath), "%s/%s", GR_SCT_DISPMODE, pszOldDispName);
if (!GraphHdle) // Load graphic params file if not already done.
{
char pszGraphFileName[256];
snprintf(pszGraphFileName, sizeof(pszGraphFileName), "%s%s", GfLocalDir(), GR_PARAM_FILE);
GraphHdle = GfParmReadFile(pszGraphFileName, GFPARM_RMODE_REREAD);
GraphHdle = GfParmReadFileLocal(GR_PARAM_FILE, GFPARM_RMODE_REREAD);
}
if (GfParmExistsSection(GraphHdle, drvDispSecPath)) { // Change section name.
@ -669,8 +667,7 @@ GenPlayerList(void)
PlayersInfo.clear();
/* Load players settings from human.xml file *//*was meant: preferences.xml file?*/
snprintf(buf, sizeof(buf), "%s%s", GfLocalDir(), HM_DRV_FILE);
PlayerHdle = GfParmReadFile(buf, GFPARM_RMODE_REREAD);
PlayerHdle = GfParmReadFileLocal(HM_DRV_FILE, GFPARM_RMODE_REREAD);
if (PlayerHdle == NULL) {
return -1;
}
@ -712,8 +709,7 @@ GenPlayerList(void)
UpdtScrollList();
/* Load players settings from human/preferences.xml file*/
snprintf(buf, sizeof(buf), "%s%s", GfLocalDir(), HM_PREF_FILE);
PrefHdle = GfParmReadFile(buf, GFPARM_RMODE_REREAD);
PrefHdle = GfParmReadFileLocal(HM_PREF_FILE, GFPARM_RMODE_REREAD);
if (!PrefHdle) {
return -1;
}

8
src/modules/userinterface/legacymenu/confscreens/simuconfig.cpp
View File

@ -103,9 +103,8 @@ static void loadSimuCfg(void)
int i;
char buf[1024];
snprintf(buf, sizeof(buf), "%s%s", GfLocalDir(), RACE_ENG_CFG);
void *paramHandle = GfParmReadFile(buf, GFPARM_RMODE_REREAD | GFPARM_RMODE_CREAT);
void *paramHandle = GfParmReadFileLocal(RACE_ENG_CFG, GFPARM_RMODE_REREAD | GFPARM_RMODE_CREAT);
// Simulation engine name.
simuVersionName = GfParmGetStr(paramHandle, RM_SECT_MODULES, RM_ATTR_MOD_SIMU, SimuVersionList[DefaultSimuVersion]);
@ -204,10 +203,7 @@ static void loadSimuCfg(void)
/* Save the choosen values in the corresponding parameter file */
static void storeSimuCfg(void * /* dummy */)
{
char buf[1024];
snprintf(buf, sizeof(buf), "%s%s", GfLocalDir(), RACE_ENG_CFG);
void *paramHandle = GfParmReadFile(buf, GFPARM_RMODE_REREAD | GFPARM_RMODE_CREAT);
void *paramHandle = GfParmReadFileLocal(RACE_ENG_CFG, GFPARM_RMODE_REREAD | GFPARM_RMODE_CREAT);
GfParmSetStr(paramHandle, RM_SECT_MODULES, RM_ATTR_MOD_SIMU, SimuVersionList[CurSimuVersion]);
GfParmSetStr(paramHandle, RM_SECT_RACE_ENGINE, RM_ATTR_MULTI_THREADING, MultiThreadSchemeList[CurMultiThreadScheme]);
GfParmSetStr(paramHandle, RM_SECT_RACE_ENGINE, RM_ATTR_THREAD_AFFINITY, ThreadAffinitySchemeList[CurThreadAffinityScheme]);

7
src/modules/userinterface/legacymenu/confscreens/soundconfig.cpp
View File

@ -73,8 +73,7 @@ static void readSoundCfg(void)
char buf[1024];
// Sound interface.
sprintf(buf, "%s%s", GfLocalDir(), SND_PARAM_FILE);
void *paramHandle = GfParmReadFile(buf, GFPARM_RMODE_REREAD | GFPARM_RMODE_CREAT);
void *paramHandle = GfParmReadFileLocal(SND_PARAM_FILE, GFPARM_RMODE_REREAD | GFPARM_RMODE_CREAT);
optionName = GfParmGetStr(paramHandle, SND_SCT_SOUND, SND_ATT_SOUND_STATE, soundOptionList[0]);
for (i = 0; i < nbOptions; i++) {
@ -131,9 +130,7 @@ static void saveSoundOption(void *)
// Force current edit to loose focus (if one has it) and update associated variable.
GfuiUnSelectCurrent();
char buf[1024];
sprintf(buf, "%s%s", GfLocalDir(), SND_PARAM_FILE);
void *paramHandle = GfParmReadFile(buf, GFPARM_RMODE_REREAD | GFPARM_RMODE_CREAT);
void *paramHandle = GfParmReadFileLocal(SND_PARAM_FILE, GFPARM_RMODE_REREAD | GFPARM_RMODE_CREAT);
GfParmSetStr(paramHandle, SND_SCT_SOUND, SND_ATT_SOUND_STATE, soundOptionList[curOption]);
GfParmSetNum(paramHandle, SND_SCT_SOUND, SND_ATT_SOUND_VOLUME, "%", VolumeValue);
GfParmSetStr(paramHandle, SND_SCT_MUSIC, SND_ATT_MUSIC_STATE, musicStateList[curMusicState]);

10
src/modules/userinterface/legacymenu/legacymenu.cpp
View File

@ -400,10 +400,7 @@ bool LegacyMenu::onRaceStartingPaused(){
GfLogDebug("LegacyMenu::onRaceStartingPaused()\n");
bool preracePauseEnabled = false;
char buf[256];
snprintf(buf, sizeof(buf), "%s%s", GfLocalDir(), RACE_ENG_CFG);
void* hparmRaceEng = GfParmReadFile(buf, GFPARM_RMODE_STD | GFPARM_RMODE_CREAT);
void* hparmRaceEng = GfParmReadFileLocal(RACE_ENG_CFG, GFPARM_RMODE_STD | GFPARM_RMODE_CREAT);
// does the config allow Prerace pause?
const char* preracepause = GfParmGetStr(hparmRaceEng, RM_SECT_RACE_ENGINE, RM_ATTR_STARTPAUSED, RM_VAL_OFF);
@ -448,10 +445,7 @@ void LegacyMenu::onRaceInterrupted() {
bool LegacyMenu::onRaceCooldownStarting(){
bool cooldownEnabled = false;
char buf[256];
snprintf(buf, sizeof(buf), "%s%s", GfLocalDir(), RACE_ENG_CFG);
void* hparmRaceEng = GfParmReadFile(buf, GFPARM_RMODE_STD | GFPARM_RMODE_CREAT);
void* hparmRaceEng = GfParmReadFileLocal(RACE_ENG_CFG, GFPARM_RMODE_STD | GFPARM_RMODE_CREAT);
// Does the config allow cooldown driving?
const char* cooldown = GfParmGetStr(hparmRaceEng, RM_SECT_RACE_ENGINE, RM_ATTR_COOLDOWN, RM_VAL_OFF);

3
src/modules/userinterface/legacymenu/racescreens/raceparamsmenu.cpp
View File

@ -437,8 +437,7 @@ RmRaceParamsMenu(void *vrp)
rmrpConfMask = pRaceSessionParams ? pRaceSessionParams->bfOptions : 0;
// 2) According to SkyDome settings.
snprintf(buf, sizeof(buf), "%s%s", GfLocalDir(), GR_PARAM_FILE);
void *grHandle = GfParmReadFile(buf, GFPARM_RMODE_STD);
void *grHandle = GfParmReadFileLocal(GR_PARAM_FILE, GFPARM_RMODE_STD);
const bool bSkyDomeEnabled =
(int)GfParmGetNum(grHandle, GR_SCT_GRAPHIC, GR_ATT_SKYDOMEDISTANCE, NULL, 0) != 0;
GfParmReleaseHandle(grHandle);

11
src/modules/userinterface/legacymenu/racescreens/raceresultsmenus.cpp
View File

@ -67,10 +67,7 @@ rmReplayRace(void * /* dummy */)
{
const char *simuVersionName;
int i;
char buf[1024];
snprintf(buf, sizeof(buf), "%s%s", GfLocalDir(), RACE_ENG_CFG);
void *paramHandle = GfParmReadFile(buf, GFPARM_RMODE_REREAD | GFPARM_RMODE_CREAT);
void *paramHandle = GfParmReadFileLocal(RACE_ENG_CFG, GFPARM_RMODE_REREAD | GFPARM_RMODE_CREAT);
// Temporarily overwrite Simulation Type
CurSimuVersion = DefaultSimuVersion;
@ -223,8 +220,7 @@ rmPracticeResults(void *prevHdle, tRmInfo *info, int start)
GfuiMenuCreateButtonControl(rmScrHdle, hmenu, "ContinueButton", prevHdle, GfuiScreenReplace);
// Add "Replay" button (if available)
snprintf(buf, sizeof(buf), "%s%s", GfLocalDir(), RACE_ENG_CFG);
paramHandle = GfParmReadFile(buf, GFPARM_RMODE_REREAD | GFPARM_RMODE_CREAT);
paramHandle = GfParmReadFileLocal(RACE_ENG_CFG, GFPARM_RMODE_REREAD | GFPARM_RMODE_CREAT);
replayRateSchemeName = GfParmGetStr(paramHandle, RM_SECT_RACE_ENGINE, RM_ATTR_REPLAY_RATE, RM_VAL_REPLAY_OFF);
rmReplayButtonId = GfuiMenuCreateButtonControl(rmScrHdle, hmenu, "ReplayButton", prevHdle, rmReplayRace);
@ -391,8 +387,7 @@ rmRaceResults(void *prevHdle, tRmInfo *info, int start)
GfuiMenuCreateButtonControl(rmScrHdle, hmenu, "ContinueButton", prevHdle, GfuiScreenReplace);
// Add "Replay" button (if available)
snprintf(buf, sizeof(buf), "%s%s", GfLocalDir(), RACE_ENG_CFG);
paramHandle = GfParmReadFile(buf, GFPARM_RMODE_REREAD | GFPARM_RMODE_CREAT);
paramHandle = GfParmReadFileLocal(RACE_ENG_CFG, GFPARM_RMODE_REREAD | GFPARM_RMODE_CREAT);
replayRateSchemeName = GfParmGetStr(paramHandle, RM_SECT_RACE_ENGINE, RM_ATTR_REPLAY_RATE, RM_VAL_REPLAY_OFF);
rmReplayButtonId = GfuiMenuCreateButtonControl(rmScrHdle, hmenu, "ReplayButton", prevHdle, rmReplayRace);

9
src/modules/userinterface/legacymenu/racescreens/racerunningmenus.cpp
View File

@ -213,10 +213,7 @@ rmInitMovieCapture()
return;
// But do it the first time.
char buf[256];
snprintf(buf, sizeof(buf), "%s%s", GfLocalDir(), RACE_ENG_CFG);
void* hparmRaceEng = GfParmReadFile(buf, GFPARM_RMODE_REREAD | GFPARM_RMODE_CREAT);
void* hparmRaceEng = GfParmReadFileLocal(RACE_ENG_CFG, GFPARM_RMODE_REREAD | GFPARM_RMODE_CREAT);
rmMovieCapture.enabled =
strcmp(GfParmGetStr(hparmRaceEng, RM_SECT_MOVIE_CAPTURE, RM_ATT_CAPTURE_ENABLE,
@ -373,9 +370,7 @@ rmScreenActivate(void * /* dummy */)
#ifdef UseFPSLimiter
// Get the max. refresh rate from the screen config params file.
std::ostringstream ossConfFile;
ossConfFile << GfLocalDir() << GFSCR_CONF_FILE;
void* hparmScrConf = GfParmReadFile(ossConfFile.str().c_str(), GFPARM_RMODE_STD);
void* hparmScrConf = GfParmReadFileLocal(GFSCR_CONF_FILE, GFPARM_RMODE_STD);
FPSLimLastTime = 0.0;
FPSLimMaxRate =
GfParmGetNum(hparmScrConf, GFSCR_SECT_VALIDPROPS, GFSCR_ATT_MAXREFRESH, NULL, 0.0);

12
src/modules/userinterface/legacymenu/racescreens/racestopmenu.cpp
View File

@ -138,8 +138,7 @@ rmControlsHookActivate(void * /* dummy */)
const char *str;
tGearChangeMode gearChangeMode;
sprintf(buf, "%s%s", GfLocalDir(), HM_PREF_FILE);
prHandle = GfParmReadFile(buf, GFPARM_RMODE_REREAD);
prHandle = GfParmReadFileLocal(HM_PREF_FILE, GFPARM_RMODE_REREAD);
snprintf(buf, sizeof(buf), "%s/%s/%d", HM_SECT_PREF, HM_LIST_DRV, curPlayerIdx);
str = GfParmGetStr(prHandle, buf, HM_ATT_TRANS, HM_VAL_AUTO);
@ -177,8 +176,7 @@ rmForceFeedbackConfigHookActivate(void * /* dummy */)
void *prHandle;
char buf[100];
sprintf(buf, "%s%s", GfLocalDir(), HM_PREF_FILE);
prHandle = GfParmReadFile(buf, GFPARM_RMODE_REREAD);
prHandle = GfParmReadFileLocal(HM_PREF_FILE, GFPARM_RMODE_REREAD);
snprintf(buf, sizeof(buf), "%s/%s/%d", HM_SECT_PREF, HM_LIST_DRV, curPlayerIdx);
@ -360,11 +358,9 @@ RmStopRaceMenu()
const char *cur_name;
const char *test_name;
sprintf(buf, "%s%s", GfLocalDir(), GR_PARAM_FILE);
grHandle = GfParmReadFile(buf, GFPARM_RMODE_REREAD);
grHandle = GfParmReadFileLocal(GR_PARAM_FILE, GFPARM_RMODE_REREAD);
sprintf(buf, "%s%s", GfLocalDir(), HM_DRV_FILE);
hdHandle = GfParmReadFile(buf, GFPARM_RMODE_REREAD);
hdHandle = GfParmReadFileLocal(HM_DRV_FILE, GFPARM_RMODE_REREAD);
#endif
// Mute sound.

3
src/tools/trackgen/main.cpp
View File

@ -247,8 +247,7 @@ void Application::generate()
FILE *outfd = NULL;
// Get the trackgen paramaters.
sprintf(buf, "%s", CFG_FILE);
CfgHandle = GfParmReadFile(buf, GFPARM_RMODE_STD | GFPARM_RMODE_CREAT);
CfgHandle = GfParmReadFile(CFG_FILE, GFPARM_RMODE_STD | GFPARM_RMODE_CREAT);
// Load and initialize the track loader module.
GfLogInfo("Loading Track Loader ...\n");