diff options
| author | Paweł Redman <pawel.redman@gmail.com> | 2019-02-15 18:45:33 +0100 |
|---|---|---|
| committer | Paweł Redman <pawel.redman@gmail.com> | 2019-02-15 18:45:33 +0100 |
| commit | 5e9caf8a7e6aca6acc920a74c650649e7e060770 (patch) | |
| tree | 49c2ffd66e0378ec16aa456a721b2e8fbab60979 | |
| parent | f88d93f125354edfc3c86b976fd6ec1233e81af0 (diff) | |
Consistent evo rounding; fix fractional /share.gameplay/fractional-evos
| -rw-r--r-- | src/game/g_cmds.c | 12 | ||||
| -rw-r--r-- | src/game/g_combat.c | 2 |
2 files changed, 7 insertions, 7 deletions
diff --git a/src/game/g_cmds.c b/src/game/g_cmds.c index b27e3ad..e960206 100644 --- a/src/game/g_cmds.c +++ b/src/game/g_cmds.c @@ -5244,7 +5244,7 @@ static void Cmd_Ignore_f( gentity_t *ent ) //check arg2 is a number for( i = 0; arg2[ i ]; i++ ) { - if( arg2[ i ] < '0' || arg2[ i ] > '9' ) + if( ( arg2[ i ] < '0' || arg2[ i ] > '9' ) && arg2[ i ] != '.' ) { trap_SendServerCommand( ent-g_entities, "print \"usage: share [name|slot#] [amount]\n\"" ); @@ -5420,7 +5420,7 @@ static void Cmd_Ignore_f( gentity_t *ent ) } if( ent->client->pers.teamSelection == PTE_ALIENS ) - G_LogPrintf( "Donate: %d %f: %s^7 donated %.3f evo(s)\n", ent - g_entities, + G_LogPrintf( "Donate: %d %f: %s^7 donated %.2f evo(s)\n", ent - g_entities, total-value, ent->client->pers.netname, total-value); else G_LogPrintf( "Donate: %d %f: %s^7 donated %.0f credit(s)\n", ent - g_entities, @@ -5433,11 +5433,11 @@ static void Cmd_Ignore_f( gentity_t *ent ) if( ent->client->pers.teamSelection == PTE_ALIENS ) { if( g_logFunds.integer ) - G_LogPrintf( "DonateRecv: %d %d %f: %s^7 received %.3f evo(s)\n", + G_LogPrintf( "DonateRecv: %d %d %f: %s^7 received %.2f evo(s)\n", ent - g_entities, i, g_clients[ i ].pers.netname, amounts[ i ] ); trap_SendServerCommand( i, - va( "print \"%s^7 donated %.3f %s to you, don't forget to say 'thank you'!\n\"", + va( "print \"%s^7 donated %.2f %s to you, don't forget to say 'thank you'!\n\"", ent->client->pers.netname, amounts[ i ], type ) ); } else @@ -5454,7 +5454,7 @@ static void Cmd_Ignore_f( gentity_t *ent ) if( ent->client->pers.teamSelection == PTE_ALIENS ) trap_SendServerCommand( ent-g_entities, - va( "print \"Donated %.3f %s to the cause.\n\"", + va( "print \"Donated %.2f %s to the cause.\n\"", total-value, type ) ); else trap_SendServerCommand( ent-g_entities, @@ -5477,7 +5477,7 @@ void Cmd_Funds_f(gentity_t *ent) return; if (ent->client->pers.teamSelection == PTE_ALIENS) - fmt = "print \"You have %.3f evo(s).\n\""; + fmt = "print \"You have %.2f evo(s).\n\""; else fmt = "print \"You have %.0f credit(s).\n\""; diff --git a/src/game/g_combat.c b/src/game/g_combat.c index 6cadeec..2bff478 100644 --- a/src/game/g_combat.c +++ b/src/game/g_combat.c @@ -462,7 +462,7 @@ void player_die( gentity_t *self, gentity_t *inflictor, gentity_t *attacker, int reward = G_RoundFunds( reward, PTE_ALIENS ); if( g_logFunds.integer ) - G_LogPrintf("KillReward: %d %d %f: %s^7 rewarded with %.3f evo(s)\n", + G_LogPrintf("KillReward: %d %d %f: %s^7 rewarded with %.2f evo(s)\n", self - g_entities, i, reward, player->client->pers.netname, reward); G_AddFundsToClient( player->client, reward, qtrue ); |