X-Git-Url: http://de.git.xonotic.org/?p=voretournament%2Fvoretournament.git;a=blobdiff_plain;f=data%2Fqcsrc%2Fserver%2Fvore.qc;h=a9a615e27987a55a36b0cd6b335a1dbe84875734;hp=94b8d185a052bdac339cab45725d582267dfddc6;hb=4c85321002adc56c66fe0f47b6320ccc54e46c7a;hpb=3c455ebb433b92c92861c94999afaf176517f7b6

diff --git a/data/qcsrc/server/vore.qc b/data/qcsrc/server/vore.qc
index 94b8d185..a9a615e2 100644
--- a/data/qcsrc/server/vore.qc
+++ b/data/qcsrc/server/vore.qc
@@ -101,15 +101,9 @@ void Vore_SetPreyPositions()
 	// self is the predator and head is the prey
 
 	local entity head;
-	local vector oldforward, oldright, oldup;
 	local vector origin_apply;
 	local float position_counter;
 
-	oldforward = v_forward;
-	oldright = v_right;
-	oldup = v_up;
-	makevectors(self.v_angle);
-
 	// In order to allow prey to see each other in the stomach, we must position each occupant differently,
 	// else all players overlap in the center. To do this, we run a loop on all players in the same stomach.
 	// For each player, the origin is updated, then a new origin is used for the next player.
@@ -152,9 +146,8 @@ void Vore_SetPreyPositions()
 			}
 
 			// since prey have their predators set as an aiment, view_ofs will specify the real origin of prey, not just the view offset
-			origin_apply_x *= v_forward_x; // position depends on the predator's rotation
-			origin_apply_y *= v_forward_y; // position depends on the predator's rotation
 			head.view_ofs = PL_PREY_VIEW_OFS + origin_apply * cvar("g_vore_neighborprey_distance");
+			head.view_ofs_z *= self.scale; // stomach center depends on predator scale
 
 			// change prey height based on scale
 			float prey_height;
@@ -164,10 +157,6 @@ void Vore_SetPreyPositions()
 			position_counter += 1;
 		}
 	}
-
-	v_forward = oldforward;
-	v_right = oldright;
-	v_up = oldup;
 }
 
 .float gurgle_oldstomachload;
@@ -380,7 +369,7 @@ void Vore_Digest()
 {
 	// apply digestion to prey
 
-	if(time > self.predator.digestion_step)
+	if(time > self.digestion_step)
 	{
 		Damage(self, self.predator, self.predator, cvar("g_balance_vore_digestion_damage"), DEATH_DIGESTION, self.origin, '0 0 0');
 		if(cvar("g_balance_vore_digestion_vampire") && self.predator.health < cvar("g_balance_vore_digestion_vampire_stable"))
@@ -391,7 +380,7 @@ void Vore_Digest()
 			PlayerSound (self.predator, playersound_digest, CHAN_PLAYER, VOICETYPE_PLAYERSOUND);
 			self.predator.digestsound_finished = time + 0.5;
 		}
-		self.predator.digestion_step = time + steptime;
+		self.digestion_step = time + steptime;
 	}
 
 	if(self.deadflag != DEAD_NO)
@@ -433,9 +422,6 @@ void Vore_StomachKick()
 		self.predator.punchangle_x -= cvar("g_balance_vore_kick_predator_punchangle");
 		self.punchangle_x += cvar("g_balance_vore_kick_prey_punchangle");
 
-		if(random() < cvar("g_balance_vore_kick_escapeprobability"))
-			Vore_Regurgitate(self);
-
 		self.stomachkick_delay = time + cvar("g_balance_vore_kick_delay");
 	}
 }