From 0962dc6e27235e973021aa22d10b625be4e4faf7 Mon Sep 17 00:00:00 2001 From: div0 Date: Fri, 17 Jul 2009 08:16:33 +0000 Subject: [PATCH] cs_*project: check if DP supports them in console coordinate space git-svn-id: svn://svn.icculus.org/nexuiz/trunk@7228 f962a42d-fe04-0410-a3ab-8c8b0445ebaa --- data/qcsrc/client/Main.qc | 15 +++++++++++---- data/qcsrc/client/miscfunctions.qc | 6 ++---- 2 files changed, 13 insertions(+), 8 deletions(-) diff --git a/data/qcsrc/client/Main.qc b/data/qcsrc/client/Main.qc index 84ac0d0d4..cb0ba64c2 100644 --- a/data/qcsrc/client/Main.qc +++ b/data/qcsrc/client/Main.qc @@ -126,6 +126,11 @@ void CSQC_Init(void) cs_project_is_b0rked = TRUE; + string w0, h0; + w0 = cvar_string("vid_conwidth"); + h0 = cvar_string("vid_conheight"); + cvar_set("vid_conwidth", "800"); + cvar_set("vid_conheight", "600"); R_SetView(VF_VIEWPORT, '0 0 0', '640 480 0'); R_SetView(VF_FOV, '90 90 0'); R_SetView(VF_ORIGIN, '0 0 0'); @@ -134,11 +139,13 @@ void CSQC_Init(void) makevectors('0 0 0'); vector v; v = cs_project(v_forward); - if(v_x - 320 < +1) - if(v_x - 320 > -1) - if(v_y - 240 < +1) - if(v_y - 240 > -1) + if(v_x - 400 < +1) + if(v_x - 400 > -1) + if(v_y - 300 < +1) + if(v_y - 300 > -1) cs_project_is_b0rked = FALSE; + cvar_set("vid_conwidth", w0); + cvar_set("vid_conheight", h0); RegisterWeapons(); diff --git a/data/qcsrc/client/miscfunctions.qc b/data/qcsrc/client/miscfunctions.qc index 4dc6c71a7..e5233167c 100644 --- a/data/qcsrc/client/miscfunctions.qc +++ b/data/qcsrc/client/miscfunctions.qc @@ -293,11 +293,9 @@ vector project_3d_to_2d(vector vec) vec = cs_project(vec); if(cs_project_is_b0rked) { - vec_x += vid_width / 2; - vec_y += vid_height / 2; + 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; } -- 2.39.2