X-Git-Url: https://de.git.xonotic.org/?p=voretournament%2Fvoretournament.git;a=blobdiff_plain;f=data%2Fqcsrc%2Fserver%2Fg_world.qc;h=e3e225e0464900fbb78376205001fbda362a3cca;hp=024281035a44922112443e039577fafe7d287c56;hb=f6fb313876957ca2270250111ba2bb5f9f4024a6;hpb=581d320e29b70e646c11196aaeb14316ea014305

diff --git a/data/qcsrc/server/g_world.qc b/data/qcsrc/server/g_world.qc
index 02428103..e3e225e0 100644
--- a/data/qcsrc/server/g_world.qc
+++ b/data/qcsrc/server/g_world.qc
@@ -49,13 +49,13 @@ void OtherPLReport_Think()
 	WriteByte(MSG_BROADCAST, SVC_TEMPENTITY);
 	WriteByte(MSG_BROADCAST, TE_CSQC_OTHERPLREPORT);
 	WriteByte(MSG_BROADCAST, self.cnt);
-	if(e.eater.classname == "player") // tempt hackers less by only sending the info of eaten players
+	if(e.predator.classname == "player") // tempt hackers less by only sending the info of eaten players
 	{
 		if(cvar("g_vore_showpreyhealth"))
 			WriteByte(MSG_BROADCAST, e.health);
 		else
 			WriteByte(MSG_BROADCAST, 0);
-		WriteByte(MSG_BROADCAST, num_for_edict(e.eater));
+		WriteByte(MSG_BROADCAST, num_for_edict(e.predator));
 	}
 	else
 	{
@@ -654,10 +654,10 @@ void spawnfunc_worldspawn (void)
 	addstat(STAT_DAMAGE_FIRED, AS_INT, stat_fired);
 	addstat(STAT_SHOTORG, AS_INT, stat_shotorg);
 	addstat(STAT_LEADLIMIT, AS_FLOAT, stat_leadlimit);
-	addstat(STAT_BULLETS_LOADED, AS_INT, campingrifle_bulletcounter);
-	addstat(STAT_STOMACH_LOAD, AS_INT, stat_stomachload);
-	addstat(STAT_STOMACH_DIGESTING, AS_INT, stat_digesting);
-	addstat(STAT_STOMACH_EATEN, AS_INT, stat_eaten);
+	addstat(STAT_VORE_LOAD, AS_INT, stat_stomachload);
+	addstat(STAT_VORE_DIGESTING, AS_INT, stat_digesting);
+	addstat(STAT_VORE_EATEN, AS_INT, stat_eaten);
+	addstat(STAT_VORE_CANLEAVE, AS_INT, stat_canleave);
 
 	next_pingtime = time + 5;
 	InitializeEntity(self, cvar_changes_init, INITPRIO_CVARS);
@@ -1157,7 +1157,7 @@ void IntermissionThink()
 		return;
 
 	if(!mapvote_initialized)
-		if (time < intermission_exittime + 10 && !self.BUTTON_ATCK && !self.BUTTON_JUMP && !self.BUTTON_ATCK2 && !self.BUTTON_GRABBER && !self.BUTTON_USE)
+		if (time < intermission_exittime + 10 && !self.BUTTON_ATCK && !self.BUTTON_JUMP && !self.BUTTON_ATCK2 && !self.BUTTON_JETPACK && !self.BUTTON_USE)
 			return;
 
 	MapVote_Start();