eukara/fteqw
1
0
Fork 0
forked from fte/fteqw
Code Pull requests Activity

Compile fixes.

Browse source 
git-svn-id: https://svn.code.sf.net/p/fteqw/code/branches/wip@3630 fc73d0e0-1445-4013-8a0c-d673dee63da5
This commit is contained in:
Spoike 2010-11-07 03:58:09 +00:00
parent 3ce350d614
commit 3e9fd517c3
3 changed files with 4 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
engine/Makefile
View file

@ -243,7 +243,7 @@ ifeq ($(FTE_TARGET),vc)
WARNINGFLAGS=-W3 -D_CRT_SECURE_NO_WARNINGS WARNINGFLAGS=-W3 -D_CRT_SECURE_NO_WARNINGS
GNUC_FUNCS= GNUC_FUNCS=
else else
WARNINGFLAGS=-Wall -Wno-pointer-sign WARNINGFLAGS=-Wall
GNUC_FUNCS= -Dstrnicmp=strncasecmp -Dstricmp=strcasecmp -D_vsnprintf=vsnprintf -D_snprintf=snprintf GNUC_FUNCS= -Dstrnicmp=strncasecmp -Dstricmp=strcasecmp -D_vsnprintf=vsnprintf -D_snprintf=snprintf
endif endif
@ -411,7 +411,6 @@ SERVER_OBJS = \
sv_nchan.o \ sv_nchan.o \
sv_ents.o \ sv_ents.o \
sv_send.o \ sv_send.o \
sv_move.o \
sv_phys.o \ sv_phys.o \
sv_user.o \ sv_user.o \
sv_mvd.o \ sv_mvd.o \
@ -468,6 +467,7 @@ COMMON_OBJS = $(COMMON_ASM_OBJS) \
glmod_doom.o \ glmod_doom.o \
q3common.o \ q3common.o \
world.o \ world.o \
sv_move.o \
pmove.o \ pmove.o \
pmovetst.o \ pmovetst.o \
iwebiface.o \ iwebiface.o \

4
engine/client/m_options.c
View file

@ -1838,7 +1838,7 @@ void M_Menu_Singleplayer_Cheats_Quake2_f (void)
singleplayerq2info_t *info; singleplayerq2info_t *info;
int cursorpositionY; int cursorpositionY;
#ifndef MINIMAL #ifndef CLIENTONLY
int currentskill; int currentskill;
int currentmap; int currentmap;
extern cvar_t sv_gravity, sv_cheats, sv_maxspeed, skill; extern cvar_t sv_gravity, sv_cheats, sv_maxspeed, skill;
@ -1850,7 +1850,7 @@ void M_Menu_Singleplayer_Cheats_Quake2_f (void)
cursorpositionY = (y + 24); cursorpositionY = (y + 24);
#ifndef MINIMAL #ifndef CLIENTONLY
currentskill = skill.value; currentskill = skill.value;
if ( !currentskill ) if ( !currentskill )

4
engine/client/pr_csqc.c
View file

@ -707,10 +707,6 @@ static qboolean CopyCSQCEdictToEntity(csqcedict_t *in, entity_t *out)
cs_getframestate(in, rflags, &out->framestate); cs_getframestate(in, rflags, &out->framestate);
VectorCopy(in->v->origin, out->origin); VectorCopy(in->v->origin, out->origin);
{
extern cvar_t temp1;
out->origin[2] += temp1.value;
}
if (rflags & CSQCRF_USEAXIS) if (rflags & CSQCRF_USEAXIS)
{ {
VectorCopy(csqcg.forward, out->axis[0]); VectorCopy(csqcg.forward, out->axis[0]);