X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fclient%2Fmiscfunctions.qc;h=d74a24a320142d35e7da242c19f24586ca1e08fe;hb=475464cd15239448e76060298062f8247d8c2f38;hp=fcc248220d4af90ecdb4ad3131f66151e931d6c5;hpb=83e2b5d506f912b9c79f7f6dc8e295f9b3f96e49;p=xonotic%2Fxonotic-data.pk3dir.git diff --git a/qcsrc/client/miscfunctions.qc b/qcsrc/client/miscfunctions.qc index fcc248220..d74a24a32 100644 --- a/qcsrc/client/miscfunctions.qc +++ b/qcsrc/client/miscfunctions.qc @@ -1,6 +1,8 @@ -entity players; -entity teams; -float team_count; // real teams +#include "miscfunctions.qh" + +#include "../common/urllib.qh" + +#include "../common/command/generic.qh" void AuditLists() { @@ -111,14 +113,12 @@ void RemoveTeam(entity Team) entity GetTeam(int Team, bool add) { - float num; - entity tm; - num = (Team == NUM_SPECTATOR) ? 16 : Team; + int num = (Team == NUM_SPECTATOR) ? 16 : Team; if(teamslots[num]) return teamslots[num]; if (!add) return world; - tm = spawn(); + entity tm = spawn(); tm.team = Team; teamslots[num] = tm; RegisterTeam(tm); @@ -129,11 +129,11 @@ vector HUD_GetFontsize(string cvarname) { vector v; v = stov(cvar_string(cvarname)); - if(v_x == 0) + if(v.x == 0) v = '8 8 0'; - if(v_y == 0) - v_y = v.x; - v_z = 0; + if(v.y == 0) + v.y = v.x; + v.z = 0; return v; } @@ -154,13 +154,11 @@ vector rotate(vector v, float a) { vector w = '0 0 0'; // FTEQCC SUCKS AGAIN - w_x = v.x * cos(a) + v.y * sin(a); - w_y = -1 * v.x * sin(a) + v.y * cos(a); + w.x = v.x * cos(a) + v.y * sin(a); + w.y = -1 * v.x * sin(a) + v.y * cos(a); return w; } -int ColorTranslateMode; - string ColorTranslateRGB(string s) { if(ColorTranslateMode & 1) @@ -224,15 +222,15 @@ void drawborderlines(float thickness, vector pos, vector dim, vector color, floa // left and right lines pos.x -= thickness; - line_dim_x = thickness; - line_dim_y = dim.y; + line_dim.x = thickness; + line_dim.y = dim.y; drawfill(pos, line_dim, color, theAlpha, drawflag); drawfill(pos + (dim.x + thickness) * '1 0 0', line_dim, color, theAlpha, drawflag); // upper and lower lines pos.y -= thickness; - line_dim_x = dim.x + thickness * 2; // make upper and lower lines longer - line_dim_y = thickness; + line_dim.x = dim.x + thickness * 2; // make upper and lower lines longer + line_dim.y = thickness; drawfill(pos, line_dim, color, theAlpha, drawflag); drawfill(pos + (dim.y + thickness) * '0 1 0', line_dim, color, theAlpha, drawflag); } @@ -242,16 +240,16 @@ void drawpic_tiled(vector pos, string pic, vector sz, vector area, vector color, vector current_pos = '0 0 0', end_pos, new_size = '0 0 0', ratio = '0 0 0'; end_pos = pos + area; - current_pos_y = pos.y; + current_pos.y = pos.y; while (current_pos.y < end_pos.y) { - current_pos_x = pos.x; + current_pos.x = pos.x; while (current_pos.x < end_pos.x) { - new_size_x = min(sz.x, end_pos.x - current_pos.x); - new_size_y = min(sz.y, end_pos.y - current_pos.y); - ratio_x = new_size.x / sz.x; - ratio_y = new_size.y / sz.y; + new_size.x = min(sz.x, end_pos.x - current_pos.x); + new_size.y = min(sz.y, end_pos.y - current_pos.y); + ratio.x = new_size.x / sz.x; + ratio.y = new_size.y / sz.y; drawsubpic(current_pos, new_size, pic, '0 0 0', ratio, color, theAlpha, drawflag); current_pos.x += sz.x; } @@ -259,54 +257,6 @@ 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 -float _drawpic_imgaspect; -vector _drawpic_imgsize; -vector _drawpic_sz; -float _drawpic_oldsz; -string _drawpic_picpath; -#define drawpic_aspect(pos,pic,mySize,color,theAlpha,drawflag)\ - do {\ - _drawpic_imgsize = draw_getimagesize(pic);\ - if(_drawpic_imgsize != '0 0 0') {\ - _drawpic_imgaspect = _drawpic_imgsize.x/_drawpic_imgsize.y;\ - _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;\ - if(_drawpic_sz.x)\ - drawpic(pos + eX * (_drawpic_oldsz - _drawpic_sz.x) * 0.5, pic, _drawpic_sz, color, theAlpha, drawflag);\ - } else {\ - _drawpic_oldsz = _drawpic_sz.y;\ - _drawpic_sz_y = _drawpic_sz.x / _drawpic_imgaspect;\ - if(_drawpic_sz.y)\ - drawpic(pos + eY * (_drawpic_oldsz - _drawpic_sz.y) * 0.5, pic, _drawpic_sz, color, theAlpha, 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,theAlpha,drawflag)\ - do{\ - _drawpic_picpath = strcat(hud_skin_path, "/", pic);\ - if(precache_pic(_drawpic_picpath) == "") {\ - _drawpic_picpath = strcat("gfx/hud/default/", pic);\ - }\ - drawpic_aspect(pos, _drawpic_picpath, sz, color, theAlpha, 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,theAlpha,drawflag)\ - do{\ - _drawpic_picpath = strcat(hud_skin_path, "/", pic);\ - if(precache_pic(_drawpic_picpath) == "") {\ - _drawpic_picpath = strcat("gfx/hud/default/", pic);\ - }\ - drawpic(pos, _drawpic_picpath, sz, color, theAlpha, drawflag);\ - _drawpic_picpath = string_null;\ - } while(0) - void drawpic_aspect_skin_expanding(vector position, string pic, vector theScale, vector rgb, float theAlpha, float flag, float fadelerp) { float sz; @@ -320,19 +270,6 @@ void drawpic_aspect_skin_expanding_two(vector position, string pic, vector theSc drawpic_aspect_skin_expanding(position, pic, theScale, rgb, theAlpha, flag, fadelerp); drawpic_skin(position, pic, theScale, rgb, theAlpha * fadelerp, flag); } -#define SET_POS_AND_SZ_Y_ASPECT(allow_colors) do { \ - 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; \ - } \ -} while(0) // 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 theAlpha, float drawflag) { @@ -346,7 +283,6 @@ void drawcolorcodedstring_aspect(vector pos, string text, vector sz, float theAl drawcolorcodedstring(pos, text, '1 1 0' * sz.y, theAlpha, drawflag); } -vector drawfontscale; void drawstring_expanding(vector position, string text, vector theScale, vector rgb, float theAlpha, float flag, float fadelerp) { float sz; @@ -563,7 +499,6 @@ void DrawCircleClippedPic(vector centre, float radius, string pic, float f, vect } } -const vector GETPLAYERORIGIN_ERROR = '1123581321 2357111317 3141592653'; // way out of bounds for anything on the map vector getplayerorigin(int pl) { entity e; @@ -615,7 +550,7 @@ float getplayerisdead(float pl) return false; } -void URI_Get_Callback(float id, float status, string data) +void URI_Get_Callback(int id, float status, string data) { if(url_URI_Get_Callback(id, status, data)) { @@ -646,13 +581,6 @@ void draw_endBoldFont() drawfont = FONT_USER+1; } - -const float MAX_ACCURACY_LEVELS = 10; -float acc_lev[MAX_ACCURACY_LEVELS]; -vector acc_col[MAX_ACCURACY_LEVELS]; -float acc_col_loadtime; -int acc_levels; -string acc_color_levels; void Accuracy_LoadLevels() { if(autocvar_accuracy_color_levels != acc_color_levels)