summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorBen Millwood <thebenmachine@gmail.com>2009-10-03 11:47:47 +0000
committerTim Angus <tim@ngus.net>2013-01-03 00:15:21 +0000
commita5c0d84f64a2687ff4008c129800706834209168 (patch)
treeb85a9bad32ae4b67a5e04febc85459225d2f88ed /src
parent5b3eabc250ee85929de8541f916d762f489c8b1f (diff)
* Update README viewvc url
* Fix Lag Correction field in server info * Some other crap to reduce patch size
Diffstat (limited to 'src')
-rw-r--r--src/game/bg_pmove.c4
-rw-r--r--src/game/g_cmds.c4
2 files changed, 4 insertions, 4 deletions
diff --git a/src/game/bg_pmove.c b/src/game/bg_pmove.c
index 474d681b..5aeae892 100644
--- a/src/game/bg_pmove.c
+++ b/src/game/bg_pmove.c
@@ -1932,8 +1932,8 @@ static void PM_GroundClimbTrace( void )
}
//if we hit something
- if( trace.fraction < 1.0f && !( trace.surfaceFlags & ( SURF_SKY | SURF_SLICK ) )
- && !( trace.entityNum != ENTITYNUM_WORLD && i != 4 ) )
+ if( trace.fraction < 1.0f && !( trace.surfaceFlags & ( SURF_SKY | SURF_SLICK ) ) &&
+ !( trace.entityNum != ENTITYNUM_WORLD && i != 4 ) )
{
if( i == 2 || i == 3 )
{
diff --git a/src/game/g_cmds.c b/src/game/g_cmds.c
index 2baf0151..ea6b77f8 100644
--- a/src/game/g_cmds.c
+++ b/src/game/g_cmds.c
@@ -277,8 +277,8 @@ void ScoreboardMessage( gentity_t *ent )
}
Com_sprintf( entry, sizeof( entry ),
- " %d %d %d %d %d %d", level.sortedClients[ i ], cl->pers.score, ping,
- ( level.time - cl->pers.enterTime ) / 60000, weapon, upgrade );
+ " %d %d %d %d %d %d", level.sortedClients[ i ], cl->pers.score,
+ ping, ( level.time - cl->pers.enterTime ) / 60000, weapon, upgrade );
j = strlen( entry );