X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fcommon%2Futil.qc;h=52110137253b224511204353637be62d99d7d36c;hb=1a9e7607796f021c85d200ce66bdfb7f3932d882;hp=b322741f29d5a6fd60ed670cd8fff51af58452e4;hpb=201f6309c92217b63dc34daf004fbb7424096eca;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/common/util.qc b/qcsrc/common/util.qc
index b322741f2..521101372 100644
--- a/qcsrc/common/util.qc
+++ b/qcsrc/common/util.qc
@@ -5,19 +5,39 @@
     #include "constants.qh"
 	#include "../client/mutators/events.qh"
     #include "mapinfo.qh"
-    #include "notifications.qh"
-    #include "deathtypes/all.qh"
+    #include "notifications/all.qh"
+    #include <common/deathtypes/all.qh>
 #elif defined(MENUQC)
 #elif defined(SVQC)
     #include "constants.qh"
     #include "../server/autocvars.qh"
     #include "../server/defs.qh"
 	#include "../server/mutators/events.qh"
-    #include "notifications.qh"
-    #include "deathtypes/all.qh"
+    #include "notifications/all.qh"
+    #include <common/deathtypes/all.qh>
     #include "mapinfo.qh"
 #endif
 
+#ifndef MENUQC
+/*
+* Get "real" origin, in worldspace, even if ent is attached to something else.
+*/
+vector real_origin(entity ent)
+{
+	entity e;
+	vector v = ((ent.absmin + ent.absmax) * 0.5);
+
+	e = ent.tag_entity;
+	while(e)
+	{
+		v = v + ((e.absmin + e.absmax) * 0.5);
+		e = e.tag_entity;
+	}
+
+	return v;
+}
+#endif
+
 string wordwrap_buffer;
 
 void wordwrap_buffer_put(string s)
@@ -37,22 +57,25 @@ string wordwrap(string s, float l)
 
 #ifndef MENUQC
 #ifndef CSQC
+entity _wordwrap_buffer_sprint_ent;
 void wordwrap_buffer_sprint(string s)
-{SELFPARAM();
+{
 	wordwrap_buffer = strcat(wordwrap_buffer, s);
 	if(s == "\n")
 	{
-		sprint(self, wordwrap_buffer);
+		sprint(_wordwrap_buffer_sprint_ent, wordwrap_buffer);
 		wordwrap_buffer = "";
 	}
 }
 
-void wordwrap_sprint(string s, float l)
-{SELFPARAM();
+void wordwrap_sprint(entity to, string s, float l)
+{
 	wordwrap_buffer = "";
+	_wordwrap_buffer_sprint_ent = to;
 	wordwrap_cb(s, l, wordwrap_buffer_sprint);
+	_wordwrap_buffer_sprint_ent = NULL;
 	if(wordwrap_buffer != "")
-		sprint(self, strcat(wordwrap_buffer, "\n"));
+		sprint(to, strcat(wordwrap_buffer, "\n"));
 	wordwrap_buffer = "";
 	return;
 }
@@ -564,7 +587,6 @@ void get_mi_min_max_texcoords(float mode)
 float cvar_settemp(string tmp_cvar, string tmp_value)
 {
 	float created_saved_value;
-	entity e;
 
 	created_saved_value = 0;
 
@@ -580,15 +602,16 @@ float cvar_settemp(string tmp_cvar, string tmp_value)
 		return 0;
 	}
 
-	for(e = world; (e = find(e, classname, "saved_cvar_value")); )
-		if(e.netname == tmp_cvar)
-			created_saved_value = -1; // skip creation
+	FOREACH_ENTITY_CLASS("saved_cvar_value", it.netname == tmp_cvar,
+	{
+		created_saved_value = -1; // skip creation
+		break; // no need to continue
+	});
 
 	if(created_saved_value != -1)
 	{
 		// creating a new entity to keep track of this cvar
-		e = new(saved_cvar_value);
-		make_pure(e);
+		entity e = new_pure(saved_cvar_value);
 		e.netname = strzone(tmp_cvar);
 		e.message = strzone(cvar_string(tmp_cvar));
 		created_saved_value = 1;
@@ -600,25 +623,41 @@ float cvar_settemp(string tmp_cvar, string tmp_value)
 	return created_saved_value;
 }
 
-float cvar_settemp_restore()
+int cvar_settemp_restore()
 {
-	float i = 0;
+	int j = 0;
+	// FIXME this new-style loop fails!
+#if 0
+	FOREACH_ENTITY_CLASS("saved_cvar_value", true,
+	{
+		if(cvar_type(it.netname))
+		{
+			cvar_set(it.netname, it.message);
+			strunzone(it.netname);
+			strunzone(it.message);
+			remove(it);
+			++j;
+		}
+		else
+			LOG_INFOF("Error: cvar %s doesn't exist anymore! It can still be restored once it's manually recreated.\n", it.netname);
+	});
+
+#else
 	entity e = world;
 	while((e = find(e, classname, "saved_cvar_value")))
 	{
 		if(cvar_type(e.netname))
 		{
 			cvar_set(e.netname, e.message);
-			strunzone(e.netname);
-			strunzone(e.message);
 			remove(e);
-			++i;
+			++j;
 		}
 		else
-			LOG_INFOF("Error: cvar %s doesn't exist anymore! It can still be restored once it's manually recreated.\n", e.netname);
+			print(sprintf("Error: cvar %s doesn't exist anymore! It can still be restored once it's manually recreated.\n", e.netname));
 	}
+#endif
 
-	return i;
+	return j;
 }
 
 float textLengthUpToWidth(string theText, float maxWidth, vector theSize, textLengthUpToWidth_widthFunction_t w)
@@ -1431,31 +1470,24 @@ vector animfixfps(entity e, vector a, vector b)
 	// multi-frame anim: keep as-is
 	if(a.y == 1)
 	{
-		float dur;
-		dur = frameduration(e.modelindex, a.x);
-		if(dur <= 0 && b.y)
+		float dur = frameduration(e.modelindex, a.x);
+		if (dur <= 0 && b.y)
 		{
 			a = b;
 			dur = frameduration(e.modelindex, a.x);
 		}
-		if(dur > 0)
+		if (dur > 0)
 			a.z = 1.0 / dur;
 	}
 	return a;
 }
 #endif
 
-#ifdef SVQC
-void dedicated_print(string input) // print(), but only print if the server is not local
-{
-	if(server_is_dedicated) { LOG_INFO(input); }
-}
-#endif
-
 #ifndef MENUQC
-float Announcer_PickNumber(float type, float num)
+Notification Announcer_PickNumber(int type, int num)
 {
-	switch(type)
+    return = NULL;
+	switch (type)
 	{
 		case CNT_GAMESTART:
 		{
@@ -1560,7 +1592,6 @@ float Announcer_PickNumber(float type, float num)
 			break;
 		}
 	}
-	return NOTIF_ABORT; // abort sending if none of these numbers were right
 }
 #endif