X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=blobdiff_plain;f=qcsrc%2Fcommon%2Fweapons%2Fweapon%2Felectro.qc;h=420305d051cd882576474196162aa46263e01d85;hp=fbc07338808e01a22dc1b10daad005a437f61f5c;hb=047e80d3190ef626c6029a655677ff1a08e66e3a;hpb=9a3b01ba5da2726001a5ed74645a15ce764a3675

diff --git a/qcsrc/common/weapons/weapon/electro.qc b/qcsrc/common/weapons/weapon/electro.qc
index fbc0733880..420305d051 100644
--- a/qcsrc/common/weapons/weapon/electro.qc
+++ b/qcsrc/common/weapons/weapon/electro.qc
@@ -1,19 +1,21 @@
 #ifndef IMPLEMENTATION
-REGISTER_WEAPON(
-/* WEP_##id  */ ELECTRO,
-/* function  */ W_Electro,
-/* ammotype  */ ammo_cells,
-/* impulse   */ 5,
-/* flags     */ WEP_FLAG_NORMAL | WEP_FLAG_RELOADABLE | WEP_FLAG_CANCLIMB | WEP_TYPE_SPLASH,
-/* rating    */ BOT_PICKUP_RATING_MID,
-/* color     */ '0 0.5 1',
-/* modelname */ "electro",
-/* simplemdl */ "foobar",
-/* crosshair */ "gfx/crosshairelectro 0.6",
-/* wepimg    */ "weaponelectro",
-/* refname   */ "electro",
-/* wepname   */ _("Electro")
-);
+CLASS(Electro, Weapon)
+/* ammotype  */ ATTRIB(Electro, ammo_field, .int, ammo_cells)
+/* impulse   */ ATTRIB(Electro, impulse, int, 5)
+/* flags     */ ATTRIB(Electro, spawnflags, int, WEP_FLAG_NORMAL | WEP_FLAG_RELOADABLE | WEP_FLAG_CANCLIMB | WEP_TYPE_SPLASH);
+/* rating    */ ATTRIB(Electro, bot_pickupbasevalue, float, BOT_PICKUP_RATING_MID);
+/* color     */ ATTRIB(Electro, wpcolor, vector, '0 0.5 1');
+/* modelname */ ATTRIB(Electro, mdl, string, "electro");
+#ifndef MENUQC
+/* model     */ ATTRIB(Electro, m_model, Model, MDL_ELECTRO_ITEM);
+#endif
+/* crosshair */ ATTRIB(Electro, w_crosshair, string, "gfx/crosshairelectro");
+/* crosshair */ ATTRIB(Electro, w_crosshair_size, float, 0.6);
+/* wepimg    */ ATTRIB(Electro, model2, string, "weaponelectro");
+/* refname   */ ATTRIB(Electro, netname, string, "electro");
+/* wepname   */ ATTRIB(Electro, message, string, _("Electro"));
+ENDCLASS(Electro)
+REGISTER_WEAPON(ELECTRO, NEW(Electro));
 
 #define ELECTRO_SETTINGS(w_cvar,w_prop) ELECTRO_SETTINGS_LIST(w_cvar, w_prop, ELECTRO, electro)
 #define ELECTRO_SETTINGS_LIST(w_cvar,w_prop,id,sn) \
@@ -243,11 +245,11 @@ void W_Electro_Bolt_Think(void)
 	else { self.nextthink = self.ltime; }
 }
 
-void W_Electro_Attack_Bolt(void)
+void W_Electro_Attack_Bolt(Weapon thiswep)
 {SELFPARAM();
 	entity proj;
 
-	W_DecreaseAmmo(WEP_CVAR_PRI(electro, ammo));
+	W_DecreaseAmmo(thiswep, WEP_CVAR_PRI(electro, ammo));
 
 	W_SetupShot_ProjectileSize(
 		self,
@@ -343,9 +345,9 @@ void W_Electro_Orb_Damage(entity inflictor, entity attacker, float damage, int d
 	}
 }
 
-void W_Electro_Attack_Orb(void)
+void W_Electro_Attack_Orb(Weapon thiswep)
 {SELFPARAM();
-	W_DecreaseAmmo(WEP_CVAR_SEC(electro, ammo));
+	W_DecreaseAmmo(thiswep, WEP_CVAR_SEC(electro, ammo));
 
 	W_SetupShot_ProjectileSize(
 		self,
@@ -404,28 +406,24 @@ void W_Electro_Attack_Orb(void)
 	MUTATOR_CALLHOOK(EditProjectile, self, proj);
 }
 
-void W_Electro_CheckAttack(void)
+void W_Electro_CheckAttack(Weapon thiswep, bool fire1, bool fire2)
 {SELFPARAM();
 	if(self.electro_count > 1)
 	if(self.BUTTON_ATCK2)
 	if(weapon_prepareattack(1, -1))
 	{
-		W_Electro_Attack_Orb();
+		W_Electro_Attack_Orb(WEP_ELECTRO);
 		self.electro_count -= 1;
 		weapon_thinkf(WFRAME_FIRE2, WEP_CVAR_SEC(electro, animtime), W_Electro_CheckAttack);
 		return;
 	}
 	// WEAPONTODO: when the player releases the button, cut down the length of refire2?
-	w_ready();
+	w_ready(thiswep, fire1, fire2);
 }
 
 .float bot_secondary_electromooth;
-bool W_Electro(int req)
-{SELFPARAM();
-	float ammo_amount;
-	switch(req)
-	{
-		case WR_AIM:
+
+		METHOD(Electro, wr_aim, bool(entity thiswep))
 		{
 			self.BUTTON_ATCK = self.BUTTON_ATCK2 = false;
 			if(vlen(self.origin-self.enemy.origin) > 1000) { self.bot_secondary_electromooth = 0; }
@@ -455,11 +453,11 @@ bool W_Electro(int req)
 
 			return true;
 		}
-		case WR_THINK:
+		METHOD(Electro, wr_think, bool(entity thiswep, bool fire1, bool fire2))
 		{
 			if(autocvar_g_balance_electro_reload_ammo) // forced reload // WEAPONTODO
 			{
-				ammo_amount = 0;
+				float ammo_amount = 0;
 				if(self.clip_load >= WEP_CVAR_PRI(electro, ammo))
 					ammo_amount = 1;
 				if(self.clip_load >= WEP_CVAR_SEC(electro, ammo))
@@ -467,27 +465,27 @@ bool W_Electro(int req)
 
 				if(!ammo_amount)
 				{
-					WEP_ACTION(self.weapon, WR_RELOAD);
+					_WEP_ACTION(self.weapon, WR_RELOAD);
 					return false;
 				}
 
 				return true;
 			}
 
-			if(self.BUTTON_ATCK)
+			if(fire1)
 			{
 				if(weapon_prepareattack(0, WEP_CVAR_PRI(electro, refire)))
 				{
-						W_Electro_Attack_Bolt();
+						W_Electro_Attack_Bolt(thiswep);
 						weapon_thinkf(WFRAME_FIRE1, WEP_CVAR_PRI(electro, animtime), w_ready);
 				}
 			}
-			else if(self.BUTTON_ATCK2)
+			else if(fire2)
 			{
 				if(time >= self.electro_secondarytime)
 				if(weapon_prepareattack(1, WEP_CVAR_SEC(electro, refire)))
 				{
-					W_Electro_Attack_Orb();
+					W_Electro_Attack_Orb(thiswep);
 					self.electro_count = WEP_CVAR_SEC(electro, count);
 					weapon_thinkf(WFRAME_FIRE2, WEP_CVAR_SEC(electro, animtime), W_Electro_CheckAttack);
 					self.electro_secondarytime = time + WEP_CVAR_SEC(electro, refire2) * W_WeaponRateFactor();
@@ -496,19 +494,20 @@ bool W_Electro(int req)
 
 			return true;
 		}
-		case WR_INIT:
+		METHOD(Electro, wr_init, bool(entity thiswep))
 		{
 			ELECTRO_SETTINGS(WEP_SKIP_CVAR, WEP_SET_PROP);
 			return true;
 		}
-		case WR_CHECKAMMO1:
+		METHOD(Electro, wr_checkammo1, bool(entity thiswep))
 		{
-			ammo_amount = self.WEP_AMMO(ELECTRO) >= WEP_CVAR_PRI(electro, ammo);
+			float ammo_amount = self.WEP_AMMO(ELECTRO) >= WEP_CVAR_PRI(electro, ammo);
 			ammo_amount += self.(weapon_load[WEP_ELECTRO.m_id]) >= WEP_CVAR_PRI(electro, ammo);
 			return ammo_amount;
 		}
-		case WR_CHECKAMMO2:
+		METHOD(Electro, wr_checkammo2, bool(entity thiswep))
 		{
+			float ammo_amount;
 			if(WEP_CVAR(electro, combo_safeammocheck)) // true if you can fire at least one secondary blob AND one primary shot after it, otherwise false.
 			{
 				ammo_amount = self.WEP_AMMO(ELECTRO) >= WEP_CVAR_SEC(electro, ammo) + WEP_CVAR_PRI(electro, ammo);
@@ -521,29 +520,29 @@ bool W_Electro(int req)
 			}
 			return ammo_amount;
 		}
-		case WR_CONFIG:
+		METHOD(Electro, wr_config, bool(entity thiswep))
 		{
 			ELECTRO_SETTINGS(WEP_CONFIG_WRITE_CVARS, WEP_CONFIG_WRITE_PROPS);
 			return true;
 		}
-		case WR_RESETPLAYER:
+		METHOD(Electro, wr_resetplayer, bool(entity thiswep))
 		{
 			self.electro_secondarytime = time;
 			return true;
 		}
-		case WR_RELOAD:
+		METHOD(Electro, wr_reload, bool(entity thiswep))
 		{
 			W_Reload(min(WEP_CVAR_PRI(electro, ammo), WEP_CVAR_SEC(electro, ammo)), SND(RELOAD));
 			return true;
 		}
-		case WR_SUICIDEMESSAGE:
+		METHOD(Electro, wr_suicidemessage, bool(entity thiswep))
 		{
 			if(w_deathtype & HITTYPE_SECONDARY)
 				return WEAPON_ELECTRO_SUICIDE_ORBS;
 			else
 				return WEAPON_ELECTRO_SUICIDE_BOLT;
 		}
-		case WR_KILLMESSAGE:
+		METHOD(Electro, wr_killmessage, bool(entity thiswep))
 		{
 			if(w_deathtype & HITTYPE_SECONDARY)
 			{
@@ -557,16 +556,11 @@ bool W_Electro(int req)
 					return WEAPON_ELECTRO_MURDER_BOLT;
 			}
 		}
-	}
-	return false;
-}
+
 #endif
 #ifdef CSQC
-bool W_Electro(int req)
-{SELFPARAM();
-	switch(req)
-	{
-		case WR_IMPACTEFFECT:
+
+		METHOD(Electro, wr_impacteffect, bool(entity thiswep))
 		{
 			vector org2;
 			org2 = w_org + w_backoff * 6;
@@ -595,17 +589,15 @@ bool W_Electro(int req)
 
 			return true;
 		}
-		case WR_INIT:
+		METHOD(Electro, wr_init, bool(entity thiswep))
 		{
 			return true;
 		}
-		case WR_ZOOMRETICLE:
+		METHOD(Electro, wr_zoomreticle, bool(entity thiswep))
 		{
 			// no weapon specific image for this weapon
 			return false;
 		}
-	}
-	return false;
-}
+
 #endif
 #endif