mirror of
https://github.com/nzp-team/fteqw.git
synced 2024-11-26 13:50:53 +00:00
Mostly software renderer fixes.
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@2487 fc73d0e0-1445-4013-8a0c-d673dee63da5
This commit is contained in:
parent
3df97e1e19
commit
9ed683614a
6 changed files with 14 additions and 5 deletions
|
@ -209,7 +209,7 @@ void IN_JumpDown (void)
|
|||
|
||||
|
||||
|
||||
condition = (cls.state == ca_active && cl_smartjump.value);
|
||||
condition = (cls.state == ca_active && cl_smartjump.value && !prox_inmenu.value);
|
||||
#ifdef Q2CLIENT
|
||||
if (condition && cls.protocol == CP_QUAKE2)
|
||||
KeyDown(&in_up);
|
||||
|
|
|
@ -2000,13 +2000,14 @@ void Media_Init(void)
|
|||
Cvar_Register(&capturesound, "AVI capture controls");
|
||||
Cvar_Register(&capturerate, "AVI capture controls");
|
||||
Cvar_Register(&capturecodec, "AVI capture controls");
|
||||
#endif
|
||||
|
||||
#if defined(WINAVI)
|
||||
Cvar_Register(&capturesoundbits, "AVI capture controls");
|
||||
Cvar_Register(&capturesoundchannels, "AVI capture controls");
|
||||
#endif
|
||||
|
||||
#endif
|
||||
|
||||
#ifdef WINAMP
|
||||
Cvar_Register(&media_hijackwinamp, "Media player things");
|
||||
#endif
|
||||
|
|
|
@ -1039,7 +1039,7 @@ int WINAPI WinMain (HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLin
|
|||
quakeparms_t parms;
|
||||
double time, oldtime, newtime;
|
||||
MEMORYSTATUS lpBuffer;
|
||||
static char cwd[1024];
|
||||
char cwd[1024];
|
||||
int t;
|
||||
RECT rect;
|
||||
char *qtvfile = NULL;
|
||||
|
|
|
@ -338,8 +338,8 @@ int Plug_Emumerated (char *name, int size, void *param)
|
|||
|
||||
int VARGS Plug_Con_Print(void *offset, unsigned int mask, const long *arg)
|
||||
{
|
||||
if (qrenderer <= 0)
|
||||
return false;
|
||||
// if (qrenderer <= 0)
|
||||
// return false;
|
||||
Con_Printf("%s", (char*)VM_POINTER(arg[0]));
|
||||
return 0;
|
||||
}
|
||||
|
|
|
@ -23,6 +23,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
|
|||
//http://www.quakesrc.org/forums/viewtopic.php?t=4340&start=0
|
||||
|
||||
#include "quakedef.h"
|
||||
#ifdef RGLQUAKE
|
||||
#include "glquake.h"
|
||||
|
||||
extern vrect_t scr_vrect;
|
||||
|
@ -630,3 +631,4 @@ void R_BloomBlend (void)//refdef_t *fd, meshlist_t *meshlist )
|
|||
Con_Printf("GL Error whilst rendering bloom\n");
|
||||
}
|
||||
|
||||
#endif
|
||||
|
|
|
@ -985,6 +985,12 @@ void SWVID_Update (vrect_t *rects) //end frame...
|
|||
}
|
||||
}
|
||||
|
||||
void SWVID_SetCaption(char *text)
|
||||
{
|
||||
SetWindowText(mainwindow, text);
|
||||
}
|
||||
|
||||
|
||||
void SWVID_HandlePause (qboolean pause) //release mouse
|
||||
{
|
||||
#ifdef MGL
|
||||
|
|
Loading…
Reference in a new issue