mostly miscilaneous changes (some old stuff that I don't remember), lightsampling changes, qtv changes, avi sound changes

git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@2379 fc73d0e0-1445-4013-8a0c-d673dee63da5
This commit is contained in:
Spoike 2006-09-17 00:59:22 +00:00
parent 4c32449d26
commit 42c43d960f
60 changed files with 2066 additions and 643 deletions

View file

@ -1679,10 +1679,18 @@ qboolean UI_KeyPress(int key, qboolean down)
{
if (key == K_ESCAPE && down)
{
if (Media_PlayingFullScreen())
{
Media_PlayFilm("");
}
if (cls.state)
return VM_Call(uivm, UI_SET_ACTIVE_MENU, 2)>0;
VM_Call(uivm, UI_SET_ACTIVE_MENU, 2)>0;
else
return VM_Call(uivm, UI_SET_ACTIVE_MENU, 1)>0;
VM_Call(uivm, UI_SET_ACTIVE_MENU, 1)>0;
scr_conlines = 0;
return true;
}
return false;
}
@ -1693,12 +1701,12 @@ qboolean UI_KeyPress(int key, qboolean down)
key |= 1024;
/*result = */VM_Call(uivm, UI_KEY_EVENT, key, down);
/*
if (!keycatcher && !cls.state && key == K_ESCAPE && down)
{
M_Menu_Main_f();
return true;
}
}*/
return true;