From 4ef6ad7050877d9a01a98c9531bcc020c3330f9a Mon Sep 17 00:00:00 2001 From: MirceaKitsune Date: Thu, 15 Mar 2012 17:05:07 +0200 Subject: [PATCH] Use setproperty instead of R_SetView --- data/qcsrc/client/View.qc | 22 +++++++++++----------- docs/TODO.txt | 2 -- 2 files changed, 11 insertions(+), 13 deletions(-) diff --git a/data/qcsrc/client/View.qc b/data/qcsrc/client/View.qc index 43c2e882..3e48e2d3 100644 --- a/data/qcsrc/client/View.qc +++ b/data/qcsrc/client/View.qc @@ -564,7 +564,7 @@ void CSQC_UpdateView(float w, float h) // Assign Standard Viewflags // Draw the World (and sky) - R_SetView(VF_DRAWWORLD, 1); + setproperty(VF_DRAWWORLD, 1); // Set the console size vars vid_conwidth = cvar("vid_conwidth"); @@ -592,7 +592,7 @@ void CSQC_UpdateView(float w, float h) power_boot = time; } - R_SetView(VF_FOV, GetCurrentFov(fov)); + setproperty(VF_FOV, GetCurrentFov(fov)); // Camera for demo playback if(camera_active) @@ -623,10 +623,10 @@ void CSQC_UpdateView(float w, float h) // Draw the Crosshair float scoreboard_active; scoreboard_active = Sbar_WouldDrawScoreboard(); - R_SetView(VF_DRAWCROSSHAIR, 0); //Make sure engine crosshairs are always hidden + setproperty(VF_DRAWCROSSHAIR, 0); //Make sure engine crosshairs are always hidden // Draw the Engine Status Bar (the default Quake HUD) - R_SetView(VF_DRAWENGINESBAR, 0); + setproperty(VF_DRAWENGINESBAR, 0); // fetch this one only once per frame sbar_showbinds = cvar("sbar_showbinds"); @@ -1467,11 +1467,11 @@ void CSQC_UpdateView(float w, float h) string w0, h0; w0 = cvar_string("vid_conwidth"); h0 = cvar_string("vid_conheight"); - //R_SetView(VF_VIEWPORT, '0 0 0', '640 480 0'); - //R_SetView(VF_FOV, '90 90 0'); - R_SetView(VF_ORIGIN, '0 0 0'); - R_SetView(VF_ANGLES, '0 0 0'); - R_SetView(VF_PERSPECTIVE, 1); + //setproperty(VF_VIEWPORT, '0 0 0', '640 480 0'); + //setproperty(VF_FOV, '90 90 0'); + setproperty(VF_ORIGIN, '0 0 0'); + setproperty(VF_ANGLES, '0 0 0'); + setproperty(VF_PERSPECTIVE, 1); makevectors('0 0 0'); vector v1, v2; cvar_set("vid_conwidth", "800"); @@ -1665,6 +1665,6 @@ void CSQC_Demo_Camera() current_position = current_origin + current_camera_offset; } - R_SetView(VF_ANGLES, current_angles); - R_SetView(VF_ORIGIN, current_position); + setproperty(VF_ANGLES, current_angles); + setproperty(VF_ORIGIN, current_position); } diff --git a/docs/TODO.txt b/docs/TODO.txt index c81fe6e9..0574e60f 100644 --- a/docs/TODO.txt +++ b/docs/TODO.txt @@ -104,8 +104,6 @@ - 0.7 | 0.8: Is the proper blue color used in team games, with the new colormap? -- 0.7 | 0.8: Use R_SetProperty instead of R_SetView - - 0.8 BUG: Swallow model gets bumped outside of the view at times. This is likely due to the change to offset the original weapon viewmodel. - 0.7 | 0.8: Do the Desertfactory textures have metal footsteps where they need to? -- 2.39.2