Makefile uses q3lcc now

4 files changed, 11 insertions, 21 deletions

diff --git a/Makefile b/Makefile
index db5aa93a..c07b22ca 100644
--- a/Makefile
+++ b/Makefile
@@ -185,13 +185,10 @@ SED=sed
 
 
 # --qvm building config--
-LCC_CPP=q3cpp
-LCC_CPP_FLAGS=-DQ3_VM -D__LCC__
+LCC=q3lcc
+LCC_FLAGS=-DQ3_VM -S -Wf-target=bytecode -Wf-g
 LCC_INCLUDES=-I$(CGDIR) -I$(GDIR) -I$(UIDIR)
 
-LCC_RCC=q3rcc
-LCC_RCC_FLAGS=-target=bytecode -g
-
 Q3ASM=q3asm
 Q3ASM_FLAGS=
 
@@ -281,10 +278,7 @@ $(BD)/$(GDIRNAME)/%.o: $(GDIR)/%.c
   
 #qvm g_*.asm
 $(BQ)/$(GDIRNAME)/%.asm: $(GDIR)/%.c 
-	$(LCC_CPP) $(LCC_CPP_FLAGS) $(LCC_INCLUDES) $< $(BQ)/$(GDIRNAME)/$*.i
-	$(LCC_RCC) $(LCC_RCC_FLAGS) $(BQ)/$(GDIRNAME)/$*.i $@
-	rm $(BQ)/$(GDIRNAME)/$*.i
-
+	$(LCC) $(LCC_FLAGS) $(LCC_INCLUDES) -o $@ $<
 
 #release cg_*.o
 $(BR)/$(CGDIRNAME)/%.o: $(CGDIR)/%.c 
@@ -296,10 +290,7 @@ $(BD)/$(CGDIRNAME)/%.o: $(CGDIR)/%.c
 
 #qvm cg_*.asm
 $(BQ)/$(CGDIRNAME)/%.asm: $(CGDIR)/%.c 
-	$(LCC_CPP) $(LCC_CPP_FLAGS) $(LCC_INCLUDES) $< $(BQ)/$(CGDIRNAME)/$*.i
-	$(LCC_RCC) $(LCC_RCC_FLAGS) $(BQ)/$(CGDIRNAME)/$*.i $@
-	rm $(BQ)/$(CGDIRNAME)/$*.i
-
+	$(LCC) $(LCC_FLAGS) $(LCC_INCLUDES) -o $@ $<
 
 #release ui_*.o
 $(BR)/$(UIDIRNAME)/%.o: $(UIDIR)/%.c 
@@ -311,10 +302,7 @@ $(BD)/$(UIDIRNAME)/%.o: $(UIDIR)/%.c
   
 #qvm ui_*.asm
 $(BQ)/$(UIDIRNAME)/%.asm: $(UIDIR)/%.c 
-	$(LCC_CPP) $(LCC_CPP_FLAGS) $(LCC_INCLUDES) $< $(BQ)/$(UIDIRNAME)/$*.i
-	$(LCC_RCC) $(LCC_RCC_FLAGS) $(BQ)/$(UIDIRNAME)/$*.i $@
-	rm $(BQ)/$(UIDIRNAME)/$*.i
-
+	$(LCC) $(LCC_FLAGS) $(LCC_INCLUDES) -o $@ $<
 
 
 # --cleaning rules--
diff --git a/src/game/bg_local.h b/src/game/bg_local.h
index 2fbcf5dd..28d5e511 100644
--- a/src/game/bg_local.h
+++ b/src/game/bg_local.h
@@ -68,8 +68,8 @@ typedef struct
 } smooth_t;
 
 //TA: make this into a cvar later....
-#define   SMOOTHTIME    300
-#define   MAXSMOOTHS    16
+#define   SMOOTHTIME          300
+#define   MAXSMOOTHS          16
 
 //TA: wall climbing local
 typedef struct
diff --git a/src/game/bg_pmove.c b/src/game/bg_pmove.c
index 85727d4d..5c0764d7 100644
--- a/src/game/bg_pmove.c
+++ b/src/game/bg_pmove.c
@@ -1691,9 +1691,9 @@ static void PM_GroundTrace( void ) {
     //toggle wall climbing if holding crouch
     if( pm->cmd.upmove < 0 && wcl[ pm->ps->clientNum ].lastUpmove >= 0 )
     {
-      if( !( pm->ps->stats[ STAT_STATE ] & SS_WALLCLIMBING ) && pm->cmd.upmove < 0 )
+      if( !( pm->ps->stats[ STAT_STATE ] & SS_WALLCLIMBING ) )
         pm->ps->stats[ STAT_STATE ] |= SS_WALLCLIMBING;
-      else if( pm->ps->stats[ STAT_STATE ] & SS_WALLCLIMBING && pm->cmd.upmove < 0 )
+      else if( pm->ps->stats[ STAT_STATE ] & SS_WALLCLIMBING )
         pm->ps->stats[ STAT_STATE ] &= ~SS_WALLCLIMBING;
     }
 
diff --git a/src/game/q_shared.h b/src/game/q_shared.h
index 3bb7e433..8814b664 100644
--- a/src/game/q_shared.h
+++ b/src/game/q_shared.h
@@ -242,6 +242,7 @@ static inline float LittleFloat (const float l) { return FloatSwap(&l); }
 // the mac compiler can't handle >32k of locals, so we
 // just waste space and make big arrays static...
 #ifdef __linux__
+#ifndef __LCC__ //TA: q3lcc defines __linux__
 
 // bk001205 - from Makefile
 #define stricmp strcasecmp
@@ -284,6 +285,7 @@ inline static float LittleFloat (const float *l) { return FloatSwap(l); }
 #endif
 
 #endif
+#endif
 
 //======================= FreeBSD DEFINES =====================
 #ifdef __FreeBSD__ // rb010123