Purge self from playerdemo.qc

diff --git a/qcsrc/server/cl_client.qc b/qcsrc/server/cl_client.qc
index ad9a1ec542cc085844f77e1905f337da70f29a59..4837c46d9c70c0e3baf5c2c6615851daaa39d679 100644 (file)
--- a/qcsrc/server/cl_client.qc
+++ b/qcsrc/server/cl_client.qc
@@ -2470,7 +2470,7 @@ void PlayerPostThink ()
                WaypointSprite_UpdateHealth(this.waypointsprite_attachedforcarrier, '1 0 0' * v);
     }
 
-       playerdemo_write();
+       playerdemo_write(this);
 
        CSQCMODEL_AUTOUPDATE(this);
 }

diff --git a/qcsrc/server/playerdemo.qc b/qcsrc/server/playerdemo.qc
index 3a01cb0756d93fbae542494e99e49948d6677783..61104ebe2fa1a1420d01a20f035ce4ef3fa2b891 100644 (file)
--- a/qcsrc/server/playerdemo.qc
+++ b/qcsrc/server/playerdemo.qc
@@ -46,93 +46,93 @@ void playerdemo_open_write(entity this, string f)
        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");
 }
-#define PLAYERDEMO_FIELD(func,t,f) func##t(f,#f);
-#define PLAYERDEMO_FIELDS(func) \
-       PLAYERDEMO_FIELD(func,originvector,origin) \
-       PLAYERDEMO_FIELD(func,vector,angles) \
-       PLAYERDEMO_FIELD(func,sizevector,mins) \
-       PLAYERDEMO_FIELD(func,sizevector,maxs) \
-       PLAYERDEMO_FIELD(func,vector,v_angle) \
-       PLAYERDEMO_FIELD(func,modelstring,model) \
-       PLAYERDEMO_FIELD(func,string,playermodel) \
-       PLAYERDEMO_FIELD(func,float,skin) \
-       PLAYERDEMO_FIELD(func,string,playerskin) \
-       PLAYERDEMO_FIELD(func,float,frame) \
-       PLAYERDEMO_FIELD(func,float,effects) \
-       /* PLAYERDEMO_FIELD(func,float,switchweapon) */ \
-       PLAYERDEMO_FIELD(func,float,button0) /* TODO: PHYS_INPUT_BUTTON_ATCK */ \
-       PLAYERDEMO_FIELD(func,float,button3) /* TODO: PHYS_INPUT_BUTTON_ATCK2 */ \
-       PLAYERDEMO_FIELD(func,float,button5) /* TODO: PHYS_INPUT_BUTTON_CROUCH */ \
-       PLAYERDEMO_FIELD(func,float,button6) /* TODO: PHYS_INPUT_BUTTON_HOOK */ \
-       PLAYERDEMO_FIELD(func,float,buttonuse) /* TODO: PHYS_INPUT_BUTTON_USE */ \
-       PLAYERDEMO_FIELD(func,float,flags) \
+#define PLAYERDEMO_FIELD(ent,func,t,f) func##t(ent,f,#f);
+#define PLAYERDEMO_FIELDS(ent,func) \
+       PLAYERDEMO_FIELD(ent,func,originvector,origin) \
+       PLAYERDEMO_FIELD(ent,func,vector,angles) \
+       PLAYERDEMO_FIELD(ent,func,sizevector,mins) \
+       PLAYERDEMO_FIELD(ent,func,sizevector,maxs) \
+       PLAYERDEMO_FIELD(ent,func,vector,v_angle) \
+       PLAYERDEMO_FIELD(ent,func,modelstring,model) \
+       PLAYERDEMO_FIELD(ent,func,string,playermodel) \
+       PLAYERDEMO_FIELD(ent,func,float,skin) \
+       PLAYERDEMO_FIELD(ent,func,string,playerskin) \
+       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(ent,func,float,flags) \
        // end of list
 
-void playerdemo_write_originvector(.vector f, string name)
-{SELFPARAM();
-       fputs(self.playerdemo_fh, strcat(vtos(self.(f)), "\n"));
+void playerdemo_write_originvector(entity this, .vector f, string name)
+{
+       fputs(this.playerdemo_fh, strcat(vtos(this.(f)), "\n"));
 }
-void playerdemo_write_sizevector(.vector f, string name)
-{SELFPARAM();
-       fputs(self.playerdemo_fh, strcat(vtos(self.(f)), "\n"));
+void playerdemo_write_sizevector(entity this, .vector f, string name)
+{
+       fputs(this.playerdemo_fh, strcat(vtos(this.(f)), "\n"));
 }
-void playerdemo_write_vector(.vector f, string name)
-{SELFPARAM();
-       fputs(self.playerdemo_fh, strcat(vtos(self.(f)), "\n"));
+void playerdemo_write_vector(entity this, .vector f, string name)
+{
+       fputs(this.playerdemo_fh, strcat(vtos(this.(f)), "\n"));
 }
-void playerdemo_write_string(.string f, string name)
-{SELFPARAM();
-       fputs(self.playerdemo_fh, strcat(self.(f), "\n"));
+void playerdemo_write_string(entity this, .string f, string name)
+{
+       fputs(this.playerdemo_fh, strcat(this.(f), "\n"));
 }
-void playerdemo_write_modelstring(.string f, string name)
-{SELFPARAM();
-       fputs(self.playerdemo_fh, strcat(self.(f), "\n"));
+void playerdemo_write_modelstring(entity this, .string f, string name)
+{
+       fputs(this.playerdemo_fh, strcat(this.(f), "\n"));
 }
-void playerdemo_write_float(.float f, string name)
-{SELFPARAM();
-       fputs(self.playerdemo_fh, strcat(ftos(self.(f)), "\n"));
+void playerdemo_write_float(entity this, .float f, string name)
+{
+       fputs(this.playerdemo_fh, strcat(ftos(this.(f)), "\n"));
 }
-void playerdemo_write()
-{SELFPARAM();
+void playerdemo_write(entity this)
+{
        if(this.playerdemo_mode != PLAYERDEMO_MODE_WRITING)
                return;
        fputs(this.playerdemo_fh, strcat(ftos(time - this.playerdemo_starttime), "\n"));
-       PLAYERDEMO_FIELDS(playerdemo_write_)
+       PLAYERDEMO_FIELDS(this, playerdemo_write_)
 }
-void playerdemo_read_originvector(.vector f, string name)
-{SELFPARAM();
-       setorigin(self, stov(fgets(self.playerdemo_fh)));
+void playerdemo_read_originvector(entity this, .vector f, string name)
+{
+       setorigin(this, stov(fgets(this.playerdemo_fh)));
 }
-void playerdemo_read_sizevector(.vector f, string name)
-{SELFPARAM();
-       self.(f) = stov(fgets(self.playerdemo_fh));
-       setsize(self, self.mins, self.maxs);
+void playerdemo_read_sizevector(entity this, .vector f, string name)
+{
+       this.(f) = stov(fgets(this.playerdemo_fh));
+       setsize(this, this.mins, this.maxs);
 }
-void playerdemo_read_vector(.vector f, string name)
-{SELFPARAM();
-       self.(f) = stov(fgets(self.playerdemo_fh));
+void playerdemo_read_vector(entity this, .vector f, string name)
+{
+       this.(f) = stov(fgets(this.playerdemo_fh));
 }
-void playerdemo_read_string(.string f, string name)
-{SELFPARAM();
-       string s = fgets(self.playerdemo_fh);
-       if (s != self.(f))
+void playerdemo_read_string(entity this, .string f, string name)
+{
+       string s = fgets(this.playerdemo_fh);
+       if (s != this.(f))
        {
                /*
-               if(self.f)
-                       strunzone(self.f);
+               if(this.f)
+                       strunzone(this.f);
                */
-               self.(f) = strzone(s);
+               this.(f) = strzone(s);
        }
 }
-void playerdemo_read_modelstring(.string f, string name)
-{SELFPARAM();
-       string s = fgets(self.playerdemo_fh);
-       if (s != self.(f))
-               _setmodel(self, s);
+void playerdemo_read_modelstring(entity this, .string f, string name)
+{
+       string s = fgets(this.playerdemo_fh);
+       if (s != this.(f))
+               _setmodel(this, s);
 }
-void playerdemo_read_float(.float f, string name)
-{SELFPARAM();
-       self.(f) = stof(fgets(self.playerdemo_fh));
+void playerdemo_read_float(entity this, .float f, string name)
+{
+       this.(f) = stof(fgets(this.playerdemo_fh));
 }
 float playerdemo_read(entity this)
 {
@@ -144,7 +144,7 @@ float playerdemo_read(entity this)
        t = time;
        while(time >= this.playerdemo_time)
        {
-               PLAYERDEMO_FIELDS(playerdemo_read_)
+               PLAYERDEMO_FIELDS(this, playerdemo_read_)
                {
                        time = this.playerdemo_time;
                        WITHSELF(this, PlayerPreThink());

diff --git a/qcsrc/server/playerdemo.qh b/qcsrc/server/playerdemo.qh
index c44f414f97e18e39a6e32575c444f113b00150bd..c2da2bc6f02f4305d7528cc9b9aca9b2faa2ff11 100644 (file)
--- a/qcsrc/server/playerdemo.qh
+++ b/qcsrc/server/playerdemo.qh
@@ -2,7 +2,7 @@
 
 void playerdemo_init(entity this);
 void playerdemo_shutdown(entity this);
-void playerdemo_write();
+void playerdemo_write(entity this);
 float playerdemo_read(entity this);
 
 void playerdemo_open_read(entity this, string f);