diff options
author | Andrey Nazarov <skuller@skuller.net> | 2008-08-16 10:19:42 +0000 |
---|---|---|
committer | Andrey Nazarov <skuller@skuller.net> | 2008-08-16 10:19:42 +0000 |
commit | 1526e22e4ff29153e9c127081e8ea8d9e2f33b8c (patch) | |
tree | b361766433d4a7b4a111865afd52803e2bbf7754 /source/ui_script.c | |
parent | e826e5f176f21cd18b3bbc22887a266835ada57c (diff) |
Split some monolithic include files into smaller ones.
Use single BSP models cache for refresh and collision subsystems.
Refresh libraries may not longer be dynamically loaded.
Made gi.TagMalloc use separate tag namespace to avoid
conflicts with engine reserverd tags.
Fixed listing order of MVD channels in chooser menu.
A lot of misc changes... MSVC build is definitely broken now.
Diffstat (limited to 'source/ui_script.c')
-rw-r--r-- | source/ui_script.c | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/source/ui_script.c b/source/ui_script.c index 502e1a4..2cd4fb2 100644 --- a/source/ui_script.c +++ b/source/ui_script.c @@ -19,6 +19,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ #include "ui_local.h" +#include "files.h" static menuSound_t Activate( menuCommon_t *self ) { menuAction_t *action = ( menuAction_t * )self; @@ -263,8 +264,8 @@ static void Parse_Background( menuFrameWork_t *menu ) { menu->transparent = qtrue; } } else { - menu->image = ref.RegisterPic( s ); - menu->transparent = ref.DrawGetPicSize( NULL, NULL, menu->image ); + menu->image = R_RegisterPic( s ); + menu->transparent = R_GetPicSize( NULL, NULL, menu->image ); } } @@ -392,13 +393,13 @@ static qboolean Parse_File( const char *path, int depth ) { if( COM_ParseColor( s, uis.color.background ) ) { uis.backgroundHandle = 0; } else { - uis.backgroundHandle = ref.RegisterPic( s ); + uis.backgroundHandle = R_RegisterPic( s ); } } else if( !strcmp( cmd, "font" ) ) { - uis.fontHandle = ref.RegisterFont( Cmd_Argv( 1 ) ); + uis.fontHandle = R_RegisterFont( Cmd_Argv( 1 ) ); } else if( !strcmp( cmd, "cursor" ) ) { - uis.cursorHandle = ref.RegisterPic( Cmd_Argv( 1 ) ); - ref.DrawGetPicSize( &uis.cursorWidth, + uis.cursorHandle = R_RegisterPic( Cmd_Argv( 1 ) ); + R_GetPicSize( &uis.cursorWidth, &uis.cursorHeight, uis.cursorHandle ); } else { Com_WPrintf( "Unknown keyword '%s'\n", cmd ); |