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

Small compile fixes. 

git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@4153 fc73d0e0-1445-4013-8a0c-d673dee63da5
This commit is contained in:
Spoike 2012-11-27 06:06:25 +00:00
parent 53a7b3d47c
commit ea1f452b99
6 changed files with 11 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
engine/client/cl_main.c
View File

@ -3580,7 +3580,11 @@ double Host_Frame (double time)
maxfps = 4;
}
if (maxfps > 0 && Media_Capturing() != 2)
if (maxfps > 0
#if !defined(NOMEDIA)
&& Media_Capturing() != 2
#endif
)
{
realtime += spare/1000; //don't use it all!
spare = CL_FilterTime((realtime - oldrealtime)*1000, maxfps, maxfpsignoreserver);

2
engine/client/m_download.c
View File

@ -803,7 +803,7 @@ void Menu_DownloadStuff_f (void)
#endif
#ifdef AVAIL_ZLIB
#if defined(AVAIL_ZLIB) && defined(WEBCLIENT)
static int numbootdownloads;
#include "fs.h"

2
engine/client/net_master.c
View File

@ -644,8 +644,10 @@ void MasterInfo_Shutdown(void)
{
mast = master;
master = mast->next;
#ifdef WEBCLIENT
if (mast->dl)
DL_Close(mast->dl);
#endif
Z_Free(mast);
}

4
engine/client/pr_skelobj.c
View File

@ -671,7 +671,6 @@ void rag_uninstanciate(skelobject_t *sko)
qboolean rag_instanciate(skelobject_t *sko, doll_t *doll, float *emat, wedict_t *ent)
{
int i;
vec3_t org, porg;
float *bmat;
float bodymat[12], worldmat[12];
vec3_t aaa2[3];
@ -705,7 +704,7 @@ qboolean rag_instanciate(skelobject_t *sko, doll_t *doll, float *emat, wedict_t
bone = j->bonepivot;
bmat = sko->bonematrix + bone*12;
R_ConcatTransforms(bmat, j->orgmatrix, bodymat);
R_ConcatTransforms((void*)bmat, (void*)j->orgmatrix, (void*)bodymat);
R_ConcatTransforms((void*)emat, (void*)bodymat, (void*)worldmat);
aaa2[0][0] = worldmat[3];
aaa2[0][1] = worldmat[3+4];
@ -871,7 +870,6 @@ void QCBUILTIN PF_skel_create (progfuncs_t *prinst, struct globalvars_s *pr_glob
model_t *model;
int midx;
int type;
int i;
midx = G_FLOAT(OFS_PARM0);
type = (*prinst->callargc > 1)?G_FLOAT(OFS_PARM1):SKOT_RELATIVE;

19
engine/dotnet2005/ftequake.vcproj
View File

@ -4949,7 +4949,6 @@
>
<FileConfiguration
Name="MinGLDebug|Win32"
ExcludedFromBuild="true"
>
<Tool
Name="VCCLCompilerTool"
@ -4957,7 +4956,6 @@
</FileConfiguration>
<FileConfiguration
Name="MinGLDebug|x64"
ExcludedFromBuild="true"
>
<Tool
Name="VCCLCompilerTool"
@ -4965,7 +4963,6 @@
</FileConfiguration>
<FileConfiguration
Name="D3DDebug|Win32"
ExcludedFromBuild="true"
>
<Tool
Name="VCCLCompilerTool"
@ -4973,7 +4970,6 @@
</FileConfiguration>
<FileConfiguration
Name="D3DDebug|x64"
ExcludedFromBuild="true"
>
<Tool
Name="VCCLCompilerTool"
@ -4981,7 +4977,6 @@
</FileConfiguration>
<FileConfiguration
Name="MinGLRelease|Win32"
ExcludedFromBuild="true"
>
<Tool
Name="VCCLCompilerTool"
@ -4989,7 +4984,6 @@
</FileConfiguration>
<FileConfiguration
Name="MinGLRelease|x64"
ExcludedFromBuild="true"
>
<Tool
Name="VCCLCompilerTool"
@ -5004,7 +4998,6 @@
</FileConfiguration>
<FileConfiguration
Name="GLDebug|x64"
ExcludedFromBuild="true"
>
<Tool
Name="VCCLCompilerTool"
@ -5012,7 +5005,6 @@
</FileConfiguration>
<FileConfiguration
Name="Release Dedicated Server|Win32"
ExcludedFromBuild="true"
>
<Tool
Name="VCCLCompilerTool"
@ -5020,7 +5012,6 @@
</FileConfiguration>
<FileConfiguration
Name="Release Dedicated Server|x64"
ExcludedFromBuild="true"
>
<Tool
Name="VCCLCompilerTool"
@ -5028,7 +5019,6 @@
</FileConfiguration>
<FileConfiguration
Name="MRelease|Win32"
ExcludedFromBuild="true"
>
<Tool
Name="VCCLCompilerTool"
@ -5036,7 +5026,6 @@
</FileConfiguration>
<FileConfiguration
Name="MRelease|x64"
ExcludedFromBuild="true"
>
<Tool
Name="VCCLCompilerTool"
@ -5044,7 +5033,6 @@
</FileConfiguration>
<FileConfiguration
Name="Debug Dedicated Server|Win32"
ExcludedFromBuild="true"
>
<Tool
Name="VCCLCompilerTool"
@ -5052,7 +5040,6 @@
</FileConfiguration>
<FileConfiguration
Name="Debug Dedicated Server|x64"
ExcludedFromBuild="true"
>
<Tool
Name="VCCLCompilerTool"
@ -5060,7 +5047,6 @@
</FileConfiguration>
<FileConfiguration
Name="MDebug|Win32"
ExcludedFromBuild="true"
>
<Tool
Name="VCCLCompilerTool"
@ -5068,7 +5054,6 @@
</FileConfiguration>
<FileConfiguration
Name="MDebug|x64"
ExcludedFromBuild="true"
>
<Tool
Name="VCCLCompilerTool"
@ -5076,7 +5061,6 @@
</FileConfiguration>
<FileConfiguration
Name="GLRelease|Win32"
ExcludedFromBuild="true"
>
<Tool
Name="VCCLCompilerTool"
@ -5084,7 +5068,6 @@
</FileConfiguration>
<FileConfiguration
Name="GLRelease|x64"
ExcludedFromBuild="true"
>
<Tool
Name="VCCLCompilerTool"
@ -5092,7 +5075,6 @@
</FileConfiguration>
<FileConfiguration
Name="D3DRelease|Win32"
ExcludedFromBuild="true"
>
<Tool
Name="VCCLCompilerTool"
@ -5100,7 +5082,6 @@
</FileConfiguration>
<FileConfiguration
Name="D3DRelease|x64"
ExcludedFromBuild="true"
>
<Tool
Name="VCCLCompilerTool"

4
engine/qclib/pr_exec.c
View File

@ -33,7 +33,6 @@ PR_PrintStatement
*/
static void PR_PrintStatement (progfuncs_t *progfuncs, int statementnum)
{
int i;
unsigned int op;
unsigned int arg[3];
@ -58,6 +57,7 @@ static void PR_PrintStatement (progfuncs_t *progfuncs, int statementnum)
#ifndef MINIMAL
if ( (unsigned)op < OP_NUMOPS)
{
int i;
printf ("%s ", pr_opcodes[op].name);
i = strlen(pr_opcodes[op].name);
for ( ; i<10 ; i++)
@ -106,7 +106,6 @@ static void VARGS QC_snprintfz (char *dest, size_t size, const char *fmt, ...)
void PR_GenerateStatementString (progfuncs_t *progfuncs, int statementnum, char *out, int outlen)
{
int i;
unsigned int op;
unsigned int arg[3];
@ -147,6 +146,7 @@ void PR_GenerateStatementString (progfuncs_t *progfuncs, int statementnum, char
#ifndef MINIMAL
if ( (unsigned)op < OP_NUMOPS)
{
int i;
QC_snprintfz (out, outlen, "%s", pr_opcodes[op].name);
outlen -= strlen(out);
out += strlen(out);