-// WARNING: this kills the trace globals
-float WarpZoneLib_ExactTrigger_Touch();
-#define EXACTTRIGGER_TOUCH if(WarpZoneLib_ExactTrigger_Touch()) return
+#include "miscfunctions.qh"
+
+#include "hud.qh"
+
+#include "../common/command/generic.qh"
+
+#include "../common/teams.qh"
+
+#include "../lib/csqcmodel/cl_model.qh"
-entity players;
-entity teams;
-var float team_count; // real teams
void AuditLists()
{
if(!tm)
{
- print(_("Trying to remove a team which is not in the teamlist!"));
+ LOG_INFO(_("Trying to remove a team which is not in the teamlist!"));
return;
}
parent.sort_next = Team.sort_next;
AuditLists();
}
-entity GetTeam(float Team, float add)
+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 = new(team);
+ make_pure(tm);
tm.team = Team;
teamslots[num] = tm;
RegisterTeam(tm);
{
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;
}
{
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;
}
-float ColorTranslateMode;
-
-string ColorTranslateRGB(string s)
-{
- if(ColorTranslateMode & 1)
- return strdecolorize(s);
- else
- return s;
-}
-
// decolorizes and team colors the player name when needed
string playername(string thename, float teamid)
{
vec = cs_project(vec);
if(cs_project_is_b0rked > 0)
{
- vec_x *= vid_conwidth / vid_width;
- vec_y *= vid_conheight / vid_height;
+ vec.x *= vid_conwidth / vid_width;
+ vec.y *= vid_conheight / vid_height;
}
return vec;
}
vector expandingbox_resize_centered_box_offset(float sz, vector boxsize, float boxxsizefactor)
{
- boxsize_x *= boxxsizefactor; // easier interface for text
+ boxsize.x *= boxxsizefactor; // easier interface for text
return boxsize * (0.5 * (1 - sz));
}
vector line_dim = '0 0 0';
// left and right lines
- pos_x -= thickness;
- line_dim_x = thickness;
- line_dim_y = dim_y;
+ pos.x -= thickness;
+ 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);
+ 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;
+ pos.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);
+ drawfill(pos + (dim.y + thickness) * '0 1 0', line_dim, color, theAlpha, drawflag);
}
void drawpic_tiled(vector pos, string pic, vector sz, vector area, vector color, float theAlpha, float drawflag)
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;
- while (current_pos_y < end_pos_y)
+ current_pos.y = pos.y;
+ while (current_pos.y < end_pos.y)
{
- current_pos_x = pos_x;
- while (current_pos_x < end_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;
+ current_pos.x += sz.x;
}
- current_pos_y += sz_y;
+ current_pos.y += sz.y;
}
}
-// drawpic wrapper to draw an image as large as possible with preserved aspect ratio into a box
-var float _drawpic_imgaspect;
-var vector _drawpic_imgsize;
-var vector _drawpic_sz;
-var float _drawpic_oldsz;
-var 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;
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)\
- 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 theAlpha, float drawflag) {
- SET_POS_AND_SZ_Y_ASPECT(FALSE)
- drawstring(pos, text, '1 1 0' * sz_y, color, theAlpha, drawflag);
+ SET_POS_AND_SZ_Y_ASPECT(false);
+ drawstring(pos, text, '1 1 0' * sz.y, color, theAlpha, 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 theAlpha, float drawflag) {
- SET_POS_AND_SZ_Y_ASPECT(TRUE)
- drawcolorcodedstring(pos, text, '1 1 0' * sz_y, theAlpha, drawflag);
+ SET_POS_AND_SZ_Y_ASPECT(true);
+ 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;
drawfontscale = sz * '1 1 0';
dummyfunction(0, 0, 0, 0, 0, 0, 0, 0);
- drawstring(position + expandingbox_resize_centered_box_offset(sz, theScale, stringwidth(text, FALSE, theScale * (sz / drawfontscale_x)) / (theScale_x * sz)), text, theScale * (sz / drawfontscale_x), rgb, theAlpha * (1 - fadelerp), flag);
+ drawstring(position + expandingbox_resize_centered_box_offset(sz, theScale, stringwidth(text, false, theScale * (sz / drawfontscale.x)) / (theScale.x * sz)), text, theScale * (sz / drawfontscale.x), rgb, theAlpha * (1 - fadelerp), flag);
// width parameter:
// (scale_x * sz / drawfontscale_x) * drawfontscale_x * SIZE1 / (scale_x * sz)
// SIZE1
// 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 theAlpha, float drawflag, float fadelerp) {
- SET_POS_AND_SZ_Y_ASPECT(FALSE)
- drawstring_expanding(pos, text, '1 1 0' * sz_y, color, theAlpha, drawflag, fadelerp);
+ SET_POS_AND_SZ_Y_ASPECT(false);
+ drawstring_expanding(pos, text, '1 1 0' * sz.y, color, theAlpha, drawflag, fadelerp);
}
void drawcolorcodedstring_expanding(vector position, string text, vector theScale, float theAlpha, float flag, float fadelerp)
drawfontscale = sz * '1 1 0';
dummyfunction(0, 0, 0, 0, 0, 0, 0, 0);
- drawcolorcodedstring(position + expandingbox_resize_centered_box_offset(sz, theScale, stringwidth(text, TRUE, theScale * (sz / drawfontscale_x)) / (theScale_x * sz)), text, theScale * (sz / drawfontscale_x), theAlpha * (1 - fadelerp), flag);
+ drawcolorcodedstring(position + expandingbox_resize_centered_box_offset(sz, theScale, stringwidth(text, true, theScale * (sz / drawfontscale.x)) / (theScale.x * sz)), text, theScale * (sz / drawfontscale.x), theAlpha * (1 - fadelerp), flag);
drawfontscale = '1 1 0';
}
void drawcolorcodedstring_aspect_expanding(vector pos, string text, vector sz, float theAlpha, float drawflag, float fadelerp) {
- SET_POS_AND_SZ_Y_ASPECT(TRUE)
- drawcolorcodedstring_expanding(pos, text, '1 1 0' * sz_y, theAlpha, drawflag, fadelerp);
+ SET_POS_AND_SZ_Y_ASPECT(true);
+ drawcolorcodedstring_expanding(pos, text, '1 1 0' * sz.y, theAlpha, drawflag, fadelerp);
}
// this draws the triangles of a model DIRECTLY. Don't expect high performance, really...
{
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_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;
break;
}
-void DrawCircleClippedPic(vector centre, float radius, string pic, float f, vector rgb, float a, float drawflag)
+void DrawCircleClippedPic(vector centre, float radi, string pic, float f, vector rgb, float a, float drawflag)
{
float x, y, q, d;
vector ringsize, v, t;
- ringsize = radius * '1 1 0';
+ ringsize = radi * '1 1 0';
x = cos(f * 2 * M_PI);
y = sin(f * 2 * M_PI);
// 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';
+ 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';
+ 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';
+ 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';
+ v.y -= 0.5 * ringsize.y; t -= '0.5 -0.5 0';
R_PolygonVertex(v, t, rgb, a);
R_EndPolygon();
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';
+ v.x += 0.5 * ringsize.x; t += '0.5 0.5 0';
R_PolygonVertex(v, t, rgb, a);
}
}
// 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';
+ 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';
+ 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';
+ v.x -= 0.5 * ringsize.x; t -= '0.5 0.5 0';
R_PolygonVertex(v, t, rgb, a);
R_EndPolygon();
R_BeginPolygon(pic, drawflag);
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';
+ 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';
+ v.y -= 0.5 * ringsize.y; t -= '0.5 -0.5 0';
R_PolygonVertex(v, t, rgb, a);
d = q - 0.75;
// 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';
+ 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';
+ 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';
+ v.x -= 0.5 * ringsize.x; t -= '0.5 0.5 0';
R_PolygonVertex(v, t, rgb, a);
R_EndPolygon();
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';
+ v.x -= 0.5 * ringsize.x; t -= '0.5 0.5 0';
R_PolygonVertex(v, t, rgb, a);
}
}
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';
+ 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';
+ v.y += 0.5 * ringsize.y; t += '0.5 -0.5 0';
R_PolygonVertex(v, t, rgb, a);
d = q - 0.25;
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';
+ 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';
+ 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();
}
}
-const vector GETPLAYERORIGIN_ERROR = '1123581321 2357111317 3141592653'; // way out of bounds for anything on the map
-vector getplayerorigin(float pl)
+vector getplayerorigin(int pl)
{
entity e;
if(e)
{
if(e.colormap > 0)
- return colormapPaletteColor(((e.colormap >= 1024) ? e.colormap : stof(getplayerkeyvalue(e.colormap - 1, "colors"))) & 0x0F, TRUE);
+ return colormapPaletteColor(((e.colormap >= 1024) ? e.colormap : stof(getplayerkeyvalue(e.colormap - 1, "colors"))) & 0x0F, true);
}
return '1 1 1';
if(e)
return e.csqcmodel_isdead;
- return FALSE;
+ 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))
{
}
else
{
- printf("Received HTTP request data for an invalid id %d.\n", id);
+ LOG_INFOF("Received HTTP request data for an invalid id %d.\n", id);
}
}
drawfont = FONT_USER+1;
}
-
-#define MAX_ACCURACY_LEVELS 10
-float acc_lev[MAX_ACCURACY_LEVELS];
-vector acc_col[MAX_ACCURACY_LEVELS];
-float acc_col_loadtime;
-float acc_levels;
-string acc_color_levels;
void Accuracy_LoadLevels()
{
- float i;
if(autocvar_accuracy_color_levels != acc_color_levels)
{
if(acc_color_levels)
if(acc_levels > MAX_ACCURACY_LEVELS)
acc_levels = MAX_ACCURACY_LEVELS;
if(acc_levels < 2)
- print("Warning: accuracy_color_levels must contain at least 2 values\n");
+ LOG_INFO("Warning: accuracy_color_levels must contain at least 2 values\n");
+ int i;
for(i = 0; i < acc_levels; ++i)
acc_lev[i] = stof(argv(i)) / 100.0;
}
void Accuracy_LoadColors()
{
- float i;
if(time > acc_col_loadtime)
if(acc_levels >= 2)
{
+ int i;
for(i = 0; i < acc_levels; ++i)
acc_col[i] = stov(cvar_string(strcat("accuracy_color", ftos(i))));
acc_col_loadtime = time + 2;
vector Accuracy_GetColor(float accuracy)
{
- float j, factor;
+ float factor;
vector color;
if(acc_levels < 2)
return '0 0 0'; // return black, can't determine the right color
// find the max level lower than acc
- j = acc_levels-1;
+ int j = acc_levels-1;
while(j && accuracy < acc_lev[j])
--j;
projects / xonotic / xonotic-data.pk3dir.git / blobdiff