fixed bug where animated mdl skins (such as Tomaz's health box and

[xonotic/darkplaces.git] / quakedef.h

diff --git a/quakedef.h b/quakedef.h
index 675914072423d88d97d5cc75e07e412f745c8004..936ec175e1818575cbcf6fa42d4e3eb9223ede41 100644 (file)
--- a/quakedef.h
+++ b/quakedef.h
@@ -22,6 +22,11 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #ifndef QUAKEDEF_H
 #define QUAKEDEF_H
 
+#if defined(__GNUC__) && (__GNUC__ > 2)
+#define DP_FUNC_PRINTF(n) __attribute__ ((format (printf, n, n+1)))
+#else
+#define DP_FUNC_PRINTF(n)
+#endif
 
 #include <sys/types.h>
 #include <ctype.h>
@@ -50,7 +55,6 @@ extern char engineversion[128];
 #define MAX_PACKETFRAGMENT 1024                // max length of packet fragment
 #define NET_MAXMESSAGE 65536
 #define NET_MINRATE            1000 // limits "rate" and "sv_maxrate" cvars
-#define NET_MAXRATE            150000 // limits "rate" and "sv_maxrate" cvars
 
 //
 // per-level limits
@@ -209,6 +213,7 @@ extern char engineversion[128];
 #include "sbar.h"
 #include "sound.h"
 #include "model_shared.h"
+#include "world.h"
 #include "client.h"
 #include "render.h"
 #include "progs.h"
@@ -216,7 +221,6 @@ extern char engineversion[128];
 #include "server.h"
 
 #include "input.h"
-#include "world.h"
 #include "keys.h"
 #include "console.h"
 #include "menu.h"
@@ -239,9 +243,9 @@ void Host_InitCommands(void);
 void Host_Main(void);
 void Host_Shutdown(void);
 void Host_StartVideo(void);
-void Host_Error(const char *error, ...);
+void Host_Error(const char *error, ...) DP_FUNC_PRINTF(1);
 void Host_Quit_f(void);
-void Host_ClientCommands(const char *fmt, ...);
+void Host_ClientCommands(const char *fmt, ...) DP_FUNC_PRINTF(1);
 void Host_ShutdownServer(void);
 void Host_Reconnect_f(void);
 
@@ -254,6 +258,7 @@ extern int current_skill;
 // chase
 //
 extern cvar_t chase_active;
+extern cvar_t cl_viewmodel_scale;
 
 void Chase_Init (void);
 void Chase_Reset (void);