X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fclient%2Fquickmenu.qc;h=6d281aa6b6a578b919efacc0d262534d61f95e99;hb=911f804869b91d4439573cb47b4a9d3d3f9699b8;hp=5f896beea56bcafca0b9d35deca04654c4ad71b3;hpb=120ad19fdf46b7096a0f90b940e590f1909ad22c;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/client/quickmenu.qc b/qcsrc/client/quickmenu.qc
index 5f896beea..6d281aa6b 100644
--- a/qcsrc/client/quickmenu.qc
+++ b/qcsrc/client/quickmenu.qc
@@ -1,8 +1,8 @@
-#include "_all.qh"
+#include "quickmenu.qh"
 
-#include "hud_config.qh"
-
-#include "../dpdefs/keycodes.qh"
+#include <common/ent_cs.qh>
+#include "hud/all.qh"
+#include "mapvoting.qh"
 
 // QUICKMENU_MAXLINES must be <= 10
 const int QUICKMENU_MAXLINES = 10;
@@ -38,6 +38,7 @@ float QuickMenu_TimeOut;
 // if s1 is not empty s will be displayed as command otherwise as submenu
 void QuickMenu_Page_LoadEntry(int i, string s, string s1)
 {
+    TC(int, i);
 	//printf("^xc80 entry %d: %s, %s\n", i, s, s1);
 	if (QuickMenu_Page_Description[i])
 		strunzone(QuickMenu_Page_Description[i]);
@@ -49,6 +50,7 @@ void QuickMenu_Page_LoadEntry(int i, string s, string s1)
 
 void QuickMenu_Page_ClearEntry(int i)
 {
+    TC(int, i);
 	if (QuickMenu_Page_Description[i])
 		strunzone(QuickMenu_Page_Description[i]);
 	QuickMenu_Page_Description[i] = string_null;
@@ -75,12 +77,12 @@ bool QuickMenu_Open(string mode, string submenu)
 	if(mode == "file")
 	{
 		if(autocvar_hud_panel_quickmenu_file == "" || autocvar_hud_panel_quickmenu_file == "0")
-			printf("No file name is set in hud_panel_quickmenu_file, loading default quickmenu\n");
+			LOG_INFO("No file name is set in hud_panel_quickmenu_file, loading default quickmenu\n");
 		else
 		{
 			fh = fopen(autocvar_hud_panel_quickmenu_file, FILE_READ);
 			if(fh < 0)
-				printf("Couldn't open file \"%s\", loading default quickmenu\n", autocvar_hud_panel_quickmenu_file);
+				LOG_INFOF("Couldn't open file \"%s\", loading default quickmenu\n", autocvar_hud_panel_quickmenu_file);
 		}
 		if(fh < 0)
 			mode = "default";
@@ -152,7 +154,7 @@ bool QuickMenu_Open(string mode, string submenu)
 	}
 	else
 	{
-		printf("Unrecognized mode %s\n", mode);
+		LOG_WARNINGF("Unrecognized mode %s\n", mode);
 		return false;
 	}
 
@@ -228,9 +230,10 @@ bool QuickMenu_IsOpened()
 	return (QuickMenu_Page_Entries > 0);
 }
 
-void HUD_Quickmenu_PlayerListEntries(string cmd, int teamplayers, float without_me);
-bool HUD_Quickmenu_PlayerListEntries_Create(string cmd, int teamplayers, float without_me)
+void HUD_Quickmenu_PlayerListEntries(string cmd, int teamplayers, bool without_me);
+bool HUD_Quickmenu_PlayerListEntries_Create(string cmd, int teamplayers, bool without_me)
 {
+    TC(int, teamplayers); TC(bool, without_me);
 	int i;
 	for(i = 0; i < QUICKMENU_MAXLINES; ++i)
 		QuickMenu_Page_ClearEntry(i);
@@ -253,8 +256,9 @@ bool HUD_Quickmenu_PlayerListEntries_Create(string cmd, int teamplayers, float w
 
 // new_page 0 means page 0, new_page != 0 means next page
 int QuickMenu_Buffer_Index_Prev;
-bool QuickMenu_Page_Load(string target_submenu, int new_page)
+bool QuickMenu_Page_Load(string target_submenu, bool new_page)
 {
+    TC(bool, new_page);
 	string s = string_null, cmd = string_null, z_submenu;
 
 	if (new_page == 0)
@@ -286,7 +290,7 @@ bool QuickMenu_Page_Load(string target_submenu, int new_page)
 			// printf("^1 skipping %s\n", s);
 		}
 		if(QuickMenu_Buffer_Index == QuickMenu_Buffer_Size)
-			printf("Couldn't find submenu \"%s\"\n", z_submenu);
+			LOG_WARNINGF("Couldn't find submenu \"%s\"\n", z_submenu);
 	}
 
 	// only the last page can contain up to QUICKMENU_MAXLINES entries
@@ -363,6 +367,7 @@ bool QuickMenu_Page_Load(string target_submenu, int new_page)
 
 bool QuickMenu_ActionForNumber(int num)
 {
+    TC(int, num);
 	if (!QuickMenu_IsLastPage)
 	{
 		if (num < 0 || num >= QUICKMENU_MAXLINES)
@@ -388,8 +393,9 @@ bool QuickMenu_ActionForNumber(int num)
 	return false;
 }
 
-void QuickMenu_Page_ActiveEntry(float entry_num)
+void QuickMenu_Page_ActiveEntry(int entry_num)
 {
+    TC(int, entry_num);
 	QuickMenu_Page_ActivatedEntry = entry_num;
 	QuickMenu_Page_ActivatedEntry_Time = time + 0.1;
 	if(QuickMenu_Page_Command[QuickMenu_Page_ActivatedEntry])
@@ -405,8 +411,9 @@ void QuickMenu_Page_ActiveEntry(float entry_num)
 		QuickMenu_Page_ActivatedEntry_Close = (!(hudShiftState & S_CTRL));
 }
 
-bool QuickMenu_InputEvent(float bInputType, float nPrimary, float nSecondary)
+bool QuickMenu_InputEvent(int bInputType, float nPrimary, float nSecondary)
 {
+    TC(int, bInputType);
 	// we only care for keyboard events
 	if(bInputType == 2)
 		return false;
@@ -532,8 +539,7 @@ void QuickMenu_Mouse()
 		}
 	}
 
-	vector cursorsize = '32 32 0';
-	drawpic(mousepos, strcat("gfx/menu/", autocvar_menu_skin, "/cursor.tga"), cursorsize, '1 1 1', 0.8, DRAWFLAG_NORMAL);
+	draw_cursor_normal(mousepos, '1 1 1', 0.8);
 
 	prevMouseClicked = mouseClicked;
 }
@@ -574,7 +580,7 @@ void HUD_Quickmenu_DrawEntry(vector pos, string desc, string option, vector font
 		drawcolorcodedstring(pos, entry, fontsize, panel_fg_alpha, DRAWFLAG_ADDITIVE);
 }
 
-void HUD_QuickMenu(void)
+void HUD_QuickMenu()
 {
 	if(!autocvar__hud_configure)
 	{
@@ -745,8 +751,9 @@ void HUD_QuickMenu(void)
 		QUICKMENU_ENTRY(strcat("(", prvm_language, ")", title), sprintf(command, translated_text)) \
 }
 
-void HUD_Quickmenu_PlayerListEntries(string cmd, float teamplayers, float without_me)
+void HUD_Quickmenu_PlayerListEntries(string cmd, int teamplayers, bool without_me)
 {
+    TC(int, teamplayers); TC(bool, without_me);
 	entity pl;
 	if(teamplayers && !team_count)
 		return;
@@ -759,7 +766,7 @@ void HUD_Quickmenu_PlayerListEntries(string cmd, float teamplayers, float withou
 			continue;
 		if(without_me && pl.sv_entnum == player_localnum)
 			continue;
-		QUICKMENU_ENTRY(GetPlayerName(pl.sv_entnum), sprintf(cmd, GetPlayerName(pl.sv_entnum)))
+		QUICKMENU_ENTRY(entcs_GetName(pl.sv_entnum), sprintf(cmd, entcs_GetName(pl.sv_entnum)))
 	}
 
 	return;
@@ -848,7 +855,7 @@ void QuickMenu_Default(string target_submenu)
 	QUICKMENU_SMENU(CTX(_("QMCMD^Call a vote")), "Call a vote")
 		QUICKMENU_ENTRY(CTX(_("QMCMD^Restart the map")), "vcall restart")
 		QUICKMENU_ENTRY(CTX(_("QMCMD^End match")), "vcall endmatch")
-		if(getstatf(STAT_TIMELIMIT) > 0)
+		if(STAT(TIMELIMIT) > 0)
 		{
 		QUICKMENU_ENTRY(CTX(_("QMCMD^Reduce match time")), "vcall reducematchtime")
 		QUICKMENU_ENTRY(CTX(_("QMCMD^Extend match time")), "vcall extendmatchtime")
@@ -859,9 +866,9 @@ void QuickMenu_Default(string target_submenu)
 
 	if(target_submenu != "" && !target_submenu_found)
 	{
-		printf("Couldn't find submenu \"%s\"\n", target_submenu);
+		LOG_WARNINGF("Couldn't find submenu \"%s\"\n", target_submenu);
 		if(prvm_language != "en")
-			printf("^3Warning: submenu must be in English\n", target_submenu);
+			LOG_WARNINGF("^3Warning: submenu must be in English\n", target_submenu);
 		QuickMenu_Buffer_Size = 0;
 	}
 }