From b8f81e80658f99e7ce7323071745f2dfa78b6141 Mon Sep 17 00:00:00 2001
From: Thilo Schulz <arny@ats.s.bawue.de>
Date: Thu, 16 Jun 2011 22:50:33 +0000
Subject: [PATCH] Fixes for bugs introduced in last several revisions

---
 Makefile                  |  2 +-
 code/cgame/cg_particles.c |  3 ++-
 cross-make-mingw.sh       | 16 +++++++++++-----
 cross-make-mingw64.sh     | 16 +++++++++++-----
 4 files changed, 25 insertions(+), 12 deletions(-)

diff --git a/Makefile b/Makefile
index e6e98fc0..154ce18c 100644
--- a/Makefile
+++ b/Makefile
@@ -1885,7 +1885,7 @@ Q3CGOBJ_ = \
   $(B)/baseq3/cgame/cg_info.o \
   $(B)/baseq3/cgame/cg_localents.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_playerstate.o \
   $(B)/baseq3/cgame/cg_predict.o \
diff --git a/code/cgame/cg_particles.c b/code/cgame/cg_particles.c
index c3096e0b..ce4bebd1 100644
--- a/code/cgame/cg_particles.c
+++ b/code/cgame/cg_particles.c
@@ -141,7 +141,8 @@ static float	shaderAnimSTRatio[MAX_SHADER_ANIMS] = {
 #ifdef WOLF_PARTICLES
 #define		MAX_PARTICLES	1024 * 8
 #else
-#define		WOLF_PARTICLES 1024
+#define		MAX_PARTICLES 1024
+#endif
 
 cparticle_t	*active_particles, *free_particles;
 cparticle_t	particles[MAX_PARTICLES];
diff --git a/cross-make-mingw.sh b/cross-make-mingw.sh
index 604ced10..4707c772 100755
--- a/cross-make-mingw.sh
+++ b/cross-make-mingw.sh
@@ -1,10 +1,16 @@
 #!/bin/sh
 
-export CC=i586-mingw32msvc-gcc
-export WINDRES=i586-mingw32msvc-windres
-export PLATFORM=mingw32
-if [ !$ARCH ]
+if [ !$CC ]
 then
-export ARCH=x86
+  export CC=i586-mingw32msvc-gcc
 fi
+
+if [ !$WINDRES ]
+then
+  export WINDRES=i586-mingw32msvc-windres
+fi
+
+export PLATFORM=mingw32
+export ARCH=x86
+
 exec make $*
diff --git a/cross-make-mingw64.sh b/cross-make-mingw64.sh
index 5a05a81a..5ea627ea 100755
--- a/cross-make-mingw64.sh
+++ b/cross-make-mingw64.sh
@@ -1,10 +1,16 @@
 #!/bin/sh
 
-export CC=amd64-mingw32msvc-gcc
-export WINDRES=amd64-mingw32msvc-windres
-export PLATFORM=mingw32
-if [ !$ARCH ]
+if [ !$CC ]
 then
-export ARCH=x86_64
+  export CC=amd64-mingw32msvc-gcc
 fi
+
+if [ !$WINDRES ]
+then
+  export WINDRES=amd64-mingw32msvc-windres
+fi
+
+export PLATFORM=mingw32
+export ARCH=x86_64
+
 exec make $*