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

Do not show messages for not needed missing files

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

Former-commit-id: 6b98b9e589271cf08c8c932d1808d90e2268e9f3
Former-commit-id: e382c299cd14470233d95b135b9e5f7d06c48f66
This commit is contained in:
wdbee 2010-11-13 13:29:27 +00:00
parent 780c3d9eb8
commit 4c8a6869c1
3 changed files with 12 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/drivers/simplix/src/unitcommon.cpp
View file

@ -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

9
src/libs/tgf/params.cpp
View file

@ -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)
<br>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;
}

4
src/libs/tgf/tgf.h
View file

@ -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);