X-Git-Url: https://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=blobdiff_plain;f=qcsrc%2Fclient%2FMain.qc;h=897626a4e89024cdc64cdacface730c9b6a7cf47;hp=de5aad9d48311eaa69f1f2ea7f330063fd0291c5;hb=cc158c3008fa81c8dc5f92de8e4424042aa58024;hpb=a05e8f343b4890e39b6870aa4e5cb6eaf183c949

diff --git a/qcsrc/client/Main.qc b/qcsrc/client/Main.qc
index de5aad9d4..897626a4e 100644
--- a/qcsrc/client/Main.qc
+++ b/qcsrc/client/Main.qc
@@ -136,6 +136,7 @@ void CSQC_Init(void)
 
 	// precaches
 	Projectile_Precache();
+	Hook_Precache();
 	GibSplash_Precache();
 	Casings_Precache();
 	DamageInfo_Precache();
@@ -147,23 +148,6 @@ void CSQC_Init(void)
 	}
 	Tuba_Precache();
 
-#ifdef UID
-	{
-		// find the user ID
-		string uid;
-		registercvar("_cl_userid", "", CVAR_SAVE);
-		uid = cvar_string("_cl_userid");
-		if(strlen(uid) < 16)
-		{
-			uid = "";
-			for(i = 0; i < 4; ++i)
-				uid = strcat(uid, substring(ftos(floor(10000 + random() * 10000)), 1, -1));
-		}
-		cvar_set("_cl_userid", uid);
-		localcmd(strcat("\ncmd uid ", uid, "\n"));
-	}
-#endif
-
 	get_mi_min_max_texcoords(1); // try the CLEVER way first
 	minimapname = strcat("gfx/", mi_shortname, "_radar.tga");
 	shortmapname = mi_shortname;
@@ -202,7 +186,10 @@ void CSQC_Shutdown(void)
 	remove(players);
 	db_close(binddb);
 	db_close(tempdb);
-	db_save(ClientProgsDB, "client.db");
+	if(cvar("cl_db_saveasdump"))
+		db_dump(ClientProgsDB, "client.db");
+	else
+		db_save(ClientProgsDB, "client.db");
 	db_close(ClientProgsDB);
 
 	cvar_clientsettemp_restore();
@@ -351,6 +338,8 @@ void PostInit(void)
 	Porto_Init();
 	TrueAim_Init();
 
+	weaponorder_byimpulse = W_FixWeaponOrder_BuildImpulseList(W_FixWeaponOrder_ForceComplete(W_NumberWeaponOrder(cvar_string("cl_weaponpriority"))));
+
 	postinit = true;
 }
 
@@ -456,7 +445,9 @@ void ShotOrg_Draw()
 	self.angles = view_angles;
 	self.angles_x = -self.angles_x;
 	if not(self.cnt)
-		R_AddEntity(self);
+		self.drawmask = MASK_NORMAL;
+	else
+		self.drawmask = 0;
 }
 void ShotOrg_Draw2D()
 {
@@ -503,11 +494,12 @@ void DrawDebugModel()
 	if(time - floor(time) > 0.5)
 	{
 		PolyDrawModel(self);
+		self.drawmask = 0;
 	}
 	else
 	{
 		self.renderflags = 0;
-		R_AddEntity(self);
+		self.drawmask = MASK_NORMAL;
 	}
 }
 
@@ -923,6 +915,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;
@@ -1022,9 +1017,18 @@ void Ent_Init()
 
 	nb_pb_period = ReadByte() / 32; //Accuracy of 1/32th
 
-	hook_shotorigin_x = ReadCoord();
-	hook_shotorigin_y = ReadCoord();
-	hook_shotorigin_z = ReadCoord();
+	hook_shotorigin[0] = decompressShotOrigin(ReadInt24_t());
+	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());
 
 	if(forcefog)
 		strunzone(forcefog);
@@ -1037,6 +1041,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();
 }
@@ -1262,6 +1269,7 @@ void Net_WeaponComplain() {
 	complain_weapon_type = ReadByte();
 
 	complain_weapon_time = time;
+	weapontime = time; // ping the weapon panel
 }
 
 // CSQC_Parse_TempEntity : Handles all temporary entity network data in the CSQC layer.
@@ -1290,10 +1298,6 @@ float CSQC_Parse_TempEntity()
 			Net_ReadRace();
 			bHandled = true;
 			break;
-		case 13: // TE_BEAM
-			Net_GrapplingHook();
-			bHandled = true;
-			break;
 		case TE_CSQC_SPAWN:
 			Net_ReadSpawn();
 			bHandled = true;
@@ -1338,6 +1342,10 @@ float CSQC_Parse_TempEntity()
 			Net_WeaponComplain();
 			bHandled = true;
 			break;
+		case TE_CSQC_CR_MAXBULLETS:
+			cr_maxbullets = ReadByte();
+			bHandled = true;
+			break;
 		default:
 			// No special logic for this temporary entity; return 0 so the engine can handle it
 			bHandled = false;