show which file is loaded
git-svn-id: https://svn.code.sf.net/p/speed-dreams/code/trunk@7107 30fe4595-0a0c-4342-8851-515496e4dcbd Former-commit-id: a361dcf9585f35e664a267b8bf70dc0cf7fe4b60 Former-commit-id: 76b31dcf4f1b4e22aabf8cb32b65cc2d27952892
This commit is contained in:
parent
a8dbf5e4fb
commit
9d0f0bc195
1 changed files with 19 additions and 12 deletions
|
@ -42,10 +42,13 @@ MyParam::MyParam(void** carparmhandle, const std::string& datadir, const std::st
|
||||||
{
|
{
|
||||||
LogUSR.info("Couldn't load : %s\n", trackfile.c_str());
|
LogUSR.info("Couldn't load : %s\n", trackfile.c_str());
|
||||||
*carparmhandle = GfParmReadFile(defaultfile.c_str(), GFPARM_RMODE_STD);
|
*carparmhandle = GfParmReadFile(defaultfile.c_str(), GFPARM_RMODE_STD);
|
||||||
|
if (*carparmhandle == NULL)
|
||||||
|
LogUSR.fatal("Couldn't load : %s\n", defaultfile.c_str());
|
||||||
|
else
|
||||||
|
LogUSR.info("Loaded : %s\n", defaultfile.c_str());
|
||||||
}
|
}
|
||||||
|
else
|
||||||
if (*carparmhandle == NULL)
|
LogUSR.info("Loaded : %s\n", trackfile.c_str());
|
||||||
LogUSR.fatal("Couldn't load : %s\n", defaultfile.c_str());
|
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
|
@ -65,16 +68,20 @@ MyParam::MyParam(void** carparmhandle, const std::string& datadir, const std::st
|
||||||
{
|
{
|
||||||
LogUSR.info("Couldn't load : %s\n", trackfilerain.c_str());
|
LogUSR.info("Couldn't load : %s\n", trackfilerain.c_str());
|
||||||
*carparmhandle = GfParmReadFile(defaultfilerain.c_str(), GFPARM_RMODE_STD);
|
*carparmhandle = GfParmReadFile(defaultfilerain.c_str(), GFPARM_RMODE_STD);
|
||||||
|
if (*carparmhandle == NULL)
|
||||||
|
{
|
||||||
|
LogUSR.info("Couldn't load : %s\n", defaultfilerain.c_str());
|
||||||
|
*carparmhandle = GfParmReadFile(defaultfile.c_str(), GFPARM_RMODE_STD);
|
||||||
|
if (*carparmhandle == NULL)
|
||||||
|
LogUSR.fatal("Couldn't load : %s\n", defaultfile.c_str());
|
||||||
|
else
|
||||||
|
LogUSR.info("Loaded : %s\n", defaultfile.c_str());
|
||||||
|
}
|
||||||
|
else
|
||||||
|
LogUSR.info("Loaded : %s\n", defaultfilerain.c_str());
|
||||||
}
|
}
|
||||||
|
else
|
||||||
if (*carparmhandle == NULL)
|
LogUSR.info("Loaded : %s\n", trackfilerain.c_str());
|
||||||
{
|
|
||||||
LogUSR.info("Couldn't load : %s\n", defaultfilerain.c_str());
|
|
||||||
*carparmhandle = GfParmReadFile(defaultfile.c_str(), GFPARM_RMODE_STD);
|
|
||||||
}
|
|
||||||
|
|
||||||
if (*carparmhandle == NULL)
|
|
||||||
LogUSR.fatal("Couldn't load : %s\n", defaultfile.c_str());
|
|
||||||
}
|
}
|
||||||
|
|
||||||
mCarParmHandle = *carparmhandle;
|
mCarParmHandle = *carparmhandle;
|
||||||
|
|
Loading…
Reference in a new issue