X-Git-Url: https://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fcommon%2Fweapons%2Fw_shockwave.qc;h=592f200b9e5f4934897f60866521a9bee01390ff;hb=ca811d45f7e7b64a01657b2252cab3cfdfedd970;hp=3f40c5397fcfb8d34b96f4db4e0132c8b07bc5d1;hpb=451382be257bcb485a1ada1872bfdf2f18769051;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/common/weapons/w_shockwave.qc b/qcsrc/common/weapons/w_shockwave.qc
index 3f40c5397..592f200b9 100644
--- a/qcsrc/common/weapons/w_shockwave.qc
+++ b/qcsrc/common/weapons/w_shockwave.qc
@@ -1,4 +1,4 @@
-#ifdef REGISTER_WEAPON
+#ifndef IMPLEMENTATION
 REGISTER_WEAPON(
 /* WEP_##id  */ SHOCKWAVE,
 /* function  */ W_Shockwave,
@@ -79,7 +79,8 @@ void Net_ReadShockwaveParticle(void);
 .float sw_spread_min;
 .float sw_time;
 #endif
-#else
+#endif
+#ifdef IMPLEMENTATION
 #ifdef SVQC
 void spawnfunc_weapon_shockwave(void)
 {
@@ -87,10 +88,10 @@ void spawnfunc_weapon_shockwave(void)
 	if(autocvar_sv_q3acompat_machineshotgunswap)
 	if(self.classname != "droppedweapon")
 	{
-		weapon_defaultspawnfunc(WEP_MACHINEGUN);
+		weapon_defaultspawnfunc(WEP_MACHINEGUN.m_id);
 		return;
 	}
-	weapon_defaultspawnfunc(WEP_SHOCKWAVE);
+	weapon_defaultspawnfunc(WEP_SHOCKWAVE.m_id);
 }
 
 const float MAX_SHOCKWAVE_HITS = 10;
@@ -178,14 +179,14 @@ void W_Shockwave_Melee_Think(void)
 				self.realowner,
 				self.realowner,
 				swing_damage,
-				(WEP_SHOCKWAVE | HITTYPE_SECONDARY),
+				(WEP_SHOCKWAVE.m_id | HITTYPE_SECONDARY),
 				(self.realowner.origin + self.realowner.view_ofs),
 				(v_forward * WEP_CVAR(shockwave, melee_force))
 			);
 
 			// handle accuracy
 			if(accuracy_isgooddamage(self.realowner, target_victim))
-				{ accuracy_add(self.realowner, WEP_SHOCKWAVE, 0, swing_damage); }
+				{ accuracy_add(self.realowner, WEP_SHOCKWAVE.m_id, 0, swing_damage); }
 
 			#ifdef DEBUG_SHOCKWAVE
 			print(sprintf(
@@ -375,7 +376,7 @@ void W_Shockwave_Attack(void)
 		WEP_CVAR(shockwave, blast_splash_edgedamage),
 		WEP_CVAR(shockwave, blast_splash_radius),
 		w_shotdir * WEP_CVAR(shockwave, blast_splash_force),
-		WEP_SHOCKWAVE,
+		WEP_SHOCKWAVE.m_id,
 		0,
 		self
 	);
@@ -455,7 +456,7 @@ void W_Shockwave_Attack(void)
 					self,
 					self,
 					final_damage,
-					WEP_SHOCKWAVE,
+					WEP_SHOCKWAVE.m_id,
 					head.origin,
 					final_force
 				);
@@ -639,7 +640,7 @@ void W_Shockwave_Attack(void)
 			self,
 			self,
 			final_damage,
-			WEP_SHOCKWAVE,
+			WEP_SHOCKWAVE.m_id,
 			head.origin,
 			final_force
 		);
@@ -647,7 +648,7 @@ void W_Shockwave_Attack(void)
 		if(accuracy_isgooddamage(self.realowner, head))
 		{
 			print("wtf\n");
-			accuracy_add(self.realowner, WEP_SHOCKWAVE, 0, final_damage);
+			accuracy_add(self.realowner, WEP_SHOCKWAVE.m_id, 0, final_damage);
 		}
 
 		#ifdef DEBUG_SHOCKWAVE
@@ -665,7 +666,7 @@ void W_Shockwave_Attack(void)
 	}
 }
 
-float W_Shockwave(float req)
+bool W_Shockwave(int req)
 {
 	switch(req)
 	{
@@ -864,7 +865,7 @@ void Net_ReadShockwaveParticle(void)
 	shockwave.sw_time = time;
 }
 
-float W_Shockwave(float req)
+bool W_Shockwave(int req)
 {
 	switch(req)
 	{