X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=blobdiff_plain;f=qcsrc%2Fclient%2FMain.qc;h=d358a59a536db28ea46dd630f8c4e7b941264fe4;hp=8b053cfd38fd553477a140ade161e159aef20dff;hb=a8984299a3be0b649c31067accce7aefd7004c93;hpb=e16769afc48942cb2e9323f0e86b090959bf36b7

diff --git a/qcsrc/client/Main.qc b/qcsrc/client/Main.qc
index 8b053cfd38..d358a59a53 100644
--- a/qcsrc/client/Main.qc
+++ b/qcsrc/client/Main.qc
@@ -186,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();
@@ -440,7 +443,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()
 {
@@ -487,11 +492,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;
 	}
 }
 
@@ -621,6 +627,56 @@ float CSQC_InputEvent(float bInputType, float nPrimary, float nSecondary)
 	local float bSkipKey;
 	bSkipKey = false;
 
+	if(autocvar_cl_allow_uid2name == -1 && (gametype == GAME_CTS || gametype == GAME_RACE) && panel_fg_alpha && !scoreboard_active) // don't lock keys before we actually see what's going on
+	{
+		/*
+		string vyes_keys;
+		float keys;
+		vyes_keys = findkeysforcommand("vyes");
+		keys = tokenize(vyes_keys);
+
+		float i;
+		for (i = 0; i < keys; ++i)
+		{
+			print(ftos(nPrimary), " ", argv(i), "\n"); 
+			if(nPrimary == stof(argv(i)))
+			{
+				vote_active = 0;
+				cvar_set("cl_allow_uid2name", "1");
+				return TRUE;
+			}
+		}
+
+		string vno_keys;
+		vno_keys = findkeysforcommand("vno");
+		keys = tokenize(vno_keys);
+
+		float i;
+		for (i = 0; i < keys; ++i)
+		{
+			if(nPrimary == stof(argv(i)))
+			{
+				vote_active = 0;
+				cvar_set("cl_allow_uid2name", "0");
+				return TRUE;
+			}
+		}
+		*/ // If only I could grab F1-F12 in CSQC... but no
+
+		if(nPrimary == 121) // ascii value for y
+		{
+			vote_active = 0;
+			cvar_set("cl_allow_uid2name", "1");
+			return TRUE;
+		}
+		else if(nPrimary == 110) // ascii value for n
+		{
+			vote_active = 0;
+			cvar_set("cl_allow_uid2name", "0");
+			return TRUE;
+		}
+	}
+
 	if (HUD_Panel_InputEvent(bInputType, nPrimary, nSecondary))
 		return true;
 
@@ -630,6 +686,7 @@ float CSQC_InputEvent(float bInputType, float nPrimary, float nSecondary)
 	if(menu_visible)
 		if(menu_action(bInputType, nPrimary, nSecondary))
 			return TRUE;
+
 	return bSkipKey;
 }
 
@@ -1036,6 +1093,8 @@ void Ent_Init()
 	nex_scope = !ReadByte();
 	campingrifle_scope = !ReadByte();
 
+	serverflags = ReadByte();
+
 	if(!postinit)
 		PostInit();
 }
@@ -1334,9 +1393,8 @@ float CSQC_Parse_TempEntity()
 			Net_WeaponComplain();
 			bHandled = true;
 			break;
-		case TE_CSQC_NEX_VELOCITY:
-			nex_minvelocity = ReadShort();
-			nex_maxvelocity = ReadShort();
+		case TE_CSQC_CR_MAXBULLETS:
+			cr_maxbullets = ReadByte();
 			bHandled = true;
 			break;
 		default: