X-Git-Url: https://git.xonotic.org/?a=blobdiff_plain;ds=sidebyside;f=qcsrc%2Fclient%2FMain.qc;h=27b9284cd1e903e181490fa20470569bf62aa546;hb=4917df1ef0f9edb11438d504e5ed1caee5136437;hp=ed851b9c1ff3a08ed5662005a40c7f543375b5c2;hpb=28da13b2d80022464d46a2cf38ad2c86b65d6876;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/client/Main.qc b/qcsrc/client/Main.qc
index ed851b9c1..27b9284cd 100644
--- a/qcsrc/client/Main.qc
+++ b/qcsrc/client/Main.qc
@@ -924,6 +924,9 @@ void(float bIsNewEntity) CSQC_Ent_Update =
 		case ENT_CLIENT_WARPZONE: WarpZone_Read(bIsNewEntity); break;
 		case ENT_CLIENT_WARPZONE_CAMERA: WarpZone_Camera_Read(bIsNewEntity); break;
 		case ENT_CLIENT_TRIGGER_MUSIC: Ent_ReadTriggerMusic(); break;
+		case ENT_CLIENT_HOOK: Ent_ReadHook(bIsNewEntity, ENT_CLIENT_HOOK); break;
+		case ENT_CLIENT_LGBEAM: Ent_ReadHook(bIsNewEntity, ENT_CLIENT_LGBEAM); break;
+		case ENT_CLIENT_GAUNTLET: Ent_ReadHook(bIsNewEntity, ENT_CLIENT_GAUNTLET); break;
 		default:
 			error(strcat("unknown entity type in CSQC_Ent_Update: ", ftos(self.enttype), "\n"));
 			break;
@@ -1047,6 +1050,9 @@ void Ent_Init()
 	g_balance_grenadelauncher_secondary_bouncefactor = ReadCoord();
 	g_balance_grenadelauncher_secondary_bouncestop = ReadCoord();
 
+	nex_scope = !ReadByte();
+	campingrifle_scope = !ReadByte();
+
 	if(!postinit)
 		PostInit();
 }
@@ -1272,10 +1278,7 @@ void Net_WeaponComplain() {
 	complain_weapon_type = ReadByte();
 
 	complain_weapon_time = time;
-}
-
-void Net_CampingrifleScope() {
-	campingrifle_scope = TRUE;
+	weapontime = time; // ping the weapon panel
 }
 
 // CSQC_Parse_TempEntity : Handles all temporary entity network data in the CSQC layer.
@@ -1304,10 +1307,6 @@ float CSQC_Parse_TempEntity()
 			Net_ReadRace();
 			bHandled = true;
 			break;
-		case TE_CSQC_BEAM:
-			Net_GrapplingHook();
-			bHandled = true;
-			break;
 		case TE_CSQC_SPAWN:
 			Net_ReadSpawn();
 			bHandled = true;
@@ -1352,8 +1351,9 @@ float CSQC_Parse_TempEntity()
 			Net_WeaponComplain();
 			bHandled = true;
 			break;
-		case TE_CSQC_CAMPINGRIFLE_SCOPE:
-			Net_CampingrifleScope();
+		case TE_CSQC_NEX_VELOCITY:
+			nex_minvelocity = ReadShort();
+			nex_maxvelocity = ReadShort();
 			bHandled = true;
 			break;
 		default: