mirror of
https://github.com/ioquake/ioq3.git
synced 2025-06-02 09:51:21 +00:00
Remove newlines from Com_Error message format strings, patch by DevHC
This commit is contained in:
Thilo Schulz
parent
59271903a2
commit
c95bd0a684
20 changed files with 60 additions and 60 deletions
|
|
@ -517,7 +517,7 @@ qboolean FS_CreatePath (char *OSPath) {
|
|||
// create the directory
|
||||
*ofs = 0;
|
||||
if (!Sys_Mkdir (path)) {
|
||||
Com_Error( ERR_FATAL, "FS_CreatePath: failed to create path \"%s\"\n",
|
||||
Com_Error( ERR_FATAL, "FS_CreatePath: failed to create path \"%s\"",
|
||||
path );
|
||||
}
|
||||
*ofs = PATH_SEP;
|
||||
|
|
@ -630,7 +630,7 @@ fileHandle_t FS_SV_FOpenFileWrite( const char *filename ) {
|
|||
fileHandle_t f;
|
||||
|
||||
if ( !fs_searchpaths ) {
|
||||
Com_Error( ERR_FATAL, "Filesystem call made without initialization\n" );
|
||||
Com_Error( ERR_FATAL, "Filesystem call made without initialization" );
|
||||
}
|
||||
|
||||
ospath = FS_BuildOSPath( fs_homepath->string, filename, "" );
|
||||
|
|
@ -674,7 +674,7 @@ int FS_SV_FOpenFileRead( const char *filename, fileHandle_t *fp ) {
|
|||
fileHandle_t f = 0;
|
||||
|
||||
if ( !fs_searchpaths ) {
|
||||
Com_Error( ERR_FATAL, "Filesystem call made without initialization\n" );
|
||||
Com_Error( ERR_FATAL, "Filesystem call made without initialization" );
|
||||
}
|
||||
|
||||
f = FS_HandleForFile();
|
||||
|
|
@ -739,7 +739,7 @@ void FS_SV_Rename( const char *from, const char *to ) {
|
|||
char *from_ospath, *to_ospath;
|
||||
|
||||
if ( !fs_searchpaths ) {
|
||||
Com_Error( ERR_FATAL, "Filesystem call made without initialization\n" );
|
||||
Com_Error( ERR_FATAL, "Filesystem call made without initialization" );
|
||||
}
|
||||
|
||||
// don't let sound stutter
|
||||
|
|
@ -771,7 +771,7 @@ void FS_Rename( const char *from, const char *to ) {
|
|||
char *from_ospath, *to_ospath;
|
||||
|
||||
if ( !fs_searchpaths ) {
|
||||
Com_Error( ERR_FATAL, "Filesystem call made without initialization\n" );
|
||||
Com_Error( ERR_FATAL, "Filesystem call made without initialization" );
|
||||
}
|
||||
|
||||
// don't let sound stutter
|
||||
|
|
@ -801,7 +801,7 @@ on files returned by FS_FOpenFile...
|
|||
*/
|
||||
void FS_FCloseFile( fileHandle_t f ) {
|
||||
if ( !fs_searchpaths ) {
|
||||
Com_Error( ERR_FATAL, "Filesystem call made without initialization\n" );
|
||||
Com_Error( ERR_FATAL, "Filesystem call made without initialization" );
|
||||
}
|
||||
|
||||
if (fsh[f].zipFile == qtrue) {
|
||||
|
|
@ -831,7 +831,7 @@ fileHandle_t FS_FOpenFileWrite( const char *filename ) {
|
|||
fileHandle_t f;
|
||||
|
||||
if ( !fs_searchpaths ) {
|
||||
Com_Error( ERR_FATAL, "Filesystem call made without initialization\n" );
|
||||
Com_Error( ERR_FATAL, "Filesystem call made without initialization" );
|
||||
}
|
||||
|
||||
f = FS_HandleForFile();
|
||||
|
|
@ -874,7 +874,7 @@ fileHandle_t FS_FOpenFileAppend( const char *filename ) {
|
|||
fileHandle_t f;
|
||||
|
||||
if ( !fs_searchpaths ) {
|
||||
Com_Error( ERR_FATAL, "Filesystem call made without initialization\n" );
|
||||
Com_Error( ERR_FATAL, "Filesystem call made without initialization" );
|
||||
}
|
||||
|
||||
f = FS_HandleForFile();
|
||||
|
|
@ -917,7 +917,7 @@ fileHandle_t FS_FCreateOpenPipeFile( const char *filename ) {
|
|||
fileHandle_t f;
|
||||
|
||||
if ( !fs_searchpaths ) {
|
||||
Com_Error( ERR_FATAL, "Filesystem call made without initialization\n" );
|
||||
Com_Error( ERR_FATAL, "Filesystem call made without initialization" );
|
||||
}
|
||||
|
||||
f = FS_HandleForFile();
|
||||
|
|
@ -1065,7 +1065,7 @@ int FS_FOpenFileRead( const char *filename, fileHandle_t *file, qboolean uniqueF
|
|||
hash = 0;
|
||||
|
||||
if ( !fs_searchpaths ) {
|
||||
Com_Error( ERR_FATAL, "Filesystem call made without initialization\n" );
|
||||
Com_Error( ERR_FATAL, "Filesystem call made without initialization" );
|
||||
}
|
||||
|
||||
if ( file == NULL ) {
|
||||
|
|
@ -1104,7 +1104,7 @@ int FS_FOpenFileRead( const char *filename, fileHandle_t *file, qboolean uniqueF
|
|||
}
|
||||
|
||||
if ( !filename ) {
|
||||
Com_Error( ERR_FATAL, "FS_FOpenFileRead: NULL 'filename' parameter passed\n" );
|
||||
Com_Error( ERR_FATAL, "FS_FOpenFileRead: NULL 'filename' parameter passed" );
|
||||
}
|
||||
|
||||
// qpaths are not supposed to have a leading slash
|
||||
|
|
@ -1267,7 +1267,7 @@ char *FS_FindDll( const char *filename ) {
|
|||
directory_t *dir;
|
||||
|
||||
if ( !fs_searchpaths ) {
|
||||
Com_Error( ERR_FATAL, "Filesystem call made without initialization\n" );
|
||||
Com_Error( ERR_FATAL, "Filesystem call made without initialization" );
|
||||
}
|
||||
|
||||
for ( search = fs_searchpaths ; search ; search = search->next ) {
|
||||
|
|
@ -1297,7 +1297,7 @@ Properly handles partial reads
|
|||
*/
|
||||
int FS_Read2( void *buffer, int len, fileHandle_t f ) {
|
||||
if ( !fs_searchpaths ) {
|
||||
Com_Error( ERR_FATAL, "Filesystem call made without initialization\n" );
|
||||
Com_Error( ERR_FATAL, "Filesystem call made without initialization" );
|
||||
}
|
||||
|
||||
if ( !f ) {
|
||||
|
|
@ -1321,7 +1321,7 @@ int FS_Read( void *buffer, int len, fileHandle_t f ) {
|
|||
int tries;
|
||||
|
||||
if ( !fs_searchpaths ) {
|
||||
Com_Error( ERR_FATAL, "Filesystem call made without initialization\n" );
|
||||
Com_Error( ERR_FATAL, "Filesystem call made without initialization" );
|
||||
}
|
||||
|
||||
if ( !f ) {
|
||||
|
|
@ -1375,7 +1375,7 @@ int FS_Write( const void *buffer, int len, fileHandle_t h ) {
|
|||
FILE *f;
|
||||
|
||||
if ( !fs_searchpaths ) {
|
||||
Com_Error( ERR_FATAL, "Filesystem call made without initialization\n" );
|
||||
Com_Error( ERR_FATAL, "Filesystem call made without initialization" );
|
||||
}
|
||||
|
||||
if ( !h ) {
|
||||
|
|
@ -1436,7 +1436,7 @@ int FS_Seek( fileHandle_t f, long offset, int origin ) {
|
|||
int _origin;
|
||||
|
||||
if ( !fs_searchpaths ) {
|
||||
Com_Error( ERR_FATAL, "Filesystem call made without initialization\n" );
|
||||
Com_Error( ERR_FATAL, "Filesystem call made without initialization" );
|
||||
return -1;
|
||||
}
|
||||
|
||||
|
|
@ -1474,7 +1474,7 @@ int FS_Seek( fileHandle_t f, long offset, int origin ) {
|
|||
break;
|
||||
|
||||
default:
|
||||
Com_Error( ERR_FATAL, "Bad origin in FS_Seek\n" );
|
||||
Com_Error( ERR_FATAL, "Bad origin in FS_Seek" );
|
||||
return -1;
|
||||
break;
|
||||
}
|
||||
|
|
@ -1493,7 +1493,7 @@ int FS_Seek( fileHandle_t f, long offset, int origin ) {
|
|||
break;
|
||||
default:
|
||||
_origin = SEEK_CUR;
|
||||
Com_Error( ERR_FATAL, "Bad origin in FS_Seek\n" );
|
||||
Com_Error( ERR_FATAL, "Bad origin in FS_Seek" );
|
||||
break;
|
||||
}
|
||||
|
||||
|
|
@ -1517,11 +1517,11 @@ int FS_FileIsInPAK(const char *filename, int *pChecksum ) {
|
|||
long hash = 0;
|
||||
|
||||
if ( !fs_searchpaths ) {
|
||||
Com_Error( ERR_FATAL, "Filesystem call made without initialization\n" );
|
||||
Com_Error( ERR_FATAL, "Filesystem call made without initialization" );
|
||||
}
|
||||
|
||||
if ( !filename ) {
|
||||
Com_Error( ERR_FATAL, "FS_FOpenFileRead: NULL 'filename' parameter passed\n" );
|
||||
Com_Error( ERR_FATAL, "FS_FOpenFileRead: NULL 'filename' parameter passed" );
|
||||
}
|
||||
|
||||
// qpaths are not supposed to have a leading slash
|
||||
|
|
@ -1585,11 +1585,11 @@ int FS_ReadFile( const char *qpath, void **buffer ) {
|
|||
int len;
|
||||
|
||||
if ( !fs_searchpaths ) {
|
||||
Com_Error( ERR_FATAL, "Filesystem call made without initialization\n" );
|
||||
Com_Error( ERR_FATAL, "Filesystem call made without initialization" );
|
||||
}
|
||||
|
||||
if ( !qpath || !qpath[0] ) {
|
||||
Com_Error( ERR_FATAL, "FS_ReadFile with empty name\n" );
|
||||
Com_Error( ERR_FATAL, "FS_ReadFile with empty name" );
|
||||
}
|
||||
|
||||
buf = NULL; // quiet compiler warning
|
||||
|
|
@ -1694,7 +1694,7 @@ FS_FreeFile
|
|||
*/
|
||||
void FS_FreeFile( void *buffer ) {
|
||||
if ( !fs_searchpaths ) {
|
||||
Com_Error( ERR_FATAL, "Filesystem call made without initialization\n" );
|
||||
Com_Error( ERR_FATAL, "Filesystem call made without initialization" );
|
||||
}
|
||||
if ( !buffer ) {
|
||||
Com_Error( ERR_FATAL, "FS_FreeFile( NULL )" );
|
||||
|
|
@ -1720,7 +1720,7 @@ void FS_WriteFile( const char *qpath, const void *buffer, int size ) {
|
|||
fileHandle_t f;
|
||||
|
||||
if ( !fs_searchpaths ) {
|
||||
Com_Error( ERR_FATAL, "Filesystem call made without initialization\n" );
|
||||
Com_Error( ERR_FATAL, "Filesystem call made without initialization" );
|
||||
}
|
||||
|
||||
if ( !qpath || !buffer ) {
|
||||
|
|
@ -1977,7 +1977,7 @@ char **FS_ListFilteredFiles( const char *path, const char *extension, char *filt
|
|||
char zpath[MAX_ZPATH];
|
||||
|
||||
if ( !fs_searchpaths ) {
|
||||
Com_Error( ERR_FATAL, "Filesystem call made without initialization\n" );
|
||||
Com_Error( ERR_FATAL, "Filesystem call made without initialization" );
|
||||
}
|
||||
|
||||
if ( !path ) {
|
||||
|
|
@ -2108,7 +2108,7 @@ void FS_FreeFileList( char **list ) {
|
|||
int i;
|
||||
|
||||
if ( !fs_searchpaths ) {
|
||||
Com_Error( ERR_FATAL, "Filesystem call made without initialization\n" );
|
||||
Com_Error( ERR_FATAL, "Filesystem call made without initialization" );
|
||||
}
|
||||
|
||||
if ( !list ) {
|
||||
|
|
@ -3660,7 +3660,7 @@ void FS_Restart( int checksumFeed ) {
|
|||
lastValidBase[0] = '\0';
|
||||
lastValidGame[0] = '\0';
|
||||
FS_Restart(checksumFeed);
|
||||
Com_Error( ERR_DROP, "Invalid game folder\n" );
|
||||
Com_Error( ERR_DROP, "Invalid game folder" );
|
||||
return;
|
||||
}
|
||||
Com_Error( ERR_FATAL, "Couldn't load default.cfg" );
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue