fix builds

git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@2080 fc73d0e0-1445-4013-8a0c-d673dee63da5

engine/client/m_mp3.c

@@ -1871,10 +1871,10 @@ void Media_RecordAudioFrame (short *sample_buffer, int samples) {}
 void Media_StopRecordFilm_f (void) {}
 void Media_RecordFilm_f (void){}
 void M_Menu_Media_f (void) {}
+
 char *Media_NextTrack(void) {return NULL;}
 qboolean Media_PausedDemo(void) {return false;}
+qboolean Media_PlayingFullScreen(void) {return false;}
 
 int filmtexture;
-media_filmtype_t media_filmtype;
-
 #endif

engine/gl/gl_alias.c

@@ -4329,25 +4329,25 @@ void GL_LoadQ3Model(model_t *mod, void *buffer)
 				texnum->bump = 0;
 				if (gl_bumpmappingpossible)
 				{
-					COM_StripExtension(shadname, name);	//go for the normalmap
+					COM_StripExtension(shadname, name, sizeof(name));	//go for the normalmap
 					strcat(name, "_norm");
 					texnum->bump = Mod_LoadHiResTexture(name, "models", true, true, false);
 					if (!texnum->bump)
 					{
 						strcpy(name, loadmodel->name);
-						COM_StripExtension(COM_SkipPath(shadname), COM_SkipPath(name));
+						COM_StripExtension(COM_SkipPath(shadname), COM_SkipPath(name), sizeof(name));
 						strcat(name, "_norm");
 						texnum->bump = Mod_LoadHiResTexture(name, "models", true, true, false);
 						if (!texnum->bump)
 						{
-							COM_StripExtension(shadname, name);	//bother, go for heightmap and convert
+							COM_StripExtension(shadname, name, sizeof(name));	//bother, go for heightmap and convert
 							strcat(name, "_bump");
 							texnum->bump = Mod_LoadBumpmapTexture(name, "models");
 							if (!texnum->bump)
 							{
 								strcpy(name, loadmodel->name);
 								strcpy(COM_SkipPath(name), COM_SkipPath(shadname));	//eviile eh?
-								COM_StripExtension(name, name);
+								COM_StripExtension(name, name, sizeof(name));
 								strcat(name, "_bump");
 								texnum->bump = Mod_LoadBumpmapTexture(name, "models");
 							}
@@ -4356,14 +4356,14 @@ void GL_LoadQ3Model(model_t *mod, void *buffer)
 				}
 				if (r_fb_models.value)
 				{
-					COM_StripExtension(shadname, name);	//go for the normalmap
+					COM_StripExtension(shadname, name, sizeof(name));	//go for the normalmap
 					strcat(name, "_luma");
 					texnum->fullbright = Mod_LoadHiResTexture(name, "models", true, true, true);
 					if (!texnum->base)
 					{
 						strcpy(name, loadmodel->name);
 						strcpy(COM_SkipPath(name), COM_SkipPath(shadname));	//eviile eh?
-						COM_StripExtension(name, name);
+						COM_StripExtension(name, name, sizeof(name));
 						strcat(name, "_luma");
 						texnum->fullbright = Mod_LoadBumpmapTexture(name, "models");
 					}

engine/server/sv_init.c

@@ -745,7 +745,7 @@ void SV_SpawnServer (char *server, char *startspot, qboolean noents, qboolean us
 		sv_allow_cheats = false;
 		Info_SetValueForStarKey(svs.info, "*cheats", "", MAX_SERVERINFO_STRING);
 	}
-#ifndef CLIENTONLY
+#ifndef SERVERONLY
 	Q_strncpyz(cl.serverinfo, svs.info, sizeof(cl.serverinfo));
 	CL_CheckServerInfo();
 #endif

engine/server/sv_send.c

@@ -140,7 +140,7 @@ void VARGS Con_Printf (const char *fmt, ...)
 	char		msg[MAXPRINTMSG];
 
 	va_start (argptr,fmt);
-	_vsnprintf (msg,sizeof(msg)-1, fmt,argptr);
+	vsnprintf (msg,sizeof(msg)-1, fmt,argptr);
 	va_end (argptr);
 
 	// add to redirected message
@@ -167,7 +167,7 @@ void Con_TPrintf (translation_t stringnum, ...)
 	{
 		fmt = languagetext[stringnum][sv_redirectedlang];
 		va_start (argptr,stringnum);
-		_vsnprintf (msg,sizeof(msg)-1, fmt,argptr);
+		vsnprintf (msg,sizeof(msg)-1, fmt,argptr);
 		va_end (argptr);
 
 		if (strlen (msg) + strlen(outputbuf) > sizeof(outputbuf) - 1)
@@ -179,7 +179,7 @@ void Con_TPrintf (translation_t stringnum, ...)
 	fmt = languagetext[stringnum][svs.language];
 
 	va_start (argptr,stringnum);
-	_vsnprintf (msg,sizeof(msg)-1, fmt,argptr);
+	vsnprintf (msg,sizeof(msg)-1, fmt,argptr);
 	va_end (argptr);
 
 	Sys_Printf ("%s", msg);	// also echo to debugging console
@@ -202,7 +202,7 @@ void Con_DPrintf (char *fmt, ...)
 		return;
 
 	va_start (argptr,fmt);
-	_vsnprintf (msg,sizeof(msg)-1, fmt,argptr);
+	vsnprintf (msg,sizeof(msg)-1, fmt,argptr);
 	va_end (argptr);
 
 	// add to redirected message

engine/server/sv_sys_win.c

@@ -102,7 +102,7 @@ void *Sys_GetGameAPI (void *parms)
 #else
 	_getcwd (cwd, sizeof(cwd));
 #endif
-	_snprintf (name, sizeof(name), "%s/%s/%s", cwd, debugdir, gamename);
+	snprintf (name, sizeof(name), "%s/%s/%s", cwd, debugdir, gamename);
 	game_library = LoadLibrary ( name );
 	if (game_library)
 	{
@@ -128,7 +128,7 @@ void *Sys_GetGameAPI (void *parms)
 				path = COM_NextPath (path);
 				if (!path)
 					return NULL;		// couldn't find one anywhere
-				_snprintf (name, sizeof(name), "%s/%s", path, gamename);
+				snprintf (name, sizeof(name), "%s/%s", path, gamename);
 				game_library = LoadLibrary (name);
 				if (game_library)
 				{
@@ -182,7 +182,7 @@ int Sys_DebugLog(char *file, char *fmt, ...)
     int fd;
     
     va_start(argptr, fmt);
-    _vsnprintf(data, sizeof(data)-1, fmt, argptr);
+    vsnprintf(data, sizeof(data)-1, fmt, argptr);
     va_end(argptr);
     fd = open(file, O_WRONLY | O_CREAT | O_APPEND, 0666);
 	if (fd)
@@ -291,7 +291,7 @@ void Sys_Error (const char *error, ...)
 	double end;
 
 	va_start (argptr,error);
-	_vsnprintf (text,sizeof(text)-1, error,argptr);
+	vsnprintf (text,sizeof(text)-1, error,argptr);
 	va_end (argptr);
 
 
@@ -505,7 +505,7 @@ void Sys_Printf (char *fmt, ...)
 		unsigned char *t;
 
 		va_start (argptr,fmt);
-		_vsnprintf (msg,sizeof(msg)-1, fmt,argptr);
+		vsnprintf (msg,sizeof(msg)-1, fmt,argptr);
 		va_end (argptr);
 
 		{

engine/server/svmodel.c

@@ -259,7 +259,7 @@ model_t *Mod_LoadModel (model_t *mod, qboolean crash)
 //
 // allocate a new model
 //
-	COM_FileBase (mod->name, loadname);
+	COM_FileBase (mod->name, loadname, sizeof(loadname));
 
 	loadmodel = mod;
 

engine/sw/r_main.c

@@ -316,7 +316,7 @@ void SWR_NewMap (void)
 								   "edges");
 	}
 
-	COM_StripExtension(COM_SkipPath(cl.worldmodel->name), namebuf);
+	COM_StripExtension(COM_SkipPath(cl.worldmodel->name), namebuf, sizeof(namebuf));
 	Cvar_Set(&host_mapname, namebuf);
 
 	r_dowarpold = false;

engine/sw/sw_draw.c

@@ -85,7 +85,7 @@ mpic_t	*SWDraw_SafeCachePic (char *extpath)
 	char alternatename[MAX_QPATH];
 	char path[MAX_QPATH];
 	Q_strncpyz(path, extpath, sizeof(path));
-	COM_StripExtension(path, path);
+	COM_StripExtension(path, path, sizeof(path));
 
 	for (pic=swmenu_cachepics, i=0 ; i<swmenu_numcachepics ; pic++, i++)
 		if (!strcmp (path, pic->name))

engine/sw/sw_model.c

@@ -311,7 +311,7 @@ model_t *SWMod_LoadModel (model_t *mod, qboolean crash)
 	if (!isDedicated && (!Q_strcasecmp(ext, "mdl") || !Q_strcasecmp(ext, "bsp")))
 	{
 		char mdlbase[MAX_QPATH];
-		COM_StripExtension(mod->name, mdlbase);
+		COM_StripExtension(mod->name, mdlbase, sizeof(mdlbase));
 
 		if (!buf)
 			buf = (unsigned *)COM_LoadStackFile (va("%s.md3", mdlbase), stackbuf, sizeof(stackbuf));
@@ -346,7 +346,7 @@ model_t *SWMod_LoadModel (model_t *mod, qboolean crash)
 //
 // allocate a new model
 //
-	COM_FileBase (mod->name, loadname);
+	COM_FileBase (mod->name, loadname, sizeof(loadname));
 	
 	loadmodel = mod;
 #ifndef SERVERONLY
@@ -828,14 +828,14 @@ void SWMod_LoadLighting (lump_t *l)
 			if (!litdata)
 			{							
 				strcpy(litname, loadmodel->name);
-				COM_StripExtension(loadmodel->name, litname);
+				COM_StripExtension(loadmodel->name, litname, sizeof(litname));
-				COM_DefaultExtension(litname, ".lit");
+				COM_DefaultExtension(litname, ".lit", sizeof(litname));
 				litdata = COM_LoadHunkFile(litname);
 			}
 			if (!litdata)
 			{
 				strcpy(litname, "lits/");
-				COM_StripExtension(COM_SkipPath(loadmodel->name), litname+5);
+				COM_StripExtension(COM_SkipPath(loadmodel->name), litname+5, sizeof(litname)-5);
 				strcat(litname, ".lit");
 				
 				litdata = COM_LoadHunkFile(litname);
@@ -1470,8 +1470,8 @@ void SWMod_LoadCrouchHull(void)
 
 	//find a name for a ccn and try to load it.
 	strcpy(crouchhullname, loadmodel->name);
-	COM_StripExtension(loadmodel->name, crouchhullname);
+	COM_StripExtension(loadmodel->name, crouchhullname, sizeof(crouchhullname));
-	COM_DefaultExtension(crouchhullname, ".crh");	//crouch hull
+	COM_DefaultExtension(crouchhullname, ".crh", sizeof(crouchhullname));	//crouch hull
 
 	crouchhullfile = COM_LoadMallocFile(crouchhullname);	//or otherwise temporary storage. load on hunk if you want, but that would be a waste.
 	if (!crouchhullfile)