X-Git-Url: https://de.git.xonotic.org/?a=blobdiff_plain;ds=sidebyside;f=qcsrc%2Fserver%2Fplayerdemo.qc;h=082356ae2d86084f2b8ad8d6ffe624f9e9a43936;hb=5e504bae6cfc01a24dd6dc2e673a35d80c8a1759;hp=c2e812c2c10e6463e49ec2cee4185c23fce5d8b3;hpb=9eb82dd6fc682e3ddecd471835f9047816236342;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/server/playerdemo.qc b/qcsrc/server/playerdemo.qc
index c2e812c2c..082356ae2 100644
--- a/qcsrc/server/playerdemo.qc
+++ b/qcsrc/server/playerdemo.qc
@@ -1,8 +1,6 @@
 #if defined(CSQC)
 #elif defined(MENUQC)
 #elif defined(SVQC)
-	#include "../dpdefs/progsdefs.qh"
-    #include "../dpdefs/dpextensions.qh"
     #include "defs.qh"
     #include "playerdemo.qh"
 #endif
@@ -15,20 +13,20 @@ const float PLAYERDEMO_MODE_OFF = 0;
 const float PLAYERDEMO_MODE_READING = 1;
 const float PLAYERDEMO_MODE_WRITING = 2;
 void playerdemo_init()
-{
+{SELFPARAM();
 	self.playerdemo_mode = PLAYERDEMO_MODE_OFF;
 }
 void playerdemo_shutdown()
-{
+{SELFPARAM();
 	if(self.playerdemo_mode != PLAYERDEMO_MODE_OFF)
 	{
-		print("playerdemo: ", self.netname, " closed\n");
+		LOG_INFO("playerdemo: ", self.netname, " closed\n");
 		fclose(self.playerdemo_fh);
 	}
 	self.playerdemo_mode = 0;
 }
 void playerdemo_open_read(string f)
-{
+{SELFPARAM();
 	playerdemo_shutdown();
 	self.playerdemo_mode = PLAYERDEMO_MODE_READING;
 	self.playerdemo_fh = fopen(f, FILE_READ);
@@ -36,16 +34,16 @@ void playerdemo_open_read(string f)
 	self.playerdemo_time = stof(fgets(self.playerdemo_fh));
 	self.playerdemo_time += self.playerdemo_starttime;
 	self.movetype = MOVETYPE_NONE;
-	print("playerdemo: ", self.netname, " reading from ", f, "\n");
+	LOG_INFO("playerdemo: ", self.netname, " reading from ", f, "\n");
 }
 void playerdemo_open_write(string f)
-{
+{SELFPARAM();
 	playerdemo_shutdown();
 	self.playerdemo_mode = PLAYERDEMO_MODE_WRITING;
 	self.playerdemo_fh = fopen(f, FILE_WRITE);
 	self.playerdemo_starttime = time - 1;
-	print("playerdemo: ", self.netname, " writing to ", f, "\n");
-	print("WARNING: playerdemo file format is incomplete and not stable yet. DO NOT RELY ON IT!\n");
+	LOG_INFO("playerdemo: ", self.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) \
@@ -70,51 +68,51 @@ void playerdemo_open_write(string f)
 	// end of list
 
 void playerdemo_write_originvector(.vector f, string name)
-{
+{SELFPARAM();
 	fputs(self.playerdemo_fh, strcat(vtos(self.(f)), "\n"));
 }
 void playerdemo_write_sizevector(.vector f, string name)
-{
+{SELFPARAM();
 	fputs(self.playerdemo_fh, strcat(vtos(self.(f)), "\n"));
 }
 void playerdemo_write_vector(.vector f, string name)
-{
+{SELFPARAM();
 	fputs(self.playerdemo_fh, strcat(vtos(self.(f)), "\n"));
 }
 void playerdemo_write_string(.string f, string name)
-{
+{SELFPARAM();
 	fputs(self.playerdemo_fh, strcat(self.(f), "\n"));
 }
 void playerdemo_write_modelstring(.string f, string name)
-{
+{SELFPARAM();
 	fputs(self.playerdemo_fh, strcat(self.(f), "\n"));
 }
 void playerdemo_write_float(.float f, string name)
-{
+{SELFPARAM();
 	fputs(self.playerdemo_fh, strcat(ftos(self.(f)), "\n"));
 }
 void playerdemo_write()
-{
+{SELFPARAM();
 	if(self.playerdemo_mode != PLAYERDEMO_MODE_WRITING)
 		return;
 	fputs(self.playerdemo_fh, strcat(ftos(time - self.playerdemo_starttime), "\n"));
 	PLAYERDEMO_FIELDS(playerdemo_write_)
 }
 void playerdemo_read_originvector(.vector f, string name)
-{
+{SELFPARAM();
 	setorigin(self, stov(fgets(self.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_vector(.vector f, string name)
-{
+{SELFPARAM();
 	self.(f) = stov(fgets(self.playerdemo_fh));
 }
 void playerdemo_read_string(.string f, string name)
-{
+{SELFPARAM();
 	string s = fgets(self.playerdemo_fh);
 	if (s != self.(f))
 	{
@@ -126,17 +124,17 @@ void playerdemo_read_string(.string f, string name)
 	}
 }
 void playerdemo_read_modelstring(.string f, string name)
-{
+{SELFPARAM();
 	string s = fgets(self.playerdemo_fh);
 	if (s != self.(f))
-		setmodel(self, s);
+		_setmodel(self, s);
 }
 void playerdemo_read_float(.float f, string name)
-{
+{SELFPARAM();
 	self.(f) = stof(fgets(self.playerdemo_fh));
 }
 float playerdemo_read()
-{
+{SELFPARAM();
 	if(self.playerdemo_mode != PLAYERDEMO_MODE_READING)
 		return 0;
 	if(self.playerdemo_time < 0)