From: Jakob MG <jakob_mg@hotmail.com>
Date: Tue, 11 Oct 2011 08:34:28 +0000 (+0200)
Subject: Also get rid of type(..) function_name = constructs
X-Git-Tag: xonotic-v0.6.0~40^2~60^2
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=a4627da29134d4b17328d909ce4ae27f4a54535e;p=xonotic%2Fxonotic-data.pk3dir.git

Also get rid of type(..) function_name = constructs
---

diff --git a/qcsrc/client/Main.qc b/qcsrc/client/Main.qc
index 74633c558..6f116d902 100644
--- a/qcsrc/client/Main.qc
+++ b/qcsrc/client/Main.qc
@@ -25,7 +25,7 @@ void cvar_clientsettemp_restore()
 			cvar_set(e.netname, e.message);
 }
 
-void() menu_show_error =
+void menu_show_error()
 {
 	drawstring('0 200 0', _("ERROR - MENU IS VISIBLE BUT NO MENU WAS DEFINED!"), '8 8 0', '1 0 0', 1, 0);
 }
@@ -33,7 +33,7 @@ void() menu_show_error =
 // CSQC_Init : Called every time the CSQC code is initialized (essentially at map load)
 // Useful for precaching things
 
-void() menu_sub_null =
+void menu_sub_null()
 {
 }
 
@@ -937,7 +937,7 @@ void Ent_ReadAccuracy(void)
 void Ent_RadarLink();
 void Ent_Init();
 void Ent_ScoresInfo();
-void(float bIsNewEntity) CSQC_Ent_Update =
+void CSQC_Ent_Update(float bIsNewEntity)
 {
 	float t;
 	float savetime;
diff --git a/qcsrc/client/ctf.qc b/qcsrc/client/ctf.qc
index aecef1a33..02a09ca71 100644
--- a/qcsrc/client/ctf.qc
+++ b/qcsrc/client/ctf.qc
@@ -9,7 +9,7 @@ string STR_PLAYER = "player";
 string ctf_temp_1;
 float order_page;
 
-void() menu_close =
+void menu_close()
 {
 	menu_visible = false;
 	menu_show = menu_show_error;
@@ -21,7 +21,7 @@ void() menu_close =
 	localcmd("\nin_bindmap 0 0;");
 }
 
-void() order_menu_render =
+void order_menu_render()
 {
 	vector ps, po;
 	float i, p, n;
@@ -58,7 +58,7 @@ void() order_menu_render =
 	}
 }
 
-float(float bInputType, float nPrimary, float nSecondary) order_menu_action =
+float order_menu_action(float bInputType, float nPrimary, float nSecondary)
 {
 	string arg;
 	float p, i, n, chose;
@@ -136,7 +136,7 @@ float(float bInputType, float nPrimary, float nSecondary) order_menu_action =
 	return TRUE;
 }
 
-void() order_menu_show =
+void order_menu_show()
 {
 	order_page = 0;
 	menu_show = order_menu_render;
@@ -144,7 +144,7 @@ void() order_menu_show =
 }
 
 
-void() ctf_menu_render =
+void ctf_menu_render()
 {
 	vector ps, po;
 	ps = '0 200 0';
@@ -164,7 +164,7 @@ void() ctf_menu_render =
 	}
 }
 
-float(float bInputType, float nPrimary, float nSecondary) ctf_menu_action =
+float ctf_menu_action(float bInputType, float nPrimary, float nSecondary)
 {
 	string arg;
 	if(bInputType != 0) // key down wanted
@@ -190,7 +190,7 @@ float(float bInputType, float nPrimary, float nSecondary) ctf_menu_action =
 	return TRUE;
 }
 
-void() ctf_menu_show =
+void ctf_menu_show()
 {
 	if(getstati(STAT_CTF_STATE) < 0)
 		return;
@@ -200,7 +200,7 @@ void() ctf_menu_show =
 	//menu_default_binds();
 }
 
-void() ctf_view =
+void ctf_view()
 {
 	float stat;
 	stat = getstati(STAT_CTF_STATE);
diff --git a/qcsrc/client/teamradar.qc b/qcsrc/client/teamradar.qc
index e499b5871..dd1952a5c 100644
--- a/qcsrc/client/teamradar.qc
+++ b/qcsrc/client/teamradar.qc
@@ -80,7 +80,7 @@ void draw_teamradar_background(float fg)
 	}
 }
 
-void(vector coord3d, vector pangles, vector rgb) draw_teamradar_player =
+void draw_teamradar_player(vector coord3d, vector pangles, vector rgb)
 {
 	vector coord, rgb2;
 
diff --git a/qcsrc/menu/menu.qc b/qcsrc/menu/menu.qc
index fe3753d84..c8c3b62f4 100644
--- a/qcsrc/menu/menu.qc
+++ b/qcsrc/menu/menu.qc
@@ -18,7 +18,7 @@ float menuMouseMode;
 
 void SUB_Null() { }
 
-void() m_init =
+void m_init()
 {
 	cvar_set("_menu_alpha", "0");
 	prvm_language = strzone(cvar_string("prvm_language"));
@@ -95,7 +95,7 @@ void UpdateConWidthHeight()
 	}
 }
 
-void() m_init_delayed =
+void m_init_delayed()
 {
 	float fh, glob, n, i;
 	string s;
@@ -173,7 +173,7 @@ void() m_init_delayed =
 		m_display(); // delayed menu display
 }
 
-void(float key, float ascii) m_keyup =
+void m_keyup (float key, float ascii)
 {
 	if(!menuInitialized)
 		return;
@@ -197,7 +197,7 @@ void(float key, float ascii) m_keyup =
 	if(key == K_SHIFT) menuShiftState -= (menuShiftState & S_SHIFT);
 }
 
-void(float key, float ascii) m_keydown =
+void m_keydown(float key, float ascii)
 {
 	if(!menuInitialized)
 		return;
@@ -274,7 +274,7 @@ void draw_Picture_Aligned(vector algn, float scalemode, string img, float a)
 	draw_Picture(org, img, isz, '1 1 1', a);
 }
 
-void(string img, float a, string algn, float force1) drawBackground =
+void drawBackground(string img, float a, string algn, float force1)
 {
 	if(main.mainNexposee.ModalController_state == 0)
 		return;
@@ -600,7 +600,7 @@ void m_tooltip(vector pos)
 	}
 }
 
-void() m_draw =
+void m_draw()
 {
 	float t;
 	float realFrametime;
@@ -779,7 +779,7 @@ void() m_draw =
 	frametime = 0;
 }
 
-void() m_display =
+void m_display()
 {
 	Menu_Active = true;
 	setkeydest(KEY_MENU);
@@ -796,7 +796,7 @@ void() m_display =
 	main.showNotify(main);
 }
 
-void() m_hide =
+void m_hide()
 {
 	Menu_Active = false;
 	setkeydest(KEY_GAME);
@@ -809,7 +809,7 @@ void() m_hide =
 	main.hideNotify(main);
 }
 
-void() m_toggle =
+void m_toggle()
 {
 	if(Menu_Active)
 		m_hide();
@@ -817,7 +817,7 @@ void() m_toggle =
 		m_display();
 }
 
-void() m_shutdown =
+void m_shutdown()
 {
 	entity e;
 
@@ -884,7 +884,7 @@ void m_setpointerfocus(entity wnd)
 	}
 }
 
-void(string itemname) m_goto =
+void m_goto(string itemname)
 {
 	entity e;
 	if(!menuInitialized)
@@ -914,7 +914,7 @@ void(string itemname) m_goto =
 	}
 }
 
-void() m_goto_skin_selector =
+void m_goto_skin_selector()
 {
 	if(!menuInitialized)
 		return;
@@ -922,7 +922,7 @@ void() m_goto_skin_selector =
 	m_goto("skinselector");
 }
 
-void() m_goto_language_selector =
+void m_goto_language_selector()
 {
 	if(!menuInitialized)
 		return;
@@ -930,7 +930,7 @@ void() m_goto_language_selector =
 	m_goto("languageselector");
 }
 
-void() m_goto_video_settings =
+void m_goto_video_settings()
 {
 	if(!menuInitialized)
 		return;
diff --git a/qcsrc/server/bot/havocbot/roles.qc b/qcsrc/server/bot/havocbot/roles.qc
index b208e00b3..d0c10651b 100644
--- a/qcsrc/server/bot/havocbot/roles.qc
+++ b/qcsrc/server/bot/havocbot/roles.qc
@@ -210,7 +210,7 @@ void havocbot_goalrating_enemyplayers(float ratingscale, vector org, float sradi
 }
 
 // choose a role according to the situation
-void() havocbot_role_dm;
+void havocbot_role_dm();
 
 //DOM:
 //go to best items, or control points you don't own
diff --git a/qcsrc/server/ctf.qc b/qcsrc/server/ctf.qc
index cf0850d36..6f7198c2a 100644
--- a/qcsrc/server/ctf.qc
+++ b/qcsrc/server/ctf.qc
@@ -1080,7 +1080,7 @@ void ctf_setstatus()
 	}
 }
 /*
-entity(float cteam) ctf_team_has_commander =
+entity ctf_team_has_commander(float cteam)
 {
 	entity pl;
 	if(cteam != COLOR_TEAM1 || cteam != COLOR_TEAM2)
@@ -1094,13 +1094,13 @@ entity(float cteam) ctf_team_has_commander =
 	return world;
 }
 
-void(entity e, float st) ctf_setstate =
+void ctf_setstate(entity e, float st)
 {
 	e.ctf_state = st;
 	++e.version;
 }
 
-void(float cteam) ctf_new_commander =
+void ctf_new_commander(float cteam)
 {
 	entity pl, plmax;
 
@@ -1125,7 +1125,7 @@ void(float cteam) ctf_new_commander =
 	centerprint(plmax, "^3You're the commander now!\n");
 }
 
-void() ctf_clientconnect =
+void ctf_clientconnect()
 {
 	self.iscommander = FALSE;
 
@@ -1141,7 +1141,7 @@ void() ctf_clientconnect =
 	}
 }
 
-void() ctf_playerchanged =
+void ctf_playerchanged()
 {
 	if(!self.team || self.classname != "player") {
 		ctf_setstate(self, -1);
@@ -1166,7 +1166,7 @@ void() ctf_playerchanged =
 	ctf_new_commander(self.team);
 }
 
-void() ctf_clientdisconnect =
+void ctf_clientdisconnect()
 {
 	if(self.iscommander)
 	{
@@ -1175,7 +1175,7 @@ void() ctf_clientdisconnect =
 }
 
 entity GetPlayer(string);
-float() ctf_clientcommand =
+float ctf_clientcommand()
 {
 	entity e;
 	if(argv(0) == "order") {
diff --git a/qcsrc/server/func_breakable.qc b/qcsrc/server/func_breakable.qc
index a667101d2..4d29b014f 100644
--- a/qcsrc/server/func_breakable.qc
+++ b/qcsrc/server/func_breakable.qc
@@ -37,7 +37,7 @@ void func_breakable_damage(entity inflictor, entity attacker, float damage, floa
 // func_breakable
 // - basically func_assault_destructible for general gameplay use
 //
-void LaunchDebris (string debrisname, vector force) =
+void LaunchDebris (string debrisname, vector force)
 {
 	local	entity dbr;