X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=blobdiff_plain;f=qcsrc%2Fclient%2FMain.qc;h=f916e843af6120484cfc04fb6f2fa0d3f54d1ed1;hp=d1a76320f429527c6f454d7709d470dab357d6e8;hb=a090db7b58f8721e8344516bd896db69050a48d0;hpb=46e898d5733e900cb3120df4f96130651ccc241a

diff --git a/qcsrc/client/Main.qc b/qcsrc/client/Main.qc
index d1a76320f4..f916e843af 100644
--- a/qcsrc/client/Main.qc
+++ b/qcsrc/client/Main.qc
@@ -148,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;
@@ -457,7 +440,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()
 {
@@ -504,11 +489,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;
 	}
 }
 
@@ -1278,6 +1264,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.
@@ -1350,6 +1337,19 @@ float CSQC_Parse_TempEntity()
 			Net_WeaponComplain();
 			bHandled = true;
 			break;
+		case TE_CSQC_NEX_VELOCITY:
+			nex_velocitydependent = ReadByte();
+			nex_minvelocity = ReadShort();
+			nex_maxvelocity = ReadShort();
+			nex_speed_falloff_rate = ReadByte();
+			nex_charge = ReadByte();
+			nex_charge_rate = ReadByte();
+			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;