diff --git a/src/drivers/simplix/src/unitcommon.cpp b/src/drivers/simplix/src/unitcommon.cpp index c03e26020..b992f6ec8 100644 --- a/src/drivers/simplix/src/unitcommon.cpp +++ b/src/drivers/simplix/src/unitcommon.cpp @@ -2,17 +2,17 @@ // unitcommon.cpp //--------------------------------------------------------------------------* // TORCS: "The Open Racing Car Simulator" -// A robot for Speed Dreams Version 1.4.0 +// A robot for Speed Dreams-Version 1.4.0/2.X //--------------------------------------------------------------------------* // Common used functions // Gemeinsam nutzbare Funktionen // // File : unitcommon.cpp // Created : 2007.11.25 -// Last changed : 2008.12.21 -// Copyright : © 2007-2008 Wolf-Dieter Beelitz +// Last changed : 2010.11.12 +// Copyright : © 2007-2010 Wolf-Dieter Beelitz // eMail : wdb@wdbee.de -// Version : 2.00.000 +// Version : 3.00.000 //--------------------------------------------------------------------------* // This unit is based on the robot mouse_2006 // Diese Unit basiert auf dem Roboter mouse_2006 @@ -66,7 +66,7 @@ void* TUtils::MergeParamFile( const char* FileName) { PCarSettings NewParams = // Open setup file - GfParmReadFile(FileName, GFPARM_RMODE_STD); + GfParmReadFile(FileName, GFPARM_RMODE_STD, false); if(NewParams == NULL) // Return old one, return Params; // if new one is empty diff --git a/src/libs/tgf/params.cpp b/src/libs/tgf/params.cpp index d096f92c2..f0d3256d9 100644 --- a/src/libs/tgf/params.cpp +++ b/src/libs/tgf/params.cpp @@ -1158,13 +1158,13 @@ GfParmReadBuf (char *buffer) void * -GfParmReadFileLocal(const char *file, int mode) +GfParmReadFileLocal(const char *file, int mode, bool neededFile) { //use local dir char buf[255]; sprintf(buf, "%s%s", GetLocalDir(),file); - void *pResult = GfParmReadFile(buf,mode); + void *pResult = GfParmReadFile(buf,mode,neededFile); return pResult; } @@ -1183,7 +1183,7 @@ GfParmReadFileLocal(const char *file, int mode)
0 if Error */ void * -GfParmReadFile (const char *file, int mode) +GfParmReadFile (const char *file, int mode, bool neededFile) { FILE *in = NULL; struct parmHeader *conf; @@ -1227,7 +1227,8 @@ GfParmReadFile (const char *file, int mode) if (mode & GFPARM_RMODE_REREAD) { in = fopen (file, "r"); if (!in && ((mode & GFPARM_RMODE_CREAT) == 0)) { - GfLogTrace ("Failed to load \"%s\" (fopen failed)\n", file); + if (neededFile) + GfLogTrace ("Failed to load \"%s\" (fopen failed)\n", file); goto bailout; } diff --git a/src/libs/tgf/tgf.h b/src/libs/tgf/tgf.h index 125ac45b2..5c1e8cb01 100644 --- a/src/libs/tgf/tgf.h +++ b/src/libs/tgf/tgf.h @@ -299,8 +299,8 @@ TGF_API char* GfPathMakeOSCompatible(char* path); #define GFPARM_RMODE_CREAT 0x04 /**< Create the file if doesn't exist */ #define GFPARM_RMODE_PRIVATE 0x08 -TGF_API void * GfParmReadFileLocal(const char *file, int mode); -TGF_API void *GfParmReadFile(const char *file, int mode); +TGF_API void * GfParmReadFileLocal(const char *file, int mode, bool neededFile = true); +TGF_API void *GfParmReadFile(const char *file, int mode, bool neededFile = true); /* parameter file write */ TGF_API int GfParmWriteFileLocal(const char *file, void* handle, const char *name); TGF_API int GfParmWriteFile(const char *file, void* handle, const char *name);