X-Git-Url: https://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fserver%2Fplayerdemo.qc;h=e337e9be478c8112ced3a6bbc55aae446a9dbd0c;hb=af376cc21c7130e4d62257778b6f08fb03056120;hp=9bc0855f5b3c38c82ec67375925c141ad82962a8;hpb=eb8e19d4e9f403c7bf7b694a92b42dbbd06edab0;p=xonotic%2Fxonotic-data.pk3dir.git diff --git a/qcsrc/server/playerdemo.qc b/qcsrc/server/playerdemo.qc index 9bc0855f5..e337e9be4 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 #endif .float playerdemo_fh; @@ -34,7 +35,7 @@ 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; + set_movetype(this, MOVETYPE_NONE); LOG_INFO("playerdemo: ", this.netname, " reading from ", f, "\n"); } void playerdemo_open_write(entity this, string f) @@ -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 @@ -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; }