X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fclient%2Fmiscfunctions.qc;h=7301fbf0bbf2922fa30b14f83c487e770239da5e;hb=6f4349956b11b36ba20e65e34d39b5029a5eb3ac;hp=41ecb91efa915673aff7313c425b5c02af0c5b55;hpb=86e3c512563df079ecf44bc2e4d118f3caa7ea41;p=xonotic%2Fxonotic-data.pk3dir.git diff --git a/qcsrc/client/miscfunctions.qc b/qcsrc/client/miscfunctions.qc index 41ecb91ef..7301fbf0b 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(world, CHAN_AUTO, strcat("announcer/", autocvar_cl_announcer, "/", announce_snd, ".wav"), VOL_BASEVOICE, ATTN_NONE); + sound(world, CH_INFO, strcat("announcer/", autocvar_cl_announcer, "/", announce_snd, ".wav"), VOL_BASEVOICE, ATTN_NONE); strunzone(announce_snd); announce_snd = ""; } @@ -20,9 +20,9 @@ void restartAnnouncer_Think() { countdown_rounded = floor(0.5 + countdown); if(countdown <= 0) { if (!spectatee_status) //do cprint only for players - centerprint(_("^1Begin!")); + centerprint_generic(CPID_GAME_STARTING, _("^1Begin!"), 1, 0); - sound(world, CHAN_AUTO, strcat("announcer/", autocvar_cl_announcer, "/begin.wav"), VOL_BASEVOICE, ATTN_NONE); + sound(world, CH_INFO, strcat("announcer/", autocvar_cl_announcer, "/begin.wav"), VOL_BASEVOICE, ATTN_NONE); //reset maptime announcers now as well announcer_5min = announcer_1min = FALSE; @@ -31,10 +31,10 @@ void restartAnnouncer_Think() { } else { if (!spectatee_status) //do cprint only for players - centerprint(sprintf(_("^1Game starts in %d seconds"), countdown_rounded)); + centerprint_generic(CPID_GAME_STARTING, _("^1Game starts in %d seconds"), 1, countdown_rounded); if(countdown_rounded <= 3 && countdown_rounded >= 1) { - sound(world, CHAN_AUTO, strcat("announcer/", autocvar_cl_announcer, "/", ftos(countdown_rounded), ".wav"), VOL_BASEVOICE, ATTN_NONE); + sound(world, CH_INFO, strcat("announcer/", autocvar_cl_announcer, "/", ftos(countdown_rounded), ".wav"), VOL_BASEVOICE, ATTN_NONE); } self.nextthink = getstatf(STAT_GAMESTARTTIME) - (countdown - 1); @@ -71,7 +71,7 @@ void maptimeAnnouncer() { //if we're in warmup mode, check whether there's a warmup timelimit if not (warmuplimit == -1 && warmup_stage) { announcer_5min = TRUE; - sound(world, CHAN_AUTO, strcat("announcer/", autocvar_cl_announcer, "/5minutesremain.wav"), VOL_BASEVOICE, ATTN_NONE); + sound(world, CH_INFO, strcat("announcer/", autocvar_cl_announcer, "/5minutesremain.wav"), VOL_BASEVOICE, ATTN_NONE); } } @@ -86,7 +86,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(world, CHAN_AUTO, strcat("announcer/", autocvar_cl_announcer, "/1minuteremains.wav"), VOL_BASEVOICE, ATTN_NONE); + sound(world, CH_INFO, strcat("announcer/", autocvar_cl_announcer, "/1minuteremains.wav"), VOL_BASEVOICE, ATTN_NONE); } } } @@ -319,40 +319,14 @@ vector HUD_GetFontsize(string cvarname) float PreviewExists(string name) { - float f; - string file; - if(autocvar_cl_readpicture_force) return false; - file = strcat(name, ".tga"); - f = fopen(file, FILE_READ); - if(f >= 0) - { - fclose(f); - return true; - } - file = strcat(name, ".png"); - f = fopen(file, FILE_READ); - if(f >= 0) - { - fclose(f); - return true; - } - file = strcat(name, ".jpg"); - f = fopen(file, FILE_READ); - if(f >= 0) - { - fclose(f); - return true; - } - file = strcat(name, ".pcx"); - f = fopen(file, FILE_READ); - if(f >= 0) - { - fclose(f); - return true; - } + if (fexists(strcat(name, ".tga"))) return true; + if (fexists(strcat(name, ".png"))) return true; + if (fexists(strcat(name, ".jpg"))) return true; + if (fexists(strcat(name, ".pcx"))) return true; + return false; } @@ -375,6 +349,33 @@ string ColorTranslateRGB(string s) return s; } +string Team_ColorCode(float teamid) +{ + if (teamid == COLOR_TEAM1) + return "^1"; + else if (teamid == COLOR_TEAM2) + return "^4"; + else if (teamid == COLOR_TEAM3) + return "^3"; + else if (teamid == COLOR_TEAM4) + return "^6"; + else + return "^7"; +} + +// decolorizes and team colors the player name when needed +string playername(string thename, float teamid) +{ + string t; + if (teamplay) + { + t = Team_ColorCode(teamid); + return strcat(t, strdecolorize(thename)); + } + else + return strdecolorize(thename); +} + float cvar_or(string cv, float v) { string s; @@ -454,23 +455,23 @@ 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 _drawpic_imgaspect; -var float _drawpic_aspect; var vector _drawpic_imgsize; var vector _drawpic_sz; -var vector _drawpic_oldsz; +var float _drawpic_oldsz; var string _drawpic_picpath; #define drawpic_aspect(pos,pic,mySize,color,alpha,drawflag)\ do {\ _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 = mySize;\ + if(_drawpic_sz_x/_drawpic_sz_y > _drawpic_imgaspect) {\ + _drawpic_oldsz = _drawpic_sz_x;\ _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);\ + drawpic(pos + eX * (_drawpic_oldsz - _drawpic_sz_x) * 0.5, pic, _drawpic_sz, color, alpha, drawflag);\ } else {\ + _drawpic_oldsz = _drawpic_sz_y;\ _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);\ + drawpic(pos + eY * (_drawpic_oldsz - _drawpic_sz_y) * 0.5, pic, _drawpic_sz, color, alpha, drawflag);\ }\ } while(0) @@ -509,49 +510,29 @@ void drawpic_aspect_skin_expanding_two(vector position, string pic, vector scale drawpic_aspect_skin_expanding(position, pic, scale, rgb, alpha, flag, fadelerp); drawpic_skin(position, pic, scale, rgb, alpha * fadelerp, flag); } +#define SET_POS_AND_SZ_Y_ASPECT(allow_colors)\ + float textaspect, oldsz;\ + textaspect = stringwidth(text, allow_colors, '1 1 1' * sz_y) / sz_y;\ + if(sz_x/sz_y > textaspect) {\ + oldsz = sz_x;\ + sz_x = sz_y * textaspect;\ + pos_x += (oldsz - sz_x) * 0.5;\ + } else {\ + oldsz = sz_y;\ + sz_y = sz_x / textaspect; \ + pos_y += (oldsz - sz_y) * 0.5;\ + } // drawstring wrapper to draw a string as large as possible with preserved aspect ratio into a box void drawstring_aspect(vector pos, string text, vector sz, vector color, float alpha, float drawflag) { - vector textsize; - textsize = eX * stringwidth(text, FALSE, '1 1 1' * sz_y) + eY * sz_y; - - float textaspect; - textaspect = textsize_x/textsize_y; - - vector oldsz; - oldsz = sz; - float aspect; - aspect = sz_x/sz_y; - - if(aspect > textaspect) { - sz_x = sz_y * textaspect; - drawstring(pos + eX * (oldsz_x - sz_x) * 0.5, text, '1 1 0' * sz_y, color, alpha, drawflag); - } else { - sz_y = sz_x / textaspect; - drawstring(pos + eY * (oldsz_y - sz_y) * 0.5, text, '1 1 0' * sz_y, color, alpha, drawflag); - } + SET_POS_AND_SZ_Y_ASPECT(FALSE) + drawstring(pos, text, '1 1 0' * sz_y, color, alpha, drawflag); } // drawstring wrapper to draw a colorcodedstring as large as possible with preserved aspect ratio into a box void drawcolorcodedstring_aspect(vector pos, string text, vector sz, float alpha, float drawflag) { - vector textsize; - textsize = eX * stringwidth(text, TRUE, '1 1 1' * sz_y) + eY * sz_y; - - float textaspect; - textaspect = textsize_x/textsize_y; - - vector oldsz; - oldsz = sz; - float aspect; - aspect = sz_x/sz_y; - - if(aspect > textaspect) { - sz_x = sz_y * textaspect; - drawcolorcodedstring(pos + eX * (oldsz_x - sz_x) * 0.5, text, '1 1 0' * sz_y, alpha, drawflag); - } else { - sz_y = sz_x / textaspect; - drawcolorcodedstring(pos + eY * (oldsz_y - sz_y) * 0.5, text, '1 1 0' * sz_y, alpha, drawflag); - } + SET_POS_AND_SZ_Y_ASPECT(TRUE) + drawcolorcodedstring(pos, text, '1 1 0' * sz_y, alpha, drawflag); } vector drawfontscale; @@ -571,24 +552,8 @@ void drawstring_expanding(vector position, string text, vector scale, vector rgb // drawstring wrapper to draw a string as large as possible with preserved aspect ratio into a box void drawstring_aspect_expanding(vector pos, string text, vector sz, vector color, float alpha, float drawflag, float fadelerp) { - vector textsize; - textsize = eX * stringwidth(text, FALSE, '1 1 1' * sz_y) + eY * sz_y; - - float textaspect; - textaspect = textsize_x/textsize_y; - - vector oldsz; - oldsz = sz; - float aspect; - aspect = sz_x/sz_y; - - if(aspect > textaspect) { - sz_x = sz_y * textaspect; - drawstring_expanding(pos + eX * (oldsz_x - sz_x) * 0.5, text, '1 1 0' * sz_y, color, alpha, drawflag, fadelerp); - } else { - sz_y = sz_x / textaspect; - drawstring_expanding(pos + eY * (oldsz_y - sz_y) * 0.5, text, '1 1 0' * sz_y, color, alpha, drawflag, fadelerp); - } + SET_POS_AND_SZ_Y_ASPECT(FALSE) + drawstring_expanding(pos, text, '1 1 0' * sz_y, color, alpha, drawflag, fadelerp); } void drawcolorcodedstring_expanding(vector position, string text, vector scale, float alpha, float flag, float fadelerp) @@ -603,24 +568,8 @@ void drawcolorcodedstring_expanding(vector position, string text, vector scale, } void drawcolorcodedstring_aspect_expanding(vector pos, string text, vector sz, float alpha, float drawflag, float fadelerp) { - vector textsize; - textsize = eX * stringwidth(text, TRUE, '1 1 1' * sz_y) + eY * sz_y; - - float textaspect; - textaspect = textsize_x/textsize_y; - - vector oldsz; - oldsz = sz; - float aspect; - aspect = sz_x/sz_y; - - if(aspect > textaspect) { - sz_x = sz_y * textaspect; - drawcolorcodedstring_expanding(pos + eX * (oldsz_x - sz_x) * 0.5, text, '1 1 0' * sz_y, alpha, drawflag, fadelerp); - } else { - sz_y = sz_x / textaspect; - drawcolorcodedstring_expanding(pos + eY * (oldsz_y - sz_y) * 0.5, text, '1 1 0' * sz_y, alpha, drawflag, fadelerp); - } + SET_POS_AND_SZ_Y_ASPECT(TRUE) + drawcolorcodedstring_expanding(pos, text, '1 1 0' * sz_y, alpha, drawflag, fadelerp); } // this draws the triangles of a model DIRECTLY. Don't expect high performance, really... @@ -802,3 +751,20 @@ void DrawCircleClippedPic(vector centre, float radius, string pic, float f, vect R_EndPolygon(); } } + +const vector GETPLAYERORIGIN_ERROR = '1123581321 2357111317 3141592653'; // way out of bounds for anything on the map +vector getplayerorigin(float pl) +{ + string s; + entity e; + + s = getplayerkey(pl, "TEMPHACK_origin"); + if(s != "") + return stov(s); + + e = entcs_receiver[pl]; + if(e) + return e.origin; + + return GETPLAYERORIGIN_ERROR; +}