team-fte
/
fteqw
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fix builds 

git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@2080 fc73d0e0-1445-4013-8a0c-d673dee63da5
This commit is contained in:
TimeServ 2006-03-11 04:39:16 +00:00
parent aeea639fc2
commit 12cd7eb5bd
9 changed files with 28 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
engine/client/m_mp3.c
View File

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

12
engine/gl/gl_alias.c
View File

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

2
engine/server/sv_init.c
View File

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

8
engine/server/sv_send.c
View File

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

10
engine/server/sv_sys_win.c
View File

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

2
engine/server/svmodel.c
View File

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

2
engine/sw/r_main.c
View File

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

2
engine/sw/sw_draw.c
View File

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

14
engine/sw/sw_model.c
View File

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