nzp-team/fteqw
0
0
Fork 0
mirror of https://github.com/nzp-team/fteqw.git synced 2024-11-29 07:02:12 +00:00
Code Issues Projects Releases Packages Wiki Activity

linux/gcc/general fixups.

Browse source 
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@3911 fc73d0e0-1445-4013-8a0c-d673dee63da5
This commit is contained in:
Spoike 2011-10-27 16:42:53 +00:00
parent f33873ddb7
commit b356dc75aa
6 changed files with 30 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
engine/client/cl_main.c
View file

@ -634,8 +634,10 @@ char *CL_TryingToConnect(void)
return cls.servername; return cls.servername;
} }
#ifndef CLIENTONLY
int SV_NewChallenge (void); int SV_NewChallenge (void);
client_t *SVC_DirectConnect(void); client_t *SVC_DirectConnect(void);
#endif
/* /*
================= =================

1
engine/client/merged.h
View file

@ -7,6 +7,7 @@ struct vbo_s;
struct mesh_s; struct mesh_s;
struct batch_s; struct batch_s;
struct entity_s; struct entity_s;
struct dlight_s;

20
engine/client/pr_csqc.c
View file

@ -1,3 +1,23 @@
/*
Copyright (C) 2011 Id Software, Inc.
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
as published by the Free Software Foundation; either version 2
of the License, or (at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
See the GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software
Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
#include "quakedef.h" #include "quakedef.h"
/* /*

5
engine/client/pr_skelobj.c
View file

@ -22,6 +22,9 @@ this file deals with qc builtins to apply custom skeletal blending (skeletal obj
*/ */
#include "quakedef.h" #include "quakedef.h"
#ifdef CSQC_DAT
#include "pr_common.h" #include "pr_common.h"
#define MAX_SKEL_OBJECTS 1024 #define MAX_SKEL_OBJECTS 1024
@ -669,3 +672,5 @@ void QCBUILTIN PF_skel_delete (progfuncs_t *prinst, struct globalvars_s *pr_glob
pendingkill = true; pendingkill = true;
} }
} }
#endif

2
engine/client/render.h
View file

@ -35,7 +35,7 @@ struct model_s;
struct texnums_s; struct texnums_s;
struct texture_s; struct texture_s;
static const texid_t r_nulltex = {0}; static const texid_t r_nulltex = {{0}};
#if defined(D3DQUAKE) || defined(ANDROID) #if defined(D3DQUAKE) || defined(ANDROID)

2
engine/qclib/initlib.c
View file

@ -106,7 +106,7 @@ void *PRAddressableAlloc(progfuncs_t *progfuncs, int ammount)
} }
#else #else
char *newblock; char *newblock;
addressablesize = (addressableused + ammount + 1024*1024) & ~(1024*1024-1); int newsize = (addressableused + ammount + 1024*1024) & ~(1024*1024-1);
newblock = realloc(newblock, addressablesize); newblock = realloc(newblock, addressablesize);
if (newblock) if (newblock)
{ {