X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fserver%2Fclient.qc;h=2a1340408652430f9d734179b03cc6bfde26a734;hb=646e82672a7a8b8db0be0caf5dbd062b0d04da96;hp=dc3951ee9f968b34ffa4106a5294fd24c3e7588d;hpb=1c9d0b4994d43c970e3fa02f651b5f5d79765e5b;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/server/client.qc b/qcsrc/server/client.qc
index dc3951ee9..2a1340408 100644
--- a/qcsrc/server/client.qc
+++ b/qcsrc/server/client.qc
@@ -298,6 +298,8 @@ void PutObserverInServer(entity this)
 	TRANSMUTE(Observer, this);
 	this.iscreature = false;
 	this.teleportable = TELEPORT_SIMPLE;
+	if(this.damagedbycontents)
+		IL_REMOVE(g_damagedbycontents, this);
 	this.damagedbycontents = false;
 	this.health = FRAGS_SPECTATOR;
 	SetSpectatee_status(this, etof(this));
@@ -517,6 +519,8 @@ void PutClientInServer(entity this)
 		this.wasplayer = true;
 		this.iscreature = true;
 		this.teleportable = TELEPORT_NORMAL;
+		if(!this.damagedbycontents)
+			IL_PUSH(g_damagedbycontents, this);
 		this.damagedbycontents = true;
 		set_movetype(this, MOVETYPE_WALK);
 		this.solid = SOLID_SLIDEBOX;
@@ -618,9 +622,11 @@ void PutClientInServer(entity this)
 		FixPlayermodel(this);
 		this.drawonlytoclient = NULL;
 
+		this.viewloc = NULL;
+
 		this.crouch = false;
-		this.view_ofs = STAT(PL_VIEW_OFS, NULL);
-		setsize(this, STAT(PL_MIN, NULL), STAT(PL_MAX, NULL));
+		this.view_ofs = STAT(PL_VIEW_OFS, this);
+		setsize(this, STAT(PL_MIN, this), STAT(PL_MAX, this));
 		this.spawnorigin = spot.origin;
 		setorigin(this, spot.origin + '0 0 1' * (1 - this.mins.z - 24));
 		// don't reset back to last position, even if new position is stuck in solid
@@ -711,7 +717,6 @@ void PutClientInServer(entity this)
 
 void ClientInit_misc(entity this);
 
-.float ebouncefactor, ebouncestop; // electro's values
 // TODO do we need all these fields, or should we stop autodetecting runtime
 // changes and just have a console command to update this?
 bool ClientInit_SendEntity(entity this, entity to, int sf)
@@ -1213,6 +1218,9 @@ void ClientConnect(entity this)
 	if (IS_REAL_CLIENT(this))
 		sv_notice_join(this);
 
+	// update physics stats (players can spawn before physics runs)
+	Physics_UpdateStats(this, PHYS_HIGHSPEED(this));
+
 	IL_EACH(g_initforplayer, it.init_for_player, {
 		it.init_for_player(it, this);
 	});
@@ -1612,7 +1620,7 @@ void SetZoomState(entity this, float z)
 void GetPressedKeys(entity this)
 {
 	MUTATOR_CALLHOOK(GetPressedKeys, this);
-	int keys = this.pressedkeys;
+	int keys = STAT(PRESSED_KEYS, this);
 	keys = BITSET(keys, KEY_FORWARD, 	this.movement.x > 0);
 	keys = BITSET(keys, KEY_BACKWARD, 	this.movement.x < 0);
 	keys = BITSET(keys, KEY_RIGHT, 		this.movement.y > 0);
@@ -1622,7 +1630,9 @@ void GetPressedKeys(entity this)
 	keys = BITSET(keys, KEY_CROUCH, 	PHYS_INPUT_BUTTON_CROUCH(this));
 	keys = BITSET(keys, KEY_ATCK, 		PHYS_INPUT_BUTTON_ATCK(this));
 	keys = BITSET(keys, KEY_ATCK2, 		PHYS_INPUT_BUTTON_ATCK2(this));
-	this.pressedkeys = keys;
+	this.pressedkeys = keys; // store for other users
+
+	STAT(PRESSED_KEYS, this) = keys;
 }
 
 /*
@@ -1655,7 +1665,7 @@ void SpectateCopy(entity this, entity spectatee)
 	this.hit_time = spectatee.hit_time;
 	this.strength_finished = spectatee.strength_finished;
 	this.invincible_finished = spectatee.invincible_finished;
-	this.pressedkeys = spectatee.pressedkeys;
+	STAT(PRESSED_KEYS, this) = STAT(PRESSED_KEYS, spectatee);
 	this.weapons = spectatee.weapons;
 	this.vortex_charge = spectatee.vortex_charge;
 	this.vortex_chargepool_ammo = spectatee.vortex_chargepool_ammo;
@@ -1672,12 +1682,19 @@ void SpectateCopy(entity this, entity spectatee)
 	this.angles = spectatee.v_angle;
 	STAT(FROZEN, this) = STAT(FROZEN, spectatee);
 	this.revive_progress = spectatee.revive_progress;
+	this.viewloc = spectatee.viewloc;
 	if(!PHYS_INPUT_BUTTON_USE(this) && STAT(CAMERA_SPECTATOR, this) != 2)
 		this.fixangle = true;
 	setorigin(this, spectatee.origin);
 	setsize(this, spectatee.mins, spectatee.maxs);
 	SetZoomState(this, spectatee.zoomstate);
 
+	for(int slot = 0; slot < MAX_WEAPONSLOTS; ++slot)
+	{
+		.entity weaponentity = weaponentities[slot];
+		this.(weaponentity) = spectatee.(weaponentity);
+	}
+
     anticheat_spectatecopy(this, spectatee);
 	this.hud = spectatee.hud;
 	if(spectatee.vehicle)