From 1c4428c0df8663ee7ca675fb6ebfe9d83949c3be Mon Sep 17 00:00:00 2001 From: Rudolf Polzer Date: Wed, 9 Mar 2011 12:53:20 +0100 Subject: [PATCH] Fix some stupidities in the code I just merged: changing the log output is bad so long after it got done that way (people may be parsing it!), and the %d in the printfs were there for a reason (I know using %s there would be more efficient, but %d tells what that data actually IS) --- defaultXonotic.cfg | 2 +- qcsrc/client/hud.qc | 4 ++-- qcsrc/server/g_world.qc | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/defaultXonotic.cfg b/defaultXonotic.cfg index c7d989831..e9e2f026c 100644 --- a/defaultXonotic.cfg +++ b/defaultXonotic.cfg @@ -488,7 +488,7 @@ set g_powerup_superhealth 1 "if set to 0 the mega health powerup will not spawn set g_powerup_strength 1 "if set to 0 the strength powerup will not spawn on the map" set g_powerup_shield 1 "if set to 0 the shield (invincibility) powerup will not spawn on the map" set g_balance_powerup_timer 1 "if set to 0 the powerups dont wear off" -set g_use_ammunition 1 "if set to 0 all weapons you start with have unlimited ammunition" +set g_use_ammunition 1 "if set to 0 all weapons have unlimited ammunition" set g_pickup_items 1 "if set to 0 all items (health, armor, ammo, weapons...) are removed from the map" set g_minstagib 0 "enable minstagib" set g_minstagib_extralives 2 "how many extra lives you will get per powerup" diff --git a/qcsrc/client/hud.qc b/qcsrc/client/hud.qc index 6ce72820b..1053c5e5f 100644 --- a/qcsrc/client/hud.qc +++ b/qcsrc/client/hud.qc @@ -2983,9 +2983,9 @@ void HUD_KillNotify(string s1, string s2, string s3, float type, float msg) // s } } else if(msg == MSG_KILL_ACTION_SPREE) { if(gentle) - print (sprintf(_("^1%s^1 needs a restart after a %s scoring spree\n"), s1, s2)); + print (sprintf(_("^1%s^1 needs a restart after a %d scoring spree\n"), s1, stof(s2))); else - print (sprintf(_("^1%s^1 died with a %s kill spree\n"), s1, s2)); + print (sprintf(_("^1%s^1 died with a %d kill spree\n"), s1, stof(s2))); } else if(msg == MSG_INFO) { if(type == INFO_GOTFLAG) { // here, s2 is the flag name HUD_KillNotify_Push(s1, s2, 0, INFO_GOTFLAG); diff --git a/qcsrc/server/g_world.qc b/qcsrc/server/g_world.qc index 87d038981..374f17c7b 100644 --- a/qcsrc/server/g_world.qc +++ b/qcsrc/server/g_world.qc @@ -740,7 +740,7 @@ void spawnfunc_worldspawn (void) // initialiation stuff, not good in the mutator system if(autocvar_g_weaponarena != "0") - s = strcat(s, ":", autocvar_g_weaponarena, "_arena"); + s = strcat(s, ":", autocvar_g_weaponarena, " arena"); // TODO to mutator system if(autocvar_g_norecoil) -- 2.39.2