qf/quakeforge
0
0
Fork 0
mirror of https://git.code.sf.net/p/quake/quakeforge synced 2024-11-26 06:10:56 +00:00
Code Issues Projects Releases Packages Wiki Activity

Move and clean up clview.h

Browse source 
Redundant or dead prototypes deleted, and the client/view.h seems a good
place for the file.
This commit is contained in:
Bill Currie 2021-03-12 11:48:53 +09:00
parent 8466de2325
commit 2015474468
12 changed files with 23 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
include/Makemodule.am
View file

@ -11,7 +11,6 @@ EXTRA_DIST += \
include/block16.h \
include/block8.h \
include/buildnum.h \
include/clview.h \
include/compat.h \
include/context_sdl.h \
include/context_x11.h \
@ -80,6 +79,7 @@ EXTRA_DIST += \
include/client/entities.h \
include/client/temp_entities.h \
include/client/locs.h \
include/client/view.h \
include/qw/bothdefs.h \
include/qw/msg_backbuf.h \
include/qw/msg_ucmd.h \

13
include/clview.h → include/client/view.h
View file

@ -1,5 +1,5 @@
/*
clview.h
view.h
(description)
@ -26,8 +26,8 @@
*/
// view.h
#ifndef __clview_h_
#define __clview_h_
#ifndef __client_view_h_
#define __client_view_h_
#include "QF/mathlib.h"
#include "QF/simd/types.h"
@ -41,14 +41,9 @@ void V_Init (void);
void V_Init_Cvars (void);
void V_RenderView (void);
float V_CalcRoll (const vec3_t angles, vec4f_t velocity);
void V_UpdatePalette (void);
void V_StartPitchDrift (void);
void V_StopPitchDrift (void);
void V_RenderView (void);
void V_UpdatePalette (void);
void V_Register (void);
void V_SetContentsColor (int contents);
void V_CalcBlend (void);
#endif // __clview_h_
#endif // __client_view_h_

3
libs/video/renderer/sw32/draw.c
View file

@ -1362,6 +1362,7 @@ sw32_Draw_BlendScreen (quat_t color)
}
break;
default:
Sys_Error("V_UpdatePalette: unsupported r_pixbytes %i", sw32_r_pixbytes);
Sys_Error("sw32_Draw_BlendScreen: unsupported r_pixbytes %i",
sw32_r_pixbytes);
}
}

2
nq/source/cl_main.c
View file

@ -49,10 +49,10 @@
#include "QF/plugin/vid_render.h"
#include "compat.h"
#include "clview.h"
#include "sbar.h"
#include "client/temp_entities.h"
#include "client/view.h"
#include "nq/include/chase.h"
#include "nq/include/cl_skin.h"

5
nq/source/cl_view.c
View file

@ -38,7 +38,8 @@
#include "QF/plugin/vid_render.h"
#include "compat.h"
#include "clview.h"
#include "client/view.h"
#include "nq/include/chase.h"
#include "nq/include/client.h"
@ -393,7 +394,7 @@ V_CalcPowerupCshift (void)
LordHavoc made this a real, true alpha blend. Cleaned it up
a bit, but otherwise this is his code. --KB
*/
void
static void
V_CalcBlend (void)
{
float a2, a3;

2
qw/source/cl_entparse.c
View file

@ -42,9 +42,9 @@
#include "QF/sys.h"
#include "compat.h"
#include "clview.h"
#include "client/temp_entities.h"
#include "client/view.h"
#include "qw/msg_ucmd.h"
#include "qw/pmove.h"

2
qw/source/cl_ents.c
View file

@ -43,12 +43,12 @@
#include "QF/sys.h"
#include "compat.h"
#include "clview.h"
#include "d_iface.h"
#include "client/effects.h"
#include "client/locs.h"
#include "client/temp_entities.h"
#include "client/view.h"
#include "qw/bothdefs.h"
#include "qw/msg_ucmd.h"

3
qw/source/cl_input.c
View file

@ -46,7 +46,8 @@
#include "QF/va.h"
#include "compat.h"
#include "clview.h"
#include "client/view.h"
#include "qw/msg_ucmd.h"

2
qw/source/cl_main.c
View file

@ -92,11 +92,11 @@
#include "QF/plugin/console.h"
#include "buildnum.h"
#include "clview.h"
#include "compat.h"
#include "sbar.h"
#include "client/temp_entities.h"
#include "client/view.h"
#include "qw/bothdefs.h"
#include "qw/pmove.h"

2
qw/source/cl_parse.c
View file

@ -62,11 +62,11 @@
#include "QF/va.h"
#include "compat.h"
#include "clview.h"
#include "sbar.h"
#include "client/effects.h"
#include "client/temp_entities.h"
#include "client/view.h"
#include "qw/bothdefs.h"
#include "qw/pmove.h"

3
qw/source/cl_screen.c
View file

@ -44,9 +44,10 @@
#include "QF/pcx.h"
#include "QF/screen.h"
#include "clview.h"
#include "sbar.h"
#include "client/view.h"
#include "qw/include/client.h"
static qpic_t *scr_net;

7
qw/source/cl_view.c
View file

@ -36,7 +36,8 @@
#include "QF/simd/vec4f.h"
#include "compat.h"
#include "clview.h"
#include "client/view.h"
#include "qw/bothdefs.h"
@ -95,7 +96,7 @@ cshift_t cshift_bonus = { {215, 186, 60}, 50};
#define sqr(x) ((x) * (x))
float
V_CalcRoll (const vec3_t angles, const vec4f_t velocity)
V_CalcRoll (const vec3_t angles, vec4f_t velocity)
{
float side, sign, value;
vec3_t forward, right, up;
@ -399,7 +400,7 @@ V_CalcPowerupCshift (void)
LordHavoc made this a real, true alpha blend. Cleaned it up
a bit, but otherwise this is his code. --KB
*/
void
static void
V_CalcBlend (void)
{
float a2, a3;