From: Mario <zacjardine@y7mail.com>
Date: Sun, 30 Aug 2015 04:32:07 +0000 (+1000)
Subject: Merge branch 'master' into terencehill/quickmenu
X-Git-Tag: xonotic-v0.8.2~1987^2
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=6cc2d1aa115907d16ae84fb07c3fe6c3329cd9b5;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'master' into terencehill/quickmenu

# Conflicts:
#	qcsrc/client/command/cl_cmd.qc
---

6cc2d1aa115907d16ae84fb07c3fe6c3329cd9b5
diff --cc qcsrc/client/command/cl_cmd.qc
index c3b601984,34e891cca..2d6093868
--- a/qcsrc/client/command/cl_cmd.qc
+++ b/qcsrc/client/command/cl_cmd.qc
@@@ -315,18 -306,15 +315,18 @@@ void LocalCommand_hud(int request, int 
  		}
  
  		default:
- 			print("Incorrect parameters for ^2hud^7\n");
+ 			LOG_INFO("Incorrect parameters for ^2hud^7\n");
  		case CMD_REQUEST_USAGE:
  		{
- 			print("\nUsage:^3 cl_cmd hud action [configname | radartoggle | layout]\n");
- 			print("  Where 'action' is the command to complete,\n");
- 			print("  'configname' is the name to save to for \"save\" action,\n");
- 			print("  'radartoggle' is to control hud_panel_radar_maximized for \"radar\" action,\n");
- 			print("  and 'layout' is how to organize the scoreboard columns for the set action.\n");
- 			print("  quickmenu [[default | file | \"\"] submenu]\n");
- 			print("    Called without options (or with "") loads either the default quickmenu or a quickmenu file if hud_panel_quickmenu_file is set to a valid filename.\n");
- 			print("    Submenu option allows to open quickmenu directly in a submenu, it requires to specify 'default', 'file' or '\"\"' option.\n");
- 			print("  Full list of commands here: \"configure, quickmenu, minigame, save, scoreboard_columns_help, scoreboard_columns_set, radar.\"\n");
+ 			LOG_INFO("\nUsage:^3 cl_cmd hud action [configname | radartoggle | layout]\n");
+ 			LOG_INFO("  Where 'action' is the command to complete,\n");
+ 			LOG_INFO("  'configname' is the name to save to for \"save\" action,\n");
+ 			LOG_INFO("  'radartoggle' is to control hud_panel_radar_maximized for \"radar\" action,\n");
+ 			LOG_INFO("  and 'layout' is how to organize the scoreboard columns for the set action.\n");
++			LOG_INFO("  quickmenu [[default | file | \"\"] submenu]\n");
++			LOG_INFO("    Called without options (or with "") loads either the default quickmenu or a quickmenu file if hud_panel_quickmenu_file is set to a valid filename.\n");
++			LOG_INFO("    Submenu option allows to open quickmenu directly in a submenu, it requires to specify 'default', 'file' or '\"\"' option.\n");
+ 			LOG_INFO("  Full list of commands here: \"configure, minigame, save, scoreboard_columns_help, scoreboard_columns_set, radar.\"\n");
  			return;
  		}
  	}
diff --cc qcsrc/client/main.qc
index 7dc9466a0,6f40c3970..a5085e893
--- a/qcsrc/client/main.qc
+++ b/qcsrc/client/main.qc
@@@ -87,10 -87,10 +87,10 @@@ string forcefog
  void ConsoleCommand_macro_init();
  void CSQC_Init(void)
  {
 -	prvm_language = cvar_string("prvm_language");
 +	prvm_language = strzone(cvar_string("prvm_language"));
  
  #ifdef WATERMARK
- 	dprintf("^4CSQC Build information: ^1%s\n", WATERMARK);
+ 	LOG_TRACEF("^4CSQC Build information: ^1%s\n", WATERMARK);
  #endif
  
  	int i;