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

Some bugfixes. 

git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@5259 fc73d0e0-1445-4013-8a0c-d673dee63da5
This commit is contained in:
Spoike 2018-06-03 09:46:41 +00:00
parent ac471dd03e
commit df3e8fa719
4 changed files with 20 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
build_setup.sh
View File

@ -205,7 +205,7 @@ function debianpackages {
apt-get install --no-install-recommends $@ apt-get install --no-install-recommends $@
ret=$true ret=$true
else else
echo "Packages not installed. Run as root to easily install dependancies." echo "Packages not installed. Rerun script as root to easily install dependancies, or manually install."
fi fi
fi fi
return $ret return $ret
@ -238,11 +238,11 @@ if [ $UID -eq 0 ] && [ ! -z `which apt-get` ]; then
fi fi
#generic crap. much of this is needed to set up and decompress dependancies and stuff. #generic crap. much of this is needed to set up and decompress dependancies and stuff.
debianpackages subversion make automake libtool p7zip-full zip || otherpackages z7 make svn || exit debianpackages subversion make automake libtool p7zip-full zip ca-certificates || otherpackages z7 make svn || exit
if [ "$BUILD_LINUXx86" == "y" ]; then if [ "$BUILD_LINUXx86" == "y" ]; then
#for building linux targets #for building linux targets
debianpackages gcc-multilib g++-multilib mesa-common-dev libasound2-dev || otherpackages gcc || exit debianpackages gcc-multilib g++-multilib mesa-common-dev libasound2-dev libxcursor-dev || otherpackages gcc || exit
jessiepackages libgnutls28-dev || debianpackages libgnutls28-dev || otherpackages gcc || exit jessiepackages libgnutls28-dev || debianpackages libgnutls28-dev || otherpackages gcc || exit
if [[ "$PLUGINS_LINUXx86" =~ "ffmpeg" ]]; then if [[ "$PLUGINS_LINUXx86" =~ "ffmpeg" ]]; then
debianpackages libswscale-dev libavcodec-dev || otherpackages || exit debianpackages libswscale-dev libavcodec-dev || otherpackages || exit
@ -250,7 +250,7 @@ if [ "$BUILD_LINUXx86" == "y" ]; then
fi fi
if [ "$BUILD_LINUXx64" == "y" ]; then if [ "$BUILD_LINUXx64" == "y" ]; then
#for building linux targets #for building linux targets
debianpackages gcc-multilib g++-multilib mesa-common-dev libasound2-dev || otherpackages gcc || exit debianpackages gcc-multilib g++-multilib mesa-common-dev libasound2-dev libxcursor-dev || otherpackages gcc || exit
jessiepackages libgnutls28-dev || debianpackages libgnutls28-dev || otherpackages gcc || exit jessiepackages libgnutls28-dev || debianpackages libgnutls28-dev || otherpackages gcc || exit
if [[ "$PLUGINS_LINUXx64" =~ "ffmpeg" ]]; then if [[ "$PLUGINS_LINUXx64" =~ "ffmpeg" ]]; then
debianpackages libswscale-dev libavcodec-dev || otherpackages || exit debianpackages libswscale-dev libavcodec-dev || otherpackages || exit
@ -258,12 +258,12 @@ if [ "$BUILD_LINUXx64" == "y" ]; then
fi fi
if [ "$BUILD_LINUXx32" == "y" ]; then if [ "$BUILD_LINUXx32" == "y" ]; then
#for building linux targets #for building linux targets
debianpackages gcc-multilib g++-multilib mesa-common-dev libasound2-dev || otherpackages gcc || exit debianpackages gcc-multilib g++-multilib mesa-common-dev libasound2-dev libxcursor-dev || otherpackages gcc || exit
jessiepackages libgnutls28-dev || debianpackages libgnutls28-dev || otherpackages gcc || exit jessiepackages libgnutls28-dev || debianpackages libgnutls28-dev || otherpackages gcc || exit
fi fi
if [ "$BUILD_LINUXarmhf" == "y" ]; then if [ "$BUILD_LINUXarmhf" == "y" ]; then
#for building linux targets #for building linux targets
debianpackages gcc-multilib-arm-linux-gnueabihf g++-multilib-arm-linux-gnueabihf mesa-common-dev libasound2-dev || otherpackages gcc || exit debianpackages gcc-multilib-arm-linux-gnueabihf g++-multilib-arm-linux-gnueabihf mesa-common-dev libasound2-dev libxcursor-dev || otherpackages gcc || exit
jessiepackages libgnutls28-dev || debianpackages libgnutls28-dev || otherpackages gcc || exit jessiepackages libgnutls28-dev || debianpackages libgnutls28-dev || otherpackages gcc || exit
fi fi
if [ "$BUILD_SDL" == "y" ]; then if [ "$BUILD_SDL" == "y" ]; then

13
engine/Makefile
View File

@ -1292,7 +1292,18 @@ ifneq (,$(findstring linux,$(FTE_TARGET)))
SV_LDFLAGS= SV_LDFLAGS=
SV_CFLAGS=$(SERVER_ONLY_CFLAGS) -DMULTITHREAD SV_CFLAGS=$(SERVER_ONLY_CFLAGS) -DMULTITHREAD
CL_CFLAGS=-DMULTITHREAD -DDYNAMIC_SDL -DUSE_EGL -DWAYLANDQUAKE -DX11QUAKE ifneq ("$(wildcard $(/usr/include/wayland-client.h))","")
HAVE_WAYLAND=-DWAYLANDQUAKE
else
HAVE_WAYLAND=
endif
ifneq ("$(wildcard $(/usr/include/EGL/egl.h))","")
HAVE_EGL=-DUSE_EGL
else
HAVE_EGL=
endif
CL_CFLAGS=-DMULTITHREAD -DDYNAMIC_SDL $(HAVE_EGL) $(HAVE_WAYLAND) -DX11QUAKE
QCC_DIR=linqcc$(BITS) QCC_DIR=linqcc$(BITS)

2
engine/client/pr_csqc.c
View File

@ -3385,6 +3385,7 @@ static void cs_get_input_state (usercmd_t *cmd)
static void QCBUILTIN PF_cs_getinputstate (pubprogfuncs_t *prinst, struct globalvars_s *pr_globals) static void QCBUILTIN PF_cs_getinputstate (pubprogfuncs_t *prinst, struct globalvars_s *pr_globals)
{ {
usercmd_t *cmd; usercmd_t *cmd;
usercmd_t tmp;
extern usercmd_t cl_pendingcmd[MAX_SPLITS]; extern usercmd_t cl_pendingcmd[MAX_SPLITS];
int f = G_FLOAT(OFS_PARM0); int f = G_FLOAT(OFS_PARM0);
int seat = ((prinst->callargc>1)?G_FLOAT(OFS_PARM1):csqc_playerseat); int seat = ((prinst->callargc>1)?G_FLOAT(OFS_PARM1):csqc_playerseat);
@ -3406,7 +3407,6 @@ static void QCBUILTIN PF_cs_getinputstate (pubprogfuncs_t *prinst, struct global
if (f == cl.movesequence) if (f == cl.movesequence)
{ {
int i; int i;
usercmd_t tmp;
cmd = &cl_pendingcmd[seat]; cmd = &cl_pendingcmd[seat];
tmp = *cmd; tmp = *cmd;

1
engine/common/com_mesh.c
View File

@ -1609,6 +1609,7 @@ qboolean Alias_GAliasBuildMesh(mesh_t *mesh, vbo_t **vbop, galiasinfo_t *inf, in
if (meshcache.coords) if (meshcache.coords)
BZ_Free(meshcache.coords); BZ_Free(meshcache.coords);
meshcache.coords = BZ_Malloc(sizeof(*meshcache.coords)*inf->numverts); meshcache.coords = BZ_Malloc(sizeof(*meshcache.coords)*inf->numverts);
memset(meshcache.coords, 0, sizeof(*meshcache.coords)*inf->numverts); //vecV_t is often uninitialised.
meshcache.numcoords = inf->numverts; meshcache.numcoords = inf->numverts;
} }