X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fmenu%2Fxonotic%2Fweaponarenacheckbox.qc;h=695b2d7873144974af98443e14ca3f36dd680141;hb=8e69041898af22d651b6416745431cbaab84b0d5;hp=a7d71f0d2cf5db902dd9106f9e7985477ecd7453;hpb=4e85c153239969d8dccea38031e18ddb24b6c935;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/menu/xonotic/weaponarenacheckbox.qc b/qcsrc/menu/xonotic/weaponarenacheckbox.qc
index a7d71f0d2..695b2d787 100644
--- a/qcsrc/menu/xonotic/weaponarenacheckbox.qc
+++ b/qcsrc/menu/xonotic/weaponarenacheckbox.qc
@@ -1,22 +1,9 @@
-#ifdef INTERFACE
-CLASS(XonoticWeaponarenaCheckBox) EXTENDS(CheckBox)
-	METHOD(XonoticWeaponarenaCheckBox, configureXonoticWeaponarenaCheckBox, void(entity, string, string))
-	METHOD(XonoticWeaponarenaCheckBox, setChecked, void(entity, float))
-	ATTRIB(XonoticWeaponarenaCheckBox, fontSize, float, SKINFONTSIZE_NORMAL)
-	ATTRIB(XonoticWeaponarenaCheckBox, image, string, SKINGFX_CHECKBOX)
-	ATTRIB(XonoticWeaponarenaCheckBox, netname, string, string_null)
+#include "weaponarenacheckbox.qh"
 
-	METHOD(XonoticWeaponarenaCheckBox, loadCvars, void(entity))
-	METHOD(XonoticWeaponarenaCheckBox, saveCvars, void(entity))
-ENDCLASS(XonoticWeaponarenaCheckBox)
-entity makeXonoticWeaponarenaCheckBox(string, string);
-#endif
-
-#ifdef IMPLEMENTATION
 entity makeXonoticWeaponarenaCheckBox(string theWeapon, string theText)
 {
 	entity me;
-	me = spawnXonoticWeaponarenaCheckBox();
+	me = NEW(XonoticWeaponarenaCheckBox);
 	me.configureXonoticWeaponarenaCheckBox(me, theWeapon, theText);
 	return me;
 }
@@ -34,9 +21,8 @@ void XonoticWeaponarenaCheckBox_setChecked(entity me, float foo)
 }
 void XonoticWeaponarenaCheckBox_loadCvars(entity me)
 {
-	float n = tokenize_console(cvar_string("menu_weaponarena"));
-	float i;
-	for(i=0; i<n; ++i)
+	int n = tokenize_console(cvar_string("menu_weaponarena"));
+	for (int i = 0; i < n; i++)
 	{
 		if(argv(i) == me.netname)
 		{
@@ -54,4 +40,3 @@ void XonoticWeaponarenaCheckBox_saveCvars(entity me)
 		localcmd(strcat("\nmenu_cmd removefromlist menu_weaponarena ", me.netname, "\n"));
 	localcmd("\ng_weaponarena \"$menu_weaponarena\"\n");
 }
-#endif