summaryrefslogtreecommitdiff
path: root/src/game
diff options
context:
space:
mode:
authorTim Angus <tim@ngus.net>2001-08-06 22:54:09 +0000
committerTim Angus <tim@ngus.net>2001-08-06 22:54:09 +0000
commitd1a82b792471283809914926c8d88d4ddecb026d (patch)
tree90962bd0dd23e5ecfd33a66d5ff7378bbf05f3e7 /src/game
parent5a7e0d4095964285604cc4d86b5a9cabdf47f368 (diff)
Makefile uses q3lcc now
Diffstat (limited to 'src/game')
-rw-r--r--src/game/bg_local.h4
-rw-r--r--src/game/bg_pmove.c4
-rw-r--r--src/game/q_shared.h2
3 files changed, 6 insertions, 4 deletions
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