eukara/fteqw
1
0
Fork 0
forked from fte/fteqw
Code Pull requests Activity

Minor code cleanups.

Browse source 
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@6159 fc73d0e0-1445-4013-8a0c-d673dee63da5
This commit is contained in:
Spoike 2022-01-08 10:01:29 +00:00
parent 310f4d0efc
commit b8e628cc39
4 changed files with 13 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
engine/client/cl_input.c
View file

@ -1322,29 +1322,6 @@ void CL_UpdatePrydonCursor(usercmd_t *from, int pnum)
from->cursor_screen[1] = 1; from->cursor_screen[1] = 1;
} }
/*
if (cl.cmd.cursor_screen[0] < -1)
{
cl.viewangles[YAW] -= m_yaw.value * (cl.cmd.cursor_screen[0] - -1) * vid.realwidth * sensitivity.value * cl.viewzoom;
cl.cmd.cursor_screen[0] = -1;
}
if (cl.cmd.cursor_screen[0] > 1)
{
cl.viewangles[YAW] -= m_yaw.value * (cl.cmd.cursor_screen[0] - 1) * vid.realwidth * sensitivity.value * cl.viewzoom;
cl.cmd.cursor_screen[0] = 1;
}
if (cl.cmd.cursor_screen[1] < -1)
{
cl.viewangles[PITCH] += m_pitch.value * (cl.cmd.cursor_screen[1] - -1) * vid.realheight * sensitivity.value * cl.viewzoom;
cl.cmd.cursor_screen[1] = -1;
}
if (cl.cmd.cursor_screen[1] > 1)
{
cl.viewangles[PITCH] += m_pitch.value * (cl.cmd.cursor_screen[1] - 1) * vid.realheight * sensitivity.value * cl.viewzoom;
cl.cmd.cursor_screen[1] = 1;
}
*/
VectorClear(from->cursor_start); VectorClear(from->cursor_start);
temp[0] = (from->cursor_screen[0]+1)/2; temp[0] = (from->cursor_screen[0]+1)/2;
temp[1] = (-from->cursor_screen[1]+1)/2; temp[1] = (-from->cursor_screen[1]+1)/2;

2
engine/client/pr_csqc.c
View file

@ -7056,7 +7056,7 @@ static struct {
{"skel_delete", PF_skel_delete, 275},//void(float skel) skel_delete = #275; // (FTE_CSQC_SKELETONOBJECTS) {"skel_delete", PF_skel_delete, 275},//void(float skel) skel_delete = #275; // (FTE_CSQC_SKELETONOBJECTS)
{"frameforname", PF_frameforname, 276},//float(float modidx, string framename) frameforname = #276 (FTE_CSQC_SKELETONOBJECTS) {"frameforname", PF_frameforname, 276},//float(float modidx, string framename) frameforname = #276 (FTE_CSQC_SKELETONOBJECTS)
{"frameduration", PF_frameduration, 277},//float(float modidx, float framenum) frameduration = #277 (FTE_CSQC_SKELETONOBJECTS) {"frameduration", PF_frameduration, 277},//float(float modidx, float framenum) frameduration = #277 (FTE_CSQC_SKELETONOBJECTS)
{"frameforaction", PF_frameforaction, 0},//float(float modidx, string actionid) frameforaction = #0 {"frameforaction", PF_frameforaction, 0},//float(float modidx, int actionid) frameforaction = #0
{"processmodelevents", PF_processmodelevents, 0}, {"processmodelevents", PF_processmodelevents, 0},
{"getnextmodelevent", PF_getnextmodelevent, 0}, {"getnextmodelevent", PF_getnextmodelevent, 0},
{"getmodeleventidx", PF_getmodeleventidx, 0}, {"getmodeleventidx", PF_getmodeleventidx, 0},

2
engine/gl/gl_model.h
View file

@ -909,7 +909,7 @@ typedef enum {sb_none, sb_quake64, sb_long1, sb_long2} subbsp_t; // used to deno
#define MFH2_SPIT (1u<<11) // Black transparent trail with negative light #define MFH2_SPIT (1u<<11) // Black transparent trail with negative light
#define MFH2_TRANSPARENT (1u<<12) // Transparent sprite #define MFH2_TRANSPARENT (1u<<12) // Transparent sprite
#define MFH2_SPELL (1u<<13) // Vertical spray of particles #define MFH2_SPELL (1u<<13) // Vertical spray of particles
#define MFH2_HOLEY (1u<<14) // Solid model with color 0 #define MFH2_HOLEY (1u<<14) // Solid model with color 0 cut out
#define MFH2_SPECIAL_TRANS (1u<<15) // Translucency through the particle table #define MFH2_SPECIAL_TRANS (1u<<15) // Translucency through the particle table
#define MFH2_FACE_VIEW (1u<<16) // Poly Model always faces you #define MFH2_FACE_VIEW (1u<<16) // Poly Model always faces you
#define MFH2_VORP_MISSILE (1u<<17) // leave a trail at top and bottom of model #define MFH2_VORP_MISSILE (1u<<17) // leave a trail at top and bottom of model

13
plugins/avplug/avaudio.c
View file

@ -525,9 +525,18 @@ static void AVLogCallback(void *avcl, int level, const char *fmt, va_list vl)
{ //needs to be reenterant { //needs to be reenterant
#ifdef _DEBUG #ifdef _DEBUG
char string[1024]; char string[1024];
if (level >= AV_LOG_INFO)
return; //don't care if its just going to be spam.
Q_vsnprintf (string, sizeof(string), fmt, vl); Q_vsnprintf (string, sizeof(string), fmt, vl);
if (pdeveloper && pdeveloper->ival) if (level >= AV_LOG_WARNING)
Con_Printf("%s", string); {
if (pdeveloper && pdeveloper->ival)
Con_Printf("ffmpeg: %s", string);
}
else if (level >= AV_LOG_ERROR)
Con_Printf(CON_WARNING"ffmpeg: %s", string);
else
Con_Printf(CON_ERROR"ffmpeg: %s", string);
#endif #endif
} }