diff options
| author | Andrey Nazarov <skuller@skuller.net> | 2007-11-25 20:57:50 +0000 |
|---|---|---|
| committer | Andrey Nazarov <skuller@skuller.net> | 2007-11-25 20:57:50 +0000 |
| commit | b00e7bd024285970dd00cfc75d8e690bfa475501 (patch) | |
| tree | 22ceeee3027fd4872f5621650557bc8ae4391948 /source/q_shared.h | |
| parent | 5eaaac93ad3b0d2777815717059d977912bd96f7 (diff) | |
Changed Com_sprintf --> Q_concat in quite some cases.
Make sure WAVE sound driver is built by default.
Added --disable-wave option to `configure'.
Command line history is now remembered between sessions.
ALT+Space refreshes all servers in Server Browser.
Handle command line agruments like original Q2 engine did.
Diffstat (limited to 'source/q_shared.h')
| -rw-r--r-- | source/q_shared.h | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/source/q_shared.h b/source/q_shared.h index f2066ba..3edc5af 100644 --- a/source/q_shared.h +++ b/source/q_shared.h @@ -30,9 +30,10 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #ifdef __GNUC__ -#define q_printf( f, a ) __attribute__(( format( printf, f, a ) )) -#define q_noreturn __attribute__(( noreturn )) -#define q_malloc __attribute__(( malloc )) +#define q_printf( f, a ) __attribute__((format( printf, f, a ))) +#define q_noreturn __attribute__((noreturn)) +#define q_malloc __attribute__((malloc)) +#define q_sentinel __attribute__((sentinel)) #define q_likely( x ) __builtin_expect( !!(x), 1 ) #define q_unlikely( x ) __builtin_expect( !!(x), 0 ) @@ -47,6 +48,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #define q_printf( f, a ) #define q_noreturn #define q_malloc +#define q_sentinel #define q_likely( x ) !!(x) #define q_unlikely( x ) !!(x) @@ -447,6 +449,7 @@ void COM_AppendExtension( char *path, const char *extension, int pathSize ); char *COM_FileExtension( const char *in ); qboolean COM_IsNumeric( const char *string ); +qboolean COM_HasSpaces( const char *string ); char *COM_SimpleParse( const char **data_p ); char *COM_Parse( const char **data_p ); @@ -464,6 +467,7 @@ char *Com_ReplaceSeparators( char *s, int separator ); // buffer safe operations int Q_strncpyz( char *dest, const char *src, int destsize ); int Q_strcat( char *dest, int destsize, const char *src ); +int Q_concat( char *buffer, int size, ... ) q_sentinel; int Com_sprintf( char *dest, int destsize, const char *fmt, ... ) q_printf( 3, 4 ); int Q_vsnprintf( char *dest, int destsize, const char *fmt, va_list argptr ); |