X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=blobdiff_plain;f=qcsrc%2Fclient%2FMain.qc;h=83098ea29d4dbf0824be5d7390630aeb174f2903;hp=4ea750ce5dbc5c465713037d84ada9ad97b579c0;hb=d6e1aa437e7eb8e182053cf17231597e79df0f81;hpb=3f1297c955ff567121bee040ee94f5b4022d046f

diff --git a/qcsrc/client/Main.qc b/qcsrc/client/Main.qc
index 4ea750ce5d..83098ea29d 100644
--- a/qcsrc/client/Main.qc
+++ b/qcsrc/client/Main.qc
@@ -121,7 +121,6 @@ void CSQC_Init(void)
 	Hook_Precache();
 	GibSplash_Precache();
 	Casings_Precache();
-	DamageInfo_Precache();
 	Vehicles_Precache();
 	turrets_precache();
 	Tuba_Precache();
@@ -129,8 +128,8 @@ void CSQC_Init(void)
 
 	if(autocvar_cl_reticle)
 	{
-		if(autocvar_cl_reticle_item_normal) { precache_pic("gfx/reticle_normal"); }
-		if(autocvar_cl_reticle_item_nex) { precache_pic("gfx/reticle_nex"); }
+		precache_pic("gfx/reticle_normal");
+		// weapon reticles are precached in weapon files
 	}
 
 	get_mi_min_max_texcoords(1); // try the CLEVER way first
@@ -819,8 +818,7 @@ void CSQC_Ent_Update(float bIsNewEntity)
 		case ENT_CLIENT_WARPZONE_TELEPORTED: WarpZone_Teleported_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;
+		case ENT_CLIENT_ARC_BEAM: Ent_ReadArcBeam(bIsNewEntity); break;
 		case ENT_CLIENT_ACCURACY: Ent_ReadAccuracy(); break;
 		case ENT_CLIENT_AUXILIARYXHAIR: Net_AuXair2(bIsNewEntity); break;
 		case ENT_CLIENT_TURRET: ent_turret(); break;
@@ -959,14 +957,10 @@ void Ent_Init()
 	hook_shotorigin[1] = decompressShotOrigin(ReadInt24_t());
 	hook_shotorigin[2] = decompressShotOrigin(ReadInt24_t());
 	hook_shotorigin[3] = decompressShotOrigin(ReadInt24_t());
-	electro_shotorigin[0] = decompressShotOrigin(ReadInt24_t());
-	electro_shotorigin[1] = decompressShotOrigin(ReadInt24_t());
-	electro_shotorigin[2] = decompressShotOrigin(ReadInt24_t());
-	electro_shotorigin[3] = decompressShotOrigin(ReadInt24_t());
-	gauntlet_shotorigin[0] = decompressShotOrigin(ReadInt24_t());
-	gauntlet_shotorigin[1] = decompressShotOrigin(ReadInt24_t());
-	gauntlet_shotorigin[2] = decompressShotOrigin(ReadInt24_t());
-	gauntlet_shotorigin[3] = decompressShotOrigin(ReadInt24_t());
+	arc_shotorigin[0] = decompressShotOrigin(ReadInt24_t());
+	arc_shotorigin[1] = decompressShotOrigin(ReadInt24_t());
+	arc_shotorigin[2] = decompressShotOrigin(ReadInt24_t());
+	arc_shotorigin[3] = decompressShotOrigin(ReadInt24_t());
 
 	if(forcefog)
 		strunzone(forcefog);
@@ -979,7 +973,7 @@ void Ent_Init()
 	g_balance_electro_secondary_bouncefactor = ReadCoord();
 	g_balance_electro_secondary_bouncestop = ReadCoord();
 
-	nex_scope = !ReadByte();
+	vortex_scope = !ReadByte();
 	rifle_scope = !ReadByte();
 
 	serverflags = ReadByte();
@@ -1176,7 +1170,7 @@ void Net_WeaponComplain()
 
 	if(complain_weapon_name)
 		strunzone(complain_weapon_name);
-	complain_weapon_name = strzone(ReadString());
+	complain_weapon_name = strzone(WEP_NAME(complain_weapon));
 
 	complain_weapon_type = ReadByte();
 
@@ -1220,16 +1214,16 @@ float CSQC_Parse_TempEntity()
 			Net_ReadRace();
 			bHandled = true;
 			break;
-		case TE_CSQC_NEXGUNBEAMPARTICLE:
-			Net_ReadNexgunBeamParticle();
+		case TE_CSQC_VORTEXBEAMPARTICLE:
+			Net_ReadVortexBeamParticle();
 			bHandled = true;
 			break;
 		case TE_CSQC_TEAMNAGGER:
 			Net_TeamNagger();
 			bHandled = true;
 			break;
-		case TE_CSQC_LIGHTNINGARC:
-			Net_ReadLightningarc();
+		case TE_CSQC_ARC:
+			Net_ReadArc();
 			bHandled = true;
 			break;
 		case TE_CSQC_PINGPLREPORT:
@@ -1248,6 +1242,10 @@ float CSQC_Parse_TempEntity()
 			cl_notice_read();
 			bHandled = true;
 			break;
+		case TE_CSQC_SHOCKWAVEPARTICLE:
+			Net_ReadShockwaveParticle();
+			bHandled = true;
+			break;
 		default:
 			// No special logic for this temporary entity; return 0 so the engine can handle it
 			bHandled = false;