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

git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@4970 fc73d0e0-1445-4013-8a0c-d673dee63da5

Browse source
This commit is contained in:
Spoike 2015-08-22 03:05:37 +00:00
parent 6e6a767ba6
commit 98f13cf884
2 changed files with 6 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
engine/client/console.c
View file

@ -2060,6 +2060,7 @@ void Con_DrawConsole (int lines, qboolean noback)
shader = w->backshader = R_RegisterPic(w->backimage);// R_RegisterCustom(w->backimage, SUF_NONE, Shader_DefaultCinematic, w->backimage); shader = w->backshader = R_RegisterPic(w->backimage);// R_RegisterCustom(w->backimage, SUF_NONE, Shader_DefaultCinematic, w->backimage);
if (shader) if (shader)
{ {
#ifndef NOMEDIA
cin_t *cin = R_ShaderGetCinematic(shader); cin_t *cin = R_ShaderGetCinematic(shader);
if (cin) if (cin)
{ {
@ -2070,6 +2071,7 @@ void Con_DrawConsole (int lines, qboolean noback)
else else
Media_Send_Command(cin, "cmd:unfocus"); Media_Send_Command(cin, "cmd:unfocus");
} }
#endif
R2D_ImageColours(1, 1, 1, 1); R2D_ImageColours(1, 1, 1, 1);
R2D_Image(w->wnd_x+8, w->wnd_y+8, w->wnd_w-16, w->wnd_h-16, 0, 0, 1, 1, shader); R2D_Image(w->wnd_x+8, w->wnd_y+8, w->wnd_w-16, w->wnd_h-16, 0, 0, 1, 1, shader);
} }

4
engine/client/keys.c
View file

@ -984,12 +984,14 @@ void Key_ConsoleRelease(console_t *con, int key, int unicode)
// if (con->buttonsdown == CB_MOVE) //window title(move) // if (con->buttonsdown == CB_MOVE) //window title(move)
con->buttonsdown = CB_NONE; con->buttonsdown = CB_NONE;
#ifndef NOMEDIA
if (con->backshader) if (con->backshader)
{ {
cin_t *cin = R_ShaderGetCinematic(con->backshader); cin_t *cin = R_ShaderGetCinematic(con->backshader);
if (cin) if (cin)
Media_Send_KeyEvent(cin, key, unicode, 1); Media_Send_KeyEvent(cin, key, unicode, 1);
} }
#endif
} }
//if the referenced (trailing) chevron is doubled up, then it doesn't act as part of any markup and should be ignored for such things. //if the referenced (trailing) chevron is doubled up, then it doesn't act as part of any markup and should be ignored for such things.
static qboolean utf_specialchevron(unsigned char *start, unsigned char *chev) static qboolean utf_specialchevron(unsigned char *start, unsigned char *chev)
@ -1370,12 +1372,14 @@ qboolean Key_Console (console_t *con, unsigned int unicode, int key)
//console does not have any way to accept input, so don't try giving it any. //console does not have any way to accept input, so don't try giving it any.
if (!con->linebuffered) if (!con->linebuffered)
{ {
#ifndef NOMEDIA
if (con->backshader) if (con->backshader)
{ {
cin_t *cin = R_ShaderGetCinematic(con->backshader); cin_t *cin = R_ShaderGetCinematic(con->backshader);
if (cin) if (cin)
Media_Send_KeyEvent(cin, key, unicode, 0); Media_Send_KeyEvent(cin, key, unicode, 0);
} }
#endif
return false; return false;
} }