X-Git-Url: https://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fserver%2Fplayerdemo.qc;h=411d826a87c1f7fb3d309b64f144a50c0f584a0e;hb=1986f19a673f0af0a88a1e2bdd2ae04a431fab33;hp=61104ebe2fa1a1420d01a20f035ce4ef3fa2b891;hpb=8ba1f6c672361186033b8bebc3be677ac94bd4da;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/server/playerdemo.qc b/qcsrc/server/playerdemo.qc
index 61104ebe2..411d826a8 100644
--- a/qcsrc/server/playerdemo.qc
+++ b/qcsrc/server/playerdemo.qc
@@ -4,6 +4,7 @@
 #elif defined(SVQC)
     #include "defs.qh"
     #include "playerdemo.qh"
+	#include <common/state.qh>
 #endif
 
 .float playerdemo_fh;
@@ -21,7 +22,7 @@ void playerdemo_shutdown(entity this)
 {
 	if(this.playerdemo_mode != PLAYERDEMO_MODE_OFF)
 	{
-		LOG_INFO("playerdemo: ", this.netname, " closed\n");
+		LOG_INFO("playerdemo: ", this.netname, " closed");
 		fclose(this.playerdemo_fh);
 	}
 	this.playerdemo_mode = 0;
@@ -34,8 +35,8 @@ void playerdemo_open_read(entity this, string f)
 	this.playerdemo_starttime = time - 1;
 	this.playerdemo_time = stof(fgets(this.playerdemo_fh));
 	this.playerdemo_time += this.playerdemo_starttime;
-	this.movetype = MOVETYPE_NONE;
-	LOG_INFO("playerdemo: ", this.netname, " reading from ", f, "\n");
+	set_movetype(this, MOVETYPE_NONE);
+	LOG_INFO("playerdemo: ", this.netname, " reading from ", f);
 }
 void playerdemo_open_write(entity this, string f)
 {
@@ -43,8 +44,8 @@ void playerdemo_open_write(entity this, string f)
 	this.playerdemo_mode = PLAYERDEMO_MODE_WRITING;
 	this.playerdemo_fh = fopen(f, FILE_WRITE);
 	this.playerdemo_starttime = time - 1;
-	LOG_INFO("playerdemo: ", this.netname, " writing to ", f, "\n");
-	LOG_INFO("WARNING: playerdemo file format is incomplete and not stable yet. DO NOT RELY ON IT!\n");
+	LOG_INFO("playerdemo: ", this.netname, " writing to ", f);
+	LOG_INFO("WARNING: playerdemo file format is incomplete and not stable yet. DO NOT RELY ON IT!");
 }
 #define PLAYERDEMO_FIELD(ent,func,t,f) func##t(ent,f,#f);
 #define PLAYERDEMO_FIELDS(ent,func) \
@@ -60,11 +61,11 @@ void playerdemo_open_write(entity this, string f)
 	PLAYERDEMO_FIELD(ent,func,float,frame) \
 	PLAYERDEMO_FIELD(ent,func,float,effects) \
 	/* PLAYERDEMO_FIELD(ent,func,float,switchweapon) */ \
-	PLAYERDEMO_FIELD(ent,func,float,button0) /* TODO: PHYS_INPUT_BUTTON_ATCK */ \
-	PLAYERDEMO_FIELD(ent,func,float,button3) /* TODO: PHYS_INPUT_BUTTON_ATCK2 */ \
-	PLAYERDEMO_FIELD(ent,func,float,button5) /* TODO: PHYS_INPUT_BUTTON_CROUCH */ \
-	PLAYERDEMO_FIELD(ent,func,float,button6) /* TODO: PHYS_INPUT_BUTTON_HOOK */ \
-	PLAYERDEMO_FIELD(ent,func,float,buttonuse) /* TODO: PHYS_INPUT_BUTTON_USE */ \
+	PLAYERDEMO_FIELD(CS(ent),func,float,button0) /* TODO: PHYS_INPUT_BUTTON_ATCK */ \
+	PLAYERDEMO_FIELD(CS(ent),func,float,button3) /* TODO: PHYS_INPUT_BUTTON_ATCK2 */ \
+	PLAYERDEMO_FIELD(CS(ent),func,float,button5) /* TODO: PHYS_INPUT_BUTTON_CROUCH */ \
+	PLAYERDEMO_FIELD(CS(ent),func,float,button6) /* TODO: PHYS_INPUT_BUTTON_HOOK */ \
+	PLAYERDEMO_FIELD(CS(ent),func,float,buttonuse) /* TODO: PHYS_INPUT_BUTTON_USE */ \
 	PLAYERDEMO_FIELD(ent,func,float,flags) \
 	// end of list
 
@@ -147,9 +148,9 @@ float playerdemo_read(entity this)
 		PLAYERDEMO_FIELDS(this, playerdemo_read_)
 		{
 			time = this.playerdemo_time;
-			WITHSELF(this, PlayerPreThink());
+			PlayerPreThink(this);
 			// not running physics though... this is just so we can run weapon stuff
-			WITHSELF(this, PlayerPostThink());
+			PlayerPostThink(this);
 		}
 		this.playerdemo_time = stof(fgets(this.playerdemo_fh));
 		if(this.playerdemo_time == 0)
@@ -160,6 +161,10 @@ float playerdemo_read(entity this)
 		this.playerdemo_time += this.playerdemo_starttime;
 	}
 	this.velocity = '0 0 0';
+	CS(this).movement = '0 0 0';
+	this.dmg_take = 0; // so screen doesn't stay blurry
+	this.dmg_save = 0;
+	this.dmg_inflictor = NULL;
 	time = t;
 	return 1;
 }