X-Git-Url: https://git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fclient%2Fmiscfunctions.qc;h=b37e209a569bbd74faa991ea2b75b35f21bc334a;hb=e0c1470ac5fcae5caeea336e35909475880357df;hp=cc94efb6e40aec290d834e42223431b0b45ae084;hpb=06f163284faddd0c1e8d66e198eba4771e3ea2f8;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/client/miscfunctions.qc b/qcsrc/client/miscfunctions.qc
index cc94efb6e..b37e209a5 100644
--- a/qcsrc/client/miscfunctions.qc
+++ b/qcsrc/client/miscfunctions.qc
@@ -8,7 +8,7 @@ void serverAnnouncer()
 	// check for pending announcement, play it and remove it
 	if(announce_snd != "")
 	{
-		sound(self, CHAN_VOICE, strcat("announcer/", cvar_string("cl_announcer"), "/", announce_snd, ".wav"), VOL_BASEVOICE, ATTN_NONE);
+		sound(world, CHAN_AUTO, strcat("announcer/", cvar_string("cl_announcer"), "/", announce_snd, ".wav"), VOL_BASEVOICE, ATTN_NONE);
 		strunzone(announce_snd);
 		announce_snd = "";
 	}
@@ -22,7 +22,7 @@ void restartAnnouncer_Think() {
 		if (!spectatee_status) //do cprint only for players
 			centerprint("^1Begin!");
 
-		sound(self, CHAN_VOICE, strcat("announcer/", cvar_string("cl_announcer"), "/begin.wav"), VOL_BASEVOICE, ATTN_NONE);
+		sound(world, CHAN_AUTO, strcat("announcer/", cvar_string("cl_announcer"), "/begin.wav"), VOL_BASEVOICE, ATTN_NONE);
 		//reset maptime announcers now as well
 		announcer_5min = announcer_1min = FALSE;
 
@@ -34,7 +34,7 @@ void restartAnnouncer_Think() {
 			centerprint(strcat("^1Game starts in ", ftos(countdown_rounded), " seconds"));
 
 		if(countdown_rounded <= 3 && countdown_rounded >= 1) {
-			sound(self, CHAN_VOICE, strcat("announcer/", cvar_string("cl_announcer"), "/", ftos(countdown_rounded), ".wav"), VOL_BASEVOICE, ATTN_NONE);
+			sound(world, CHAN_AUTO, strcat("announcer/", cvar_string("cl_announcer"), "/", ftos(countdown_rounded), ".wav"), VOL_BASEVOICE, ATTN_NONE);
 		}
 
 		self.nextthink = getstatf(STAT_GAMESTARTTIME) - (countdown - 1);
@@ -72,7 +72,7 @@ void maptimeAnnouncer() {
 			if not (warmuplimit == -1 && warmup_stage) {
 				announcer_5min = TRUE;
 				//dprint("i will play the sound, I promise!\n");
-				sound(self, CHAN_VOICE, strcat("announcer/", cvar_string("cl_announcer"), "/5minutesremain.wav"), VOL_BASEVOICE, ATTN_NONE);
+				sound(world, CHAN_AUTO, strcat("announcer/", cvar_string("cl_announcer"), "/5minutesremain.wav"), VOL_BASEVOICE, ATTN_NONE);
 			}
 	}
 
@@ -87,7 +87,7 @@ void maptimeAnnouncer() {
 			//if we're in warmup mode, check whether there's a warmup timelimit
 			if not (warmuplimit == -1 && warmup_stage) {
 				announcer_1min = TRUE;
-				sound(self, CHAN_VOICE, strcat("announcer/", cvar_string("cl_announcer"), "/1minuteremains.wav"), VOL_BASEVOICE, ATTN_NONE);
+				sound(world, CHAN_AUTO, strcat("announcer/", cvar_string("cl_announcer"), "/1minuteremains.wav"), VOL_BASEVOICE, ATTN_NONE);
 			}
 	}
 }
@@ -460,43 +460,47 @@ void drawpic_tiled(vector pos, string pic, vector sz, vector area, vector color,
 }
 
 // drawpic wrapper to draw an image as large as possible with preserved aspect ratio into a box
-var float imgaspect;
-var float aspect;
+var float _drawpic_imgaspect;
+var float _drawpic_aspect;
+var vector _drawpic_imgsize;
+var vector _drawpic_sz;
+var vector _drawpic_oldsz;
+var string _drawpic_picpath;
 #define drawpic_aspect(pos,pic,mySize,color,alpha,drawflag)\
 	do {\
-		vector imgsize;\
-		imgsize = drawgetimagesize(pic);\
-		imgaspect = imgsize_x/imgsize_y;\
-		vector oldsz, sz;\
-		oldsz = sz = mySize;\
-		aspect = sz_x/sz_y;\
-		if(aspect > imgaspect) {\
-			sz_x = sz_y * imgaspect;\
-			drawpic(pos + eX * (oldsz_x - sz_x) * 0.5, pic, sz, color, alpha, drawflag);\
+		_drawpic_imgsize = drawgetimagesize(pic);\
+		_drawpic_imgaspect = _drawpic_imgsize_x/_drawpic_imgsize_y;\
+		_drawpic_oldsz = _drawpic_sz = mySize;\
+		_drawpic_aspect = _drawpic_sz_x/_drawpic_sz_y;\
+		if(_drawpic_aspect > _drawpic_imgaspect) {\
+			_drawpic_sz_x = _drawpic_sz_y * _drawpic_imgaspect;\
+			drawpic(pos + eX * (_drawpic_oldsz_x - _drawpic_sz_x) * 0.5, pic, _drawpic_sz, color, alpha, drawflag);\
 		} else {\
-			sz_y = sz_x / imgaspect;\
-			drawpic(pos + eY * (oldsz_y - sz_y) * 0.5, pic, sz, color, alpha, drawflag);\
+			_drawpic_sz_y = _drawpic_sz_x / _drawpic_imgaspect;\
+			drawpic(pos + eY * (_drawpic_oldsz_y - _drawpic_sz_y) * 0.5, pic, _drawpic_sz, color, alpha, drawflag);\
 		}\
 	} while(0)
 
 // draw HUD element with image from gfx/hud/hud_skin/foo.tga if it exists, otherwise gfx/hud/default/foo.tga
 #define drawpic_aspect_skin(pos,pic,sz,color,alpha,drawflag)\
 	do{\
-		picpath = strcat(hud_skin_path, "/", pic);\
-		if(precache_pic(picpath) == "") {\
-			picpath = strcat("gfx/hud/default/", pic);\
+		_drawpic_picpath = strcat(hud_skin_path, "/", pic);\
+		if(precache_pic(_drawpic_picpath) == "") {\
+			_drawpic_picpath = strcat("gfx/hud/default/", pic);\
 		}\
-		drawpic_aspect(pos, picpath, sz, color, alpha, drawflag);\
+		drawpic_aspect(pos, _drawpic_picpath, sz, color, alpha, drawflag);\
+		_drawpic_picpath = string_null;\
 	} while(0)
 
 // draw HUD element with image from gfx/hud/hud_skin/foo.tga if it exists, otherwise gfx/hud/default/foo.tga
 #define drawpic_skin(pos,pic,sz,color,alpha,drawflag)\
 	do{\
-		picpath = strcat(hud_skin_path, "/", pic);\
-		if(precache_pic(picpath) == "") {\
-			picpath = strcat("gfx/hud/default/", pic);\
+		_drawpic_picpath = strcat(hud_skin_path, "/", pic);\
+		if(precache_pic(_drawpic_picpath) == "") {\
+			_drawpic_picpath = strcat("gfx/hud/default/", pic);\
 		}\
-		drawpic(pos, picpath, sz, color, alpha, drawflag);\
+		drawpic(pos, _drawpic_picpath, sz, color, alpha, drawflag);\
+		_drawpic_picpath = string_null;\
 	} while(0)
 
 void drawpic_aspect_skin_expanding(vector position, string pic, vector scale, vector rgb, float alpha, float flag, float fadelerp)
@@ -627,26 +631,181 @@ void drawcolorcodedstring_aspect_expanding(vector pos, string text, vector sz, f
 }
 
 // this draws the triangles of a model DIRECTLY. Don't expect high performance, really...
-void PolyDrawModel(entity e)
+float PolyDrawModelSurface(entity e, float i_s)
 {
-	float i_s, i_t;
+	float i_t;
 	float n_t;
 	vector tri;
 	string tex;
+	tex = getsurfacetexture(e, i_s);
+	if not(tex)
+		return 0; // this is beyond the last one
+	n_t = getsurfacenumtriangles(e, i_s);
+	for(i_t = 0; i_t < n_t; ++i_t)
+	{
+		tri = getsurfacetriangle(e, i_s, i_t);
+		R_BeginPolygon(tex, 0);
+		R_PolygonVertex(getsurfacepoint(e, i_s, tri_x), getsurfacepointattribute(e, i_s, tri_x, SPA_TEXCOORDS0), '1 1 1', 1);
+		R_PolygonVertex(getsurfacepoint(e, i_s, tri_y), getsurfacepointattribute(e, i_s, tri_y, SPA_TEXCOORDS0), '1 1 1', 1);
+		R_PolygonVertex(getsurfacepoint(e, i_s, tri_z), getsurfacepointattribute(e, i_s, tri_z, SPA_TEXCOORDS0), '1 1 1', 1);
+		R_EndPolygon();
+	}
+	return 1;
+}
+void PolyDrawModel(entity e)
+{
+	float i_s;
 	for(i_s = 0; ; ++i_s)
+		if(!PolyDrawModelSurface(e, i_s))
+			break;
+}
+
+void DrawCircleClippedPic(vector centre, float radius, string pic, float f, vector rgb, float a, float drawflag)
+{
+	float x, y, q, d;
+	vector ringsize, v, t;
+	ringsize = radius * '1 1 0';
+
+	x = cos(f * 2 * M_PI);
+	y = sin(f * 2 * M_PI);
+	q = fabs(x) + fabs(y);
+	x /= q;
+	y /= q;
+
+	if(f >= 1)
+	{
+		// draw full rectangle
+		R_BeginPolygon(pic, drawflag);
+			v = centre;			t = '0.5 0.5 0';
+			v_x += 0.5 * ringsize_x;	t += '0.5 0.5 0';
+			R_PolygonVertex(v, t, rgb, a);
+
+			v = centre;			t = '0.5 0.5 0';
+			v_y += 0.5 * ringsize_y;	t += '0.5 -0.5 0';
+			R_PolygonVertex(v, t, rgb, a);
+
+			v = centre;			t = '0.5 0.5 0';
+			v_x -= 0.5 * ringsize_x;	t -= '0.5 0.5 0';
+			R_PolygonVertex(v, t, rgb, a);
+
+			v = centre;			t = '0.5 0.5 0';
+			v_y -= 0.5 * ringsize_y;	t -= '0.5 -0.5 0';
+			R_PolygonVertex(v, t, rgb, a);
+		R_EndPolygon();
+
+		d = q - 1;
+		if(d > 0)
+		{
+			R_BeginPolygon(pic, drawflag);
+				v = centre;			t = '0.5 0.5 0';
+				R_PolygonVertex(v, t, rgb, a);
+
+				v = centre;			t = '0.5 0.5 0';
+				v_x += 0.5 * ringsize_x;	t += '0.5 0.5 0';
+				R_PolygonVertex(v, t, rgb, a);
+		}
+	}
+	else if(f > 0.75)
+	{
+		// draw upper and first triangle
+		R_BeginPolygon(pic, drawflag);
+			v = centre;			t = '0.5 0.5 0';
+			v_x += 0.5 * ringsize_x;	t += '0.5 0.5 0';
+			R_PolygonVertex(v, t, rgb, a);
+
+			v = centre;			t = '0.5 0.5 0';
+			v_y += 0.5 * ringsize_y;	t += '0.5 -0.5 0';
+			R_PolygonVertex(v, t, rgb, a);
+
+			v = centre;			t = '0.5 0.5 0';
+			v_x -= 0.5 * ringsize_x;	t -= '0.5 0.5 0';
+			R_PolygonVertex(v, t, rgb, a);
+		R_EndPolygon();
+		R_BeginPolygon(pic, drawflag);
+			v = centre;			t = '0.5 0.5 0';
+			R_PolygonVertex(v, t, rgb, a);
+
+			v = centre;			t = '0.5 0.5 0';
+			v_x -= 0.5 * ringsize_x;	t -= '0.5 0.5 0';
+			R_PolygonVertex(v, t, rgb, a);
+
+			v = centre;			t = '0.5 0.5 0';
+			v_y -= 0.5 * ringsize_y;	t -= '0.5 -0.5 0';
+			R_PolygonVertex(v, t, rgb, a);
+
+		d = q - 0.75;
+		if(d <= 0)
+			R_EndPolygon();
+	}
+	else if(f > 0.5)
 	{
-		tex = getsurfacetexture(e, i_s);
-		if not(tex)
-			break; // this is beyond the last one
-		n_t = getsurfacenumtriangles(e, i_s);
-		for(i_t = 0; i_t < n_t; ++i_t)
+		// draw upper triangle
+		R_BeginPolygon(pic, drawflag);
+			v = centre;			t = '0.5 0.5 0';
+			v_x += 0.5 * ringsize_x;	t += '0.5 0.5 0';
+			R_PolygonVertex(v, t, rgb, a);
+
+			v = centre;			t = '0.5 0.5 0';
+			v_y += 0.5 * ringsize_y;	t += '0.5 -0.5 0';
+			R_PolygonVertex(v, t, rgb, a);
+
+			v = centre;			t = '0.5 0.5 0';
+			v_x -= 0.5 * ringsize_x;	t -= '0.5 0.5 0';
+			R_PolygonVertex(v, t, rgb, a);
+		R_EndPolygon();
+
+		d = q - 0.5;
+		if(d > 0)
 		{
-			tri = getsurfacetriangle(e, i_s, i_t);
-			R_BeginPolygon(tex, 0);
-			R_PolygonVertex(getsurfacepoint(e, i_s, tri_x), getsurfacepointattribute(e, i_s, tri_x, SPA_TEXCOORDS0), '1 1 1', 1);
-			R_PolygonVertex(getsurfacepoint(e, i_s, tri_y), getsurfacepointattribute(e, i_s, tri_y, SPA_TEXCOORDS0), '1 1 1', 1);
-			R_PolygonVertex(getsurfacepoint(e, i_s, tri_z), getsurfacepointattribute(e, i_s, tri_z, SPA_TEXCOORDS0), '1 1 1', 1);
+			R_BeginPolygon(pic, drawflag);
+				v = centre;			t = '0.5 0.5 0';
+				R_PolygonVertex(v, t, rgb, a);
+
+				v = centre;			t = '0.5 0.5 0';
+				v_x -= 0.5 * ringsize_x;	t -= '0.5 0.5 0';
+				R_PolygonVertex(v, t, rgb, a);
+		}
+	}
+	else if(f > 0.25)
+	{
+		// draw first triangle
+		R_BeginPolygon(pic, drawflag);
+			v = centre;			t = '0.5 0.5 0';
+			R_PolygonVertex(v, t, rgb, a);
+
+			v = centre;			t = '0.5 0.5 0';
+			v_x += 0.5 * ringsize_x;	t += '0.5 0.5 0';
+			R_PolygonVertex(v, t, rgb, a);
+
+			v = centre;			t = '0.5 0.5 0';
+			v_y += 0.5 * ringsize_y;	t += '0.5 -0.5 0';
+			R_PolygonVertex(v, t, rgb, a);
+
+		d = q - 0.25;
+		if(d <= 0)
 			R_EndPolygon();
+	}
+	else
+	{
+		d = q;
+		if(d > 0)
+		{
+			R_BeginPolygon(pic, drawflag);
+				v = centre;			t = '0.5 0.5 0';
+				R_PolygonVertex(v, t, rgb, a);
+
+				v = centre;			t = '0.5 0.5 0';
+				v_x += 0.5 * ringsize_x;	t += '0.5 0.5 0';
+				R_PolygonVertex(v, t, rgb, a);
 		}
 	}
+
+	if(d > 0)
+	{
+			v = centre;			t = '0.5 0.5 0';
+			v_x += x * 0.5 * ringsize_x;	t += x * '0.5 0.5 0';
+			v_y += y * 0.5 * ringsize_y;	t += y * '0.5 -0.5 0';
+			R_PolygonVertex(v, t, rgb, a);
+		R_EndPolygon();
+	}
 }