r3918 - trunk/data/qcsrc/client
DONOTREPLY at icculus.org
DONOTREPLY at icculus.org
Sat Jul 26 02:07:10 EDT 2008
Author: div0
Date: 2008-07-26 02:07:07 -0400 (Sat, 26 Jul 2008)
New Revision: 3918
Modified:
trunk/data/qcsrc/client/Main.qc
trunk/data/qcsrc/client/View.qc
trunk/data/qcsrc/client/ctf.qc
trunk/data/qcsrc/client/mapvoting.qc
trunk/data/qcsrc/client/miscfunctions.qc
trunk/data/qcsrc/client/ons.qc
Log:
vectors in QC are 3D. 'a b' makes a warning.
Modified: trunk/data/qcsrc/client/Main.qc
===================================================================
--- trunk/data/qcsrc/client/Main.qc 2008-07-25 20:44:17 UTC (rev 3917)
+++ trunk/data/qcsrc/client/Main.qc 2008-07-26 06:07:07 UTC (rev 3918)
@@ -4,7 +4,7 @@
void() menu_show_error =
{
- drawstring('0 200', "ERROR - MENU IS VISIBLE BUT NO MENU WAS DEFINED!", '8 8 0', '1 0 0', 1, 0);
+ drawstring('0 200 0', "ERROR - MENU IS VISIBLE BUT NO MENU WAS DEFINED!", '8 8 0', '1 0 0', 1, 0);
};
// CSQC_Init : Called every time the CSQC code is initialized (essentially at map load)
Modified: trunk/data/qcsrc/client/View.qc
===================================================================
--- trunk/data/qcsrc/client/View.qc 2008-07-25 20:44:17 UTC (rev 3917)
+++ trunk/data/qcsrc/client/View.qc 2008-07-26 06:07:07 UTC (rev 3918)
@@ -127,7 +127,7 @@
yellow = '1 1 0';
pink = '1 0 1';
- kh_size = '0 0'; // don't resize the image
+ kh_size = '0 0 0'; // don't resize the image
kh_carrying = "gfx/sb_kh_full";
kh_outline = "gfx/sb_kh_outline";
Modified: trunk/data/qcsrc/client/ctf.qc
===================================================================
--- trunk/data/qcsrc/client/ctf.qc 2008-07-25 20:44:17 UTC (rev 3917)
+++ trunk/data/qcsrc/client/ctf.qc 2008-07-26 06:07:07 UTC (rev 3918)
@@ -25,8 +25,8 @@
local vector ps, po;
local float i, p, n;
local string frags, color;
- ps = '0 200';
- po = '0 8';
+ ps = '0 200 0';
+ po = '0 8 0';
color = getplayerkey(player_localentnum-1, "topcolor");
@@ -146,14 +146,14 @@
void() ctf_menu_render =
{
local vector ps, po;
- ps = '0 200';
- po = '0 8';
+ ps = '0 200 0';
+ po = '0 8 0';
if(getstati(STAT_CTF_STATE) == CTF_STATE_COMMANDER) {
drawstring(ps, "\x1D\x1E\x1E\x1E\x1E Command Menu \x1E\x1E\x1E\x1E\x1F", '8 8 0', '1 1 0', 1, 0); ps += po;
drawstring(ps, "Issue orders:", '8 8 0', '1 1 0', 1, 0); ps += po;
drawstring(ps, " 1) Attack ", '8 8 0', '1 1 0', 1, 0);
- drawstring(ps + '80 0', " \x0F", '8 8 0', '1 1 1', 1, 0); ps += po;
+ drawstring(ps + '80 0 0', " \x0F", '8 8 0', '1 1 1', 1, 0); ps += po;
drawstring(ps, " 2) Defend \x0E", '8 8 0', '1 1 0', 1, 0); ps += po;
ps += po;
drawstring(ps, "3) Resign from command.", '8 8 0', '1 1 0', 1, 0); ps += po;
@@ -204,13 +204,13 @@
local float stat;
stat = getstati(STAT_CTF_STATE);
if(stat == CTF_STATE_ATTACK) {
- drawpic('0 0', "gfx/ctf_ic_atk.tga", '64 64 0', '1 1 1', 1, 0);
+ drawpic('0 0 0', "gfx/ctf_ic_atk.tga", '64 64 0', '1 1 1', 1, 0);
} else if(stat == CTF_STATE_DEFEND) {
- drawpic('0 0', "gfx/ctf_ic_def.tga", '64 64 0', '1 1 1', 1, 0);
+ drawpic('0 0 0', "gfx/ctf_ic_def.tga", '64 64 0', '1 1 1', 1, 0);
} else if(stat == CTF_STATE_COMMANDER) {
- drawstring('0 0', "You're commander!", '8 8 0', '1 1 1', 1, 0);
+ drawstring('0 0 0', "You're commander!", '8 8 0', '1 1 1', 1, 0);
} else if(stat < 0) {
} else {
- drawstring('0 0', "Awaiting orders...", '8 8 0', '1 1 1', 0.5, 0);
+ drawstring('0 0 0', "Awaiting orders...", '8 8 0', '1 1 1', 0.5, 0);
}
};
Modified: trunk/data/qcsrc/client/mapvoting.qc
===================================================================
--- trunk/data/qcsrc/client/mapvoting.qc 2008-07-25 20:44:17 UTC (rev 3917)
+++ trunk/data/qcsrc/client/mapvoting.qc 2008-07-26 06:07:07 UTC (rev 3918)
@@ -30,7 +30,7 @@
else
rgb = '1 1 1';
- drawstring(pos - '40 0', strcat(ftos(id+1), "."), img_size, rgb, 1, DRAWFLAG_NORMAL);
+ drawstring(pos - '40 0 0', strcat(ftos(id+1), "."), img_size, rgb, 1, DRAWFLAG_NORMAL);
pos_x += isize/0.75 + 10;
@@ -63,7 +63,7 @@
else
rgb = '1 1 1';
- drawstring(pos - '40 0', strcat(ftos(id+1), "."), img_size, rgb, 1, DRAWFLAG_NORMAL);
+ drawstring(pos - '40 0 0', strcat(ftos(id+1), "."), img_size, rgb, 1, DRAWFLAG_NORMAL);
pos_x += isize/0.75 + 10;
@@ -88,7 +88,7 @@
else
rgb = '1 1 1';
- drawstring(pos - '40 0', strcat(ftos(id+1), "."), img_size, rgb, 1, DRAWFLAG_NORMAL);
+ drawstring(pos - '40 0 0', strcat(ftos(id+1), "."), img_size, rgb, 1, DRAWFLAG_NORMAL);
pos_x += isize/0.75 + 10;
@@ -126,13 +126,13 @@
pos_y = ymin;
pos_z = 0;
pos_x = center - stringwidth("Vote for a map", false) * 0.5 * 24;
- drawstring(pos, "Vote for a map", '24 24', '1 1 1', 1, DRAWFLAG_NORMAL);
+ drawstring(pos, "Vote for a map", '24 24 0', '1 1 1', 1, DRAWFLAG_NORMAL);
pos_y += 26;
i = ceil(mv_timeout - time);
map = strcat(ftos(i), " seconds left");
pos_x = center - stringwidth(map, false) * 0.5 * 16;
- drawstring(pos, map, '16 16', '0 1 0', 1, DRAWFLAG_NORMAL);
+ drawstring(pos, map, '16 16 0', '0 1 0', 1, DRAWFLAG_NORMAL);
pos_y += 22;
pos_x = xmin;
Modified: trunk/data/qcsrc/client/miscfunctions.qc
===================================================================
--- trunk/data/qcsrc/client/miscfunctions.qc 2008-07-25 20:44:17 UTC (rev 3917)
+++ trunk/data/qcsrc/client/miscfunctions.qc 2008-07-26 06:07:07 UTC (rev 3918)
@@ -153,7 +153,7 @@
{
if(csqc_flags & CSQC_FLAG_READPICTURE)
return stov(cvar_string("sbar_fontsize"));
- return '8 8' ;
+ return '8 8 0' ;
}
float PreviewExists(string name)
Modified: trunk/data/qcsrc/client/ons.qc
===================================================================
--- trunk/data/qcsrc/client/ons.qc 2008-07-25 20:44:17 UTC (rev 3917)
+++ trunk/data/qcsrc/client/ons.qc 2008-07-26 06:07:07 UTC (rev 3918)
@@ -11,7 +11,7 @@
ret_x = ret_x * 256.0 / mi_scale_x;
ret_y = -ret_y * 256.0 / mi_scale_y;
ret_z = 0;
- ret = ret + '400 178';
+ ret = ret + '400 178 0';
return ret;
};
@@ -26,10 +26,10 @@
// Ryling on !tex[0] => texture_white
// beware of the order, it has to be clockwise!
R_BeginPolygon("", 0);
- R_PolygonVertex(coord+v_forward*2, '0 0', rgb, 1);
- R_PolygonVertex(coord+v_right*3-v_forward*2, '0 1', rgb, 1);
- R_PolygonVertex(coord-v_forward, '1 0', rgb, 1);
- R_PolygonVertex(coord-v_right*3-v_forward*2, '1 1', rgb, 1);
+ R_PolygonVertex(coord+v_forward*2, '0 0 0', rgb, 1);
+ R_PolygonVertex(coord+v_right*3-v_forward*2, '0 1 0', rgb, 1);
+ R_PolygonVertex(coord-v_forward, '1 0 0', rgb, 1);
+ R_PolygonVertex(coord-v_right*3-v_forward*2, '1 1 0', rgb, 1);
R_EndPolygon();
};
@@ -44,9 +44,9 @@
coord = mapcoords(pmove_org);
- drawpic('272 50', minimapname, '256 256', '1 1 1', 1, 0);
- drawpic('257 35', "gfx/ons-frame.tga", '286 286', '1 1 1', 1, 0);
- drawpic('257 35', "gfx/ons-frame-team.tga", '286 286', rgb, 1, 0);
+ drawpic('272 50 0', minimapname, '256 256 0', '1 1 1', 1, 0);
+ drawpic('257 35 0', "gfx/ons-frame.tga", '286 286 0', '1 1 1', 1, 0);
+ drawpic('257 35 0', "gfx/ons-frame-team.tga", '286 286 0', rgb, 1, 0);
drawplayer(coord, input_angles, '1 1 1');
More information about the nexuiz-commits
mailing list