From e8758c20a0bed2f580c6c6383a696123f9835eaa Mon Sep 17 00:00:00 2001 From: david Date: Fri, 19 Oct 2018 22:57:44 -0400 Subject: [PATCH] console checkpoint fix --- codemp/game/bg_slidemove.c | 2 +- codemp/game/g_client.c | 4 ++-- codemp/game/g_trigger.c | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/codemp/game/bg_slidemove.c b/codemp/game/bg_slidemove.c index e55ef62794..cc8aab0e6d 100644 --- a/codemp/game/bg_slidemove.c +++ b/codemp/game/bg_slidemove.c @@ -846,7 +846,7 @@ qboolean PM_SlideMove( qboolean gravity ) { // don't change velocity if in a timer (FIXME: is this correct?) if ( pm->ps->pm_time ) { - VectorCopy( primal_velocity, pm->ps->velocity ); + VectorCopy( primal_velocity, pm->ps->velocity ); //corner clip , cornerclip , skim } return ( bumpcount != 0 ); diff --git a/codemp/game/g_client.c b/codemp/game/g_client.c index 44fb4174e8..19d0008c76 100644 --- a/codemp/game/g_client.c +++ b/codemp/game/g_client.c @@ -2306,9 +2306,9 @@ qboolean ClientUserinfoChanged( int clientNum ) { //I think anything treated as client->pers.showChatCP = qfalse; if (atoi(s) & JAPRO_PLUGIN_CONSOLECP) - client->pers.showConsoleCP = qfalse; - else client->pers.showConsoleCP = qtrue; + else + client->pers.showConsoleCP = qfalse; if (atoi(s) & JAPRO_PLUGIN_NODMGNUMBERS) client->pers.noDamageNumbers = qtrue; diff --git a/codemp/game/g_trigger.c b/codemp/game/g_trigger.c index a0e4426c98..d7dfdc9bd7 100644 --- a/codemp/game/g_trigger.c +++ b/codemp/game/g_trigger.c @@ -1612,7 +1612,7 @@ void TimerCheckpoint(gentity_t *trigger, gentity_t *player, trace_t *trace) {//J if (player->client->pers.showCenterCP) trap->SendServerCommand( player-g_entities, va("cp \"^3%.3fs^5, avg ^3%i^5u, max ^3%i^5u\n\n\n\n\n\n\n\n\n\n\"", (float)time * 0.001f, average, (int)(player->client->pers.stats.topSpeed + 0.5f))); if (player->client->pers.showConsoleCP) - trap->SendServerCommand(player - g_entities, va("print \"^3%.3fs^5, avg ^3%i^5u, max ^3%i^5u\n\n\n\n\n\n\n\n\n\n\"", (float)time * 0.001f, average, (int)(player->client->pers.stats.topSpeed + 0.5f))); + trap->SendServerCommand(player - g_entities, va("print \"^5Checkpoint: ^3%.3f^5, avg ^3%i^5, max ^3%i^5 ups\n\"", (float)time * 0.001f, average, (int)(player->client->pers.stats.topSpeed + 0.5f))); else if (player->client->pers.showChatCP) trap->SendServerCommand( player-g_entities, va("chat \"^5Checkpoint: ^3%.3f^5, avg ^3%i^5, max ^3%i^5 ups\"", (float)time * 0.001f, average, (int)(player->client->pers.stats.topSpeed + 0.5f)));