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

Removed moodles' infokey stuff which was totally wrong anyway. 

Enabled the prototype warnings. Looks like we need them.
Fixed a few warnings other than the prototype ones which I just enabled.


git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@1898 fc73d0e0-1445-4013-8a0c-d673dee63da5
This commit is contained in:
Spoike 2006-01-28 02:35:40 +00:00
parent 9caf98dc48
commit 9620a98dc2
25 changed files with 72 additions and 139 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
engine/client/cl_ents.c
View File

@ -1636,10 +1636,6 @@ void CL_LinkPacketEntities (void)
else
{
#ifdef SWQUAKE
//if they're in different files it's probably just the compiler not knowing the return type when it reaches that line so it guesses int
//timeserv thinks we need a prototype (whatever that is) ~ Moodles
#pragma warning(disable:4047)
ent->palremap = D_IdentityRemap();
#endif
ent->scoreboard = NULL;
@ -2206,9 +2202,6 @@ void CL_LinkProjectiles (void)
ent->frame = 0;
ent->flags = 0;
#ifdef SWQUAKE
//if they're in different files it's probably just the compiler not knowing the return type when it reaches that line so it guesses int
//timeserv thinks we need a prototype (whatever that is) ~ Moodles
#pragma warning(disable:4047)
ent->palremap = D_IdentityRemap();
#endif
ent->scoreboard = NULL;
@ -2782,6 +2775,7 @@ void CL_LinkPlayers (void)
// only predict half the move to minimize overruns
msec = 500*(playertime - state->state_time);
/*
if (1)
{
float f;
@ -2799,7 +2793,9 @@ void CL_LinkPlayers (void)
}
}
else if (pnum < cl.splitclients)
else
*/
if (pnum < cl.splitclients)
{ //this is a local player
}
else if (msec <= 0 || (!cl_predict_players.value && !cl_predict_players2.value))

4
engine/client/cl_parse.c
View File

@ -2353,10 +2353,6 @@ void CL_ParseStatic (int version)
ent->model = cl.model_precache[es.modelindex];
ent->oldframe = ent->frame = es.frame;
#ifdef SWQUAKE
//if they're in different files it's probably just the compiler not knowing the return type when it reaches that line so it guesses int
//timeserv thinks we need a prototype (whatever that is) ~ Moodles
#pragma warning(disable:4047)
ent->palremap = D_IdentityRemap();
#endif
ent->skinnum = es.skinnum;

2
engine/client/cl_tent.c
View File

@ -2314,8 +2314,6 @@ entity_t *CL_NewTempEntity (void)
#ifdef SWQUAKE
//if they're in different files it's probably just the compiler not knowing the return type when it reaches that line so it guesses int
//timeserv thinks we need a prototype (whatever that is) ~ Moodles
#pragma warning(disable:4047)
ent->palremap = D_IdentityRemap();
#endif
#ifdef PEXT_SCALE

4
engine/client/quakedef.h
View File

@ -61,7 +61,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#pragma warning(3:4019) // empty statement at global scope
//#pragma warning(3:4057) // pointers refer to different base types
#pragma warning(3:4125) // decimal digit terminates octal escape
//#pragma warning(2:4131) // old-style function declarator
#pragma warning(2:4131) // old-style function declarator
#pragma warning(3:4211) // extern redefined as static
//#pragma warning(3:4213) // cast on left side of = is non-standard
#pragma warning(3:4222) // member function at file scope shouldn't be static
@ -76,7 +76,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#pragma warning(3:4674) // dtor of thrown object is inaccessible
#pragma warning(3:4705) // statement has no effect (example: a+1;)
#pragma warning(4:4013) // statement has no effect (example: a+1;)
#pragma warning(3:4013) // function undefined, assuming extern returning int
#pragma warning( 4 : 4267) //truncation from const double to float

17
engine/client/renderer.c
View File

@ -1211,7 +1211,9 @@ void M_Menu_Video_f (void)
int prefab2dmode;
int currentbpp;
int currenttexturefilter;
#ifdef RGLQUAKE
int currentanisotropy;
#endif
int i, y;
char bilinear[] = "gl_linear_mipmap_nearest";
@ -1260,20 +1262,23 @@ void M_Menu_Video_f (void)
else
currentbpp = 0;
#ifdef RGLQUAKE
if (gl_anisotropy_factor >= 2)
currenttexturefilter = 2;
else if (strcmp(gl_texturemode.string,trilinear))
else
#endif
if (strcmp(gl_texturemode.string,trilinear))
currenttexturefilter = 0;
else if (strcmp(gl_texturemode.string,bilinear))
currenttexturefilter = 1;
else
currenttexturefilter = 1;
#ifdef RGLQUAKE
if (gl_anisotropy_factor == 1)
currentanisotropy = 0;
else
currentanisotropy = gl_anisotropy_factor/2;
#endif
MC_AddCenterPicture(menu, 4, "vidmodes");
@ -1772,10 +1777,6 @@ TRACE(("dbg: R_ApplyRenderer: efrags\n"));
{
cl_static_entities[i].model = cl.model_precache[staticmodelindex[i]];
#ifdef SWQUAKE
//if they're in different files it's probably just the compiler not knowing the return type when it reaches that line so it guesses int
//timeserv thinks we need a prototype (whatever that is) ~ Moodles
#pragma warning(disable:4047)
cl_static_entities[i].palremap = D_IdentityRemap();
#endif
if (staticmodelindex[i]) //make sure it's worthwhile.
@ -1891,7 +1892,7 @@ TRACE(("dbg: R_RestartRenderer_f\n"));
}
else
{
Con_Printf("^1Attempting default refresh rate\n");
Con_Printf("^1Trying default refresh rate\n");
newr.rate = 0;
if (!R_ApplyRenderer(&oldr))
{

2
engine/client/valid.c
View File

@ -130,7 +130,9 @@ void ValidationPrintVersion(char *f_query_string)
//char answer; //unreferenced
//char name[128]; //unrefernced
char sr[256];
#ifdef RGLQUAKE
char *s; // unreferenced in software only client
#endif
int i;
extern cvar_t r_shadow_realtime_world, r_drawflat;

4
engine/client/view.c
View File

@ -1185,10 +1185,6 @@ void V_CalcRefdef (int pnum)
view->model = cl.model_precache[cl.stats[pnum][STAT_WEAPON]];
view->frame = view_message?view_message->weaponframe:0;
#ifdef SWQUAKE
//if they're in different files it's probably just the compiler not knowing the return type when it reaches that line so it guesses int
//timeserv thinks we need a prototype (whatever that is) ~ Moodles
#pragma warning(disable:4047)
view->palremap = D_IdentityRemap();
#endif

92
engine/common/common.c
View File

@ -2692,87 +2692,6 @@ void Info_SetValueForStarKey (char *s, const char *key, const char *value, int m
*s = 0;
}
void Info_SetValueForStarKeyMoodles (char *s, const char *key, int value, int maxsize)
{
char newv[1024], *v;
int c;
#ifdef SERVERONLY
extern cvar_t sv_highchars;
#endif
if (strstr (key, "\\"))
{
Con_TPrintf (TL_KEYHASSLASH);
return;
}
if (strstr (key, "\"") )
{
Con_TPrintf (TL_KEYHASQUOTE);
return;
}
if (strlen(key) >= MAX_INFO_KEY)
{
Con_TPrintf (TL_KEYTOOLONG);
return;
}
// this next line is kinda trippy
if (*(v = Info_ValueForKey(s, key)))
{
if (*Info_ValueForKey(s, "*ver")) //quick hack to kill off unneeded info on overflow. We can't simply increase the quantity of this stuff.
{
Info_RemoveKey(s, "*ver");
Info_SetValueForStarKeyMoodles (s, key, value, maxsize);
return;
}
Con_TPrintf (TL_INFOSTRINGTOOLONG);
return;
}
Info_RemoveKey (s, key);
if (!value)
return;
_snprintf (newv, sizeof(newv), "\\%s\\%s", key, value);
if ((int)(strlen(newv) + strlen(s) + 1) > maxsize)
{
Con_TPrintf (TL_INFOSTRINGTOOLONG);
return;
}
// only copy ascii values
s += strlen(s);
v = newv;
while (*v)
{
c = (unsigned char)*v++;
#ifndef SERVERONLY
// client only allows highbits on name
if (stricmp(key, "name") != 0) {
c &= 127;
if (c < 32 || c > 127)
continue;
// auto lowercase team
if (stricmp(key, "team") == 0)
c = tolower(c);
}
#else
if (!sv_highchars.value) {
c &= 127;
if (c < 32 || c > 127)
continue;
}
#endif
// c &= 127; // strip high bits
if (c > 13) // && c < 127)
*s++ = c;
}
*s = 0;
}
void Info_SetValueForKey (char *s, const char *key, const char *value, int maxsize)
{
if (key[0] == '*')
@ -2784,17 +2703,6 @@ void Info_SetValueForKey (char *s, const char *key, const char *value, int maxsi
Info_SetValueForStarKey (s, key, value, maxsize);
}
void Info_SetValueForKeyMoodles (char *s, const char *key, int value, int maxsize) //modified to accept an integer in svq3_game.c
{
if (key[0] == '*')
{
Con_TPrintf (TL_STARKEYPROTECTED);
return;
}
Info_SetValueForStarKeyMoodles (s, key, value, maxsize);
}
void Info_Print (char *s)
{
char key[1024];

7
engine/common/common.h
View File

@ -286,6 +286,8 @@ typedef enum {FSLFRT_IFFOUND, FSLFRT_LENGTH, FSLFRT_DEPTH_OSONLY, FSLFRT_DEPTH_A
//if loc is valid, loc->search is always filled in, the others are filled on success.
//returns -1 if couldn't find.
int FS_FLocateFile(char *filename, FSLF_ReturnType_e returntype, flocation_t *loc);
char *FS_GetPackHashes(char *buffer, int buffersize, qboolean referencedonly);
char *FS_GetPackNames(char *buffer, int buffersize, qboolean referencedonly);
int COM_FOpenFile (char *filename, FILE **file);
int COM_FOpenWriteFile (char *filename, FILE **file);
@ -319,7 +321,10 @@ typedef struct vfsfile_s {
#define VFS_FLUSH(vf) do{if(vf->Flush)vf->Flush(vf);}while(0)
char *VFS_GETS(vfsfile_t *vf, char *buffer, int buflen);
void FS_Remove(char *fname, int relativeto);
void FS_FlushFSHash(void);
void FS_CreatePath(char *pname, int relativeto);
int FS_Rename(char *oldf, char *newf, int relativeto); //0 on success, non-0 on error
int FS_Remove(char *fname, int relativeto); //0 on success, non-0 on error
vfsfile_t *FS_OpenVFS(char *filename, char *mode, int relativeto);
enum {
FS_GAME,

8
engine/common/fs.c
View File

@ -1718,7 +1718,7 @@ void FS_Rename2(char *oldf, char *newf, int oldrelativeto, int newrelativeto)
rename(va("%s%s", oldfullname, oldf), va("%s%s", newfullname, newf));
}
void FS_Rename(char *oldf, char *newf, int relativeto)
int FS_Rename(char *oldf, char *newf, int relativeto)
{
char fullname[MAX_OSPATH];
@ -1745,11 +1745,11 @@ void FS_Rename(char *oldf, char *newf, int relativeto)
default:
Sys_Error("FS_Rename case not handled\n");
}
rename(va("%s%s", fullname, oldf), va("%s%s", fullname, newf));
return rename(va("%s%s", fullname, oldf), va("%s%s", fullname, newf));
}
void FS_Remove(char *fname, int relativeto)
int FS_Remove(char *fname, int relativeto)
{
unlink (fname);
return unlink (fname);
}
void FS_CreatePath(char *pname, int relativeto)
{

1
engine/common/pmovetst.c
View File

@ -19,6 +19,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
#include "quakedef.h"
int Q1BSP_HullPointContents(hull_t *hull, vec3_t p);
static hull_t box_hull;
static dclipnode_t box_clipnodes[6];
static mplane_t box_planes[6];

11
engine/gl/gl_alias.c
View File

@ -182,7 +182,9 @@ typedef struct {
int bump;
int fullbright;
#ifdef Q3SHADERS
shader_t *shader;
#endif
} galiastexnum_t;
typedef struct {
@ -4685,6 +4687,8 @@ void GLMod_LoadDarkPlacesModel(model_t *mod, void *buffer)
galiasskin_t *skin;
galiastexnum_t *texnum;
int skinfiles;
float *inst;
float *outst;
#endif
int i, j, k;
@ -4701,10 +4705,6 @@ void GLMod_LoadDarkPlacesModel(model_t *mod, void *buffer)
galiasbone_t *outbone;
dpmbone_t *inbone;
float *inst; //unreferenced local variable in the dedicated server
float *outst = 0;
float *outposedata;
galiasgroup_t *outgroups;
float *inposedata;
@ -4784,10 +4784,11 @@ void GLMod_LoadDarkPlacesModel(model_t *mod, void *buffer)
outst[0] = BigFloat(inst[0]);
outst[1] = BigFloat(inst[1]);
}
transforms = (galisskeletaltransforms_t*)outst;
#endif
//build the transform list.
transforms = (galisskeletaltransforms_t*)outst;
m->ofstransforms = (char*)transforms - (char*)m;
m->numtransforms = numtransforms;
vert = (dpmvertex_t*)((char *)buffer+mesh->ofs_verts);

2
engine/gl/gl_draw.c
View File

@ -342,7 +342,7 @@ mpic_t *GLDraw_SafePicFromWad (char *name)
mpic_t *GLDraw_SafeCachePic (char *path)
{
int height;
int height = 0;
qbyte *data;
glcachepic_t *pic;
int i;

4
engine/gl/shader.h
View File

@ -1,3 +1,4 @@
#ifdef Q3SHADERS
#define SHADER_PASS_MAX 8
#define SHADER_MAX_TC_MODS 8
#define SHADER_DEFORM_MAX 8
@ -245,3 +246,6 @@ void Shader_DefaultSkinShell(char *shortname, shader_t *s);
void R_BackendInit (void);
void Shader_Shutdown (void);
qboolean Shader_Init (void);
mfog_t *CM_FogForOrigin(vec3_t org);
#endif

1
engine/qclib/qcc.h
View File

@ -782,6 +782,7 @@ char *QCC_PR_ValueString (etype_t type, void *val);
void QCC_PR_ClearGrabMacros (void);
pbool QCC_PR_CompileFile (char *string, char *filename);
void QCC_PR_ResetErrorScope(void);
extern pbool pr_dumpasm;

2
engine/server/pr_cmds.c
View File

@ -353,7 +353,7 @@ int QCEditor (progfuncs_t *prinst, char *filename, int line, int nump, char **pa
{
for (i = 0; i < line; i++)
{
VFS_GETS(buffer, sizeof(buffer), f);
VFS_GETS(f, buffer, sizeof(buffer));
}
if ((r = strchr(buffer, '\r')))
{ r[0] = '\n';r[1]='\0';}

2
engine/server/progs.h
View File

@ -118,3 +118,5 @@ qboolean PR_QCChat(char *text, int say_type);
void PR_ClientUserInfoChanged(char *name, char *oldivalue, char *newvalue);
void PR_LocalInfoChanged(char *name, char *oldivalue, char *newvalue);
void PF_InitTempStrings(progfuncs_t *prinst);

2
engine/server/server.h
View File

@ -991,6 +991,7 @@ void SV_FindModelNumbers (void);
void SVNQ_New_f (void);
void SVNQ_ExecuteClientMessage (client_t *cl);
#endif
qboolean SV_UserInfoIsBasic(char *infoname); //standard message.
void SV_ExecuteClientMessage (client_t *cl);
void SVQ2_ExecuteClientMessage (client_t *cl);
int SV_PMTypeForClient (client_t *cl);
@ -1001,6 +1002,7 @@ void SV_ClientThink (void);
void VoteFlushAll(void);
void SV_SetUpClientEdict (client_t *cl, edict_t *ent);
void SV_UpdateToReliableMessages (void);
//sv_master.c
void SVM_Think(int port);

2
engine/server/sv_ents.c
View File

@ -1811,6 +1811,8 @@ int i, eff;
float miss;
unsigned int bits=0;
int glowsize=0, glowcolor=0;
for (i=0 ; i<3 ; i++)
{
miss = ent->v->origin[i] - ent->baseline.origin[i];

1
engine/server/sv_user.c
View File

@ -1874,7 +1874,6 @@ void SV_Say (qboolean team)
{
client_t *client;
int j;
//int tmp; //unreferenced
char *p;
char text[1024];
char t1[32], *t2;

11
engine/server/svmodel.c
View File

@ -31,6 +31,12 @@ void Mod_LoadQ2BrushModel (model_t *mod, void *buffer);
void Mod_LoadAliasModel (model_t *mod, void *buffer);
model_t *Mod_LoadModel (model_t *mod, qboolean crash);
void GL_LoadQ1Model (model_t *mod, void *buffer);
void GL_LoadQ2Model (model_t *mod, void *buffer);
void GL_LoadQ3Model (model_t *mod, void *buffer);
void GLMod_LoadZymoticModel (model_t *mod, void *buffer);
void GLMod_LoadDarkPlacesModel(model_t *mod, void *buffer);
qbyte mod_novis[MAX_MAP_LEAFS/8];
#define MAX_MOD_KNOWN 512
@ -301,6 +307,11 @@ model_t *Mod_LoadModel (model_t *mod, qboolean crash)
GLMod_LoadZymoticModel(mod, buf);
break;
#endif
#ifdef ZYMOTICMODELS
case (('K'<<24)+('R'<<16)+('A'<<8)+'D'):
GLMod_LoadDarkPlacesModel(mod, buf);
break;
#endif
default:
if (crash)

12
engine/server/svq3_game.c
View File

@ -1824,7 +1824,7 @@ void SV_InitBotLib()
qboolean SVQ3_InitGame(void)
{
char buffer[8192];
int str;
char *str;
char sysinfo[8192];
extern cvar_t progs;
@ -1861,16 +1861,16 @@ qboolean SVQ3_InitGame(void)
Info_SetValueForKey(sysinfo, "sv_serverid", va("%i", svs.spawncount), MAX_SERVERINFO_STRING);
str = FS_GetPackHashes(buffer, sizeof(buffer), false);
Info_SetValueForKeyMoodles(sysinfo, "sv_paks", str, MAX_SERVERINFO_STRING); // modified to accept an integer
Info_SetValueForKey(sysinfo, "sv_paks", str, MAX_SERVERINFO_STRING);
str = FS_GetPackNames(buffer, sizeof(buffer), false);
Info_SetValueForKeyMoodles(sysinfo, "sv_pakNames", str, MAX_SERVERINFO_STRING); // modified to accept an integer
Info_SetValueForKey(sysinfo, "sv_pakNames", str, MAX_SERVERINFO_STRING);
str = FS_GetPackHashes(buffer, sizeof(buffer), true);
Info_SetValueForKeyMoodles(sysinfo, "sv_referencedPaks", str, MAX_SERVERINFO_STRING); // modified to accept an integer
Info_SetValueForKey(sysinfo, "sv_referencedPaks", str, MAX_SERVERINFO_STRING);
str = FS_GetPackNames(buffer, sizeof(buffer), true);
Info_SetValueForKeyMoodles(sysinfo, "sv_referencedPakNames", str, MAX_SERVERINFO_STRING); // modified to accept an integer
Info_SetValueForKey(sysinfo, "sv_referencedPakNames", str, MAX_SERVERINFO_STRING);
Info_SetValueForKey(sysinfo, "sv_pure", "1", MAX_SERVERINFO_STRING);
@ -1992,6 +1992,7 @@ void SVQ3_EmitPacketEntities(client_t *client, q3client_frame_t *from, q3client_
{
if(newindex >= to->num_entities)
{
newent = NULL;
newnum = 99999;
}
else
@ -2002,6 +2003,7 @@ void SVQ3_EmitPacketEntities(client_t *client, q3client_frame_t *from, q3client_
if(oldindex >= from_num_entities)
{
oldent = NULL;
oldnum = 99999;
}
else

4
engine/sw/d_iface.h
View File

@ -226,3 +226,7 @@ extern vrect_t scr_vrect;
extern qbyte *r_warpbuffer;
struct palremap_s *D_IdentityRemap(void);
struct palremap_s *D_GetPaletteRemap(int red, int green, int blue, qboolean desaturate, qboolean fullbrights, int topcolor, int bottomcolor);

2
engine/sw/d_polyse.c
View File

@ -1192,7 +1192,7 @@ void D_DrawSubdivC (void)
drawfnc = D_PolysetRecursiveTriangle32Trans;
else if (r_pixbytes == 2)
drawfnc = D_PolysetRecursiveTriangle16C;
else if (r_pixbytes == 1)
else //if (r_pixbytes == 1)
drawfnc = D_PolysetRecursiveTriangleTrans;
}
else

2
engine/sw/r_local.h
View File

@ -312,4 +312,6 @@ void R_InitSkyBox (void);
void SWR_BuildLightmaps(void);
void SWR_NetGraph (void);
qbyte *SWMod_LeafPVS (model_t *model, mleaf_t *leaf, qbyte *buffer);
#endif //def SWQUAKE