teambeef
/
ioq3quest
mirror of https://github.com/DrBeef/ioq3quest.git
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixes for bugs introduced in last several revisions

This commit is contained in:
Thilo Schulz 2011-06-16 22:50:33 +00:00
parent dc24d7649c
commit b8f81e8065
4 changed files with 25 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@ -1885,7 +1885,7 @@ Q3CGOBJ_ = \
$(B)/baseq3/cgame/cg_info.o \ $(B)/baseq3/cgame/cg_info.o \
$(B)/baseq3/cgame/cg_localents.o \ $(B)/baseq3/cgame/cg_localents.o \
$(B)/baseq3/cgame/cg_marks.o \ $(B)/baseq3/cgame/cg_marks.o \
$(B)/baseq3/cgame/cg_particles.o \ $(B)/baseq3/cgame/cg_particles.o \
$(B)/baseq3/cgame/cg_players.o \ $(B)/baseq3/cgame/cg_players.o \
$(B)/baseq3/cgame/cg_playerstate.o \ $(B)/baseq3/cgame/cg_playerstate.o \
$(B)/baseq3/cgame/cg_predict.o \ $(B)/baseq3/cgame/cg_predict.o \

3
code/cgame/cg_particles.c
View File

@ -141,7 +141,8 @@ static float shaderAnimSTRatio[MAX_SHADER_ANIMS] = {
#ifdef WOLF_PARTICLES #ifdef WOLF_PARTICLES
#define MAX_PARTICLES 1024 * 8 #define MAX_PARTICLES 1024 * 8
#else #else
#define WOLF_PARTICLES 1024 #define MAX_PARTICLES 1024
#endif
cparticle_t *active_particles, *free_particles; cparticle_t *active_particles, *free_particles;
cparticle_t particles[MAX_PARTICLES]; cparticle_t particles[MAX_PARTICLES];

16
cross-make-mingw.sh
View File

@ -1,10 +1,16 @@
#!/bin/sh #!/bin/sh
export CC=i586-mingw32msvc-gcc if [ !$CC ]
export WINDRES=i586-mingw32msvc-windres
export PLATFORM=mingw32
if [ !$ARCH ]
then then
export ARCH=x86 export CC=i586-mingw32msvc-gcc
fi fi
if [ !$WINDRES ]
then
export WINDRES=i586-mingw32msvc-windres
fi
export PLATFORM=mingw32
export ARCH=x86
exec make $* exec make $*

16
cross-make-mingw64.sh
View File

@ -1,10 +1,16 @@
#!/bin/sh #!/bin/sh
export CC=amd64-mingw32msvc-gcc if [ !$CC ]
export WINDRES=amd64-mingw32msvc-windres
export PLATFORM=mingw32
if [ !$ARCH ]
then then
export ARCH=x86_64 export CC=amd64-mingw32msvc-gcc
fi fi
if [ !$WINDRES ]
then
export WINDRES=amd64-mingw32msvc-windres
fi
export PLATFORM=mingw32
export ARCH=x86_64
exec make $* exec make $*