X-Git-Url: https://de.git.xonotic.org/?a=blobdiff_plain;f=data%2Fqcsrc%2Fclient%2FMain.qc;h=5b5a22174724361fcc93144a7e6b4c2abca939f6;hb=f6fb313876957ca2270250111ba2bb5f9f4024a6;hp=cf29ae8aa8a3d7169f23faff3eb80f7cfe75c203;hpb=cc148bf19700d380a18d7f51a706f9bbe959811b;p=voretournament%2Fvoretournament.git

diff --git a/data/qcsrc/client/Main.qc b/data/qcsrc/client/Main.qc
index cf29ae8a..5b5a2217 100644
--- a/data/qcsrc/client/Main.qc
+++ b/data/qcsrc/client/Main.qc
@@ -88,6 +88,8 @@ void CSQC_Init(void)
 	registercmd("-button3");
 	registercmd("+button4");
 	registercmd("-button4");
+	registercmd("+button6");
+	registercmd("-button6");
 	registercmd("+showaccuracy");registercmd("-showaccuracy");
 
 #ifndef CAMERATEST
@@ -387,6 +389,12 @@ float CSQC_ConsoleCommand(string strMessage)
 	} else if(strCmd == "-button3") { // secondary
 		button_attack2 = 0;
 		return false;
+	} else if(strCmd == "+button6") { // secondary
+		button_jetpack = 1;
+		return false;
+	} else if(strCmd == "-button6") { // secondary
+		button_jetpack = 0;
+		return false;
 	} else if(strCmd == "+showscores") {
 		sb_showscores = true;
 		return true;
@@ -933,17 +941,8 @@ void CSQC_Ent_Remove()
 
 void Gamemode_Init()
 {
-	if(gametype == GAME_ONSLAUGHT) {
+	if(gametype == GAME_ONSLAUGHT)
 		print(strcat("Using ", minimapname, " as minimap.\n"));
-		precache_pic("gfx/ons-cp-neutral.tga");
-		precache_pic("gfx/ons-cp-red.tga");
-		precache_pic("gfx/ons-cp-blue.tga");
-		precache_pic("gfx/ons-frame.tga");
-		precache_pic("gfx/ons-frame-team.tga");
-	} else if(gametype == GAME_KEYHUNT) {
-		precache_pic("gfx/sb_key_carrying");
-		precache_pic("gfx/sb_key_carrying_outline");
-	}
 
 	if not(isdemo())
 	{
@@ -1211,7 +1210,7 @@ void Net_ReadOtherPLReport()
 	if not(playerslots[e])
 		return;
 	playerslots[e].plhealth = ph;
-	playerslots[e].pleater = pn;
+	playerslots[e].plpredator = pn;
 }
 
 void Net_VoteDialog(float highlight) {
@@ -1268,10 +1267,6 @@ float CSQC_Parse_TempEntity()
 			Net_ReadZCurveParticles();
 			bHandled = true;
 			break;
-		case TE_CSQC_NEXGUNBEAMPARTICLE:
-			Net_ReadNexgunBeamParticle();
-			bHandled = true;
-			break;
 		case TE_CSQC_TEAMNAGGER:
 			Net_TeamNagger();
 			bHandled = true;