summaryrefslogtreecommitdiff
path: root/src/ui/ui_atoms.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/ui/ui_atoms.c')
-rw-r--r--src/ui/ui_atoms.c107
1 files changed, 65 insertions, 42 deletions
diff --git a/src/ui/ui_atoms.c b/src/ui/ui_atoms.c
index a5c15c25..ec1e1e73 100644
--- a/src/ui/ui_atoms.c
+++ b/src/ui/ui_atoms.c
@@ -2,19 +2,19 @@
===========================================================================
Copyright (C) 1999-2005 Id Software, Inc.
Copyright (C) 2000-2006 Tim Angus
-
+
This file is part of Tremulous.
-
+
Tremulous is free software; you can redistribute it
and/or modify it under the terms of the GNU General Public License as
published by the Free Software Foundation; either version 2 of the License,
or (at your option) any later version.
-
+
Tremulous is distributed in the hope that it will be
useful, but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
-
+
You should have received a copy of the GNU General Public License
along with Tremulous; if not, write to the Free Software
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
@@ -23,33 +23,35 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
/**********************************************************************
UI_ATOMS.C
-
+
User interface building blocks and support functions.
**********************************************************************/
#include "ui_local.h"
qboolean m_entersound; // after a frame, so caching won't disrupt the sound
-void QDECL Com_Error( int level, const char *error, ... ) {
+void QDECL Com_Error( int level, const char *error, ... )
+{
va_list argptr;
char text[1024];
- va_start (argptr, error);
- vsprintf (text, error, argptr);
- va_end (argptr);
+ va_start ( argptr, error );
+ vsprintf ( text, error, argptr );
+ va_end ( argptr );
- trap_Error( va("%s", text) );
+ trap_Error( va( "%s", text ) );
}
-void QDECL Com_Printf( const char *msg, ... ) {
+void QDECL Com_Printf( const char *msg, ... )
+{
va_list argptr;
char text[1024];
- va_start (argptr, msg);
- vsprintf (text, msg, argptr);
- va_end (argptr);
+ va_start ( argptr, msg );
+ vsprintf ( text, msg, argptr );
+ va_end ( argptr );
- trap_Print( va("%s", text) );
+ trap_Print( va( "%s", text ) );
}
@@ -60,8 +62,10 @@ UI_ClampCvar
*/
float UI_ClampCvar( float min, float max, float value )
{
- if ( value < min ) return min;
- if ( value > max ) return max;
+ if( value < min ) return min;
+
+ if( value > max ) return max;
+
return value;
}
@@ -70,11 +74,13 @@ float UI_ClampCvar( float min, float max, float value )
UI_StartDemoLoop
=================
*/
-void UI_StartDemoLoop( void ) {
+void UI_StartDemoLoop( void )
+{
trap_Cmd_ExecuteText( EXEC_APPEND, "d1\n" );
}
-char *UI_Argv( int arg ) {
+char *UI_Argv( int arg )
+{
static char buffer[MAX_STRING_CHARS];
trap_Argv( arg, buffer, sizeof( buffer ) );
@@ -83,7 +89,8 @@ char *UI_Argv( int arg ) {
}
-char *UI_Cvar_VariableString( const char *var_name ) {
+char *UI_Cvar_VariableString( const char *var_name )
+{
static char buffer[MAX_STRING_CHARS];
trap_Cvar_VariableStringBuffer( var_name, buffer, sizeof( buffer ) );
@@ -91,20 +98,21 @@ char *UI_Cvar_VariableString( const char *var_name ) {
return buffer;
}
-static void UI_Cache_f( void ) {
+static void UI_Cache_f( void )
+{
Display_CacheAll();
}
/*
=================
UI_ConsoleCommand
-
+
FIXME: lookup table
=================
*/
qboolean UI_ConsoleCommand( int realTime )
{
- char *cmd;
+ char * cmd;
char *arg1;
uiInfo.uiDC.frameTime = realTime - uiInfo.uiDC.realTime;
@@ -115,38 +123,45 @@ qboolean UI_ConsoleCommand( int realTime )
// ensure minimum menu data is available
//Menu_Cache();
- if ( Q_stricmp (cmd, "ui_report") == 0 ) {
+ if( Q_stricmp ( cmd, "ui_report" ) == 0 )
+ {
UI_Report();
return qtrue;
}
- if ( Q_stricmp (cmd, "ui_load") == 0 ) {
+ if( Q_stricmp ( cmd, "ui_load" ) == 0 )
+ {
UI_Load();
return qtrue;
}
- if ( Q_stricmp (cmd, "remapShader") == 0 ) {
- if (trap_Argc() == 4) {
+ if( Q_stricmp ( cmd, "remapShader" ) == 0 )
+ {
+ if( trap_Argc() == 4 )
+ {
char shader1[MAX_QPATH];
char shader2[MAX_QPATH];
- Q_strncpyz(shader1, UI_Argv(1), sizeof(shader1));
- Q_strncpyz(shader2, UI_Argv(2), sizeof(shader2));
- trap_R_RemapShader(shader1, shader2, UI_Argv(3));
+ Q_strncpyz( shader1, UI_Argv( 1 ), sizeof( shader1 ) );
+ Q_strncpyz( shader2, UI_Argv( 2 ), sizeof( shader2 ) );
+ trap_R_RemapShader( shader1, shader2, UI_Argv( 3 ) );
return qtrue;
}
}
- if ( Q_stricmp (cmd, "ui_cache") == 0 ) {
+ if( Q_stricmp ( cmd, "ui_cache" ) == 0 )
+ {
UI_Cache_f();
return qtrue;
}
- if ( Q_stricmp (cmd, "ui_teamOrders") == 0 ) {
+ if( Q_stricmp ( cmd, "ui_teamOrders" ) == 0 )
+ {
//UI_TeamOrdersMenu_f();
return qtrue;
}
- if ( Q_strncmp( cmd, "messagemode", 11 ) == 0 ) {
+ if( Q_strncmp( cmd, "messagemode", 11 ) == 0 )
+ {
trap_Cvar_Set( "ui_sayBuffer", "" );
switch( cmd[ 11 ] )
@@ -197,7 +212,8 @@ qboolean UI_ConsoleCommand( int realTime )
return qfalse;
}
-void UI_DrawNamedPic( float x, float y, float width, float height, const char *picname ) {
+void UI_DrawNamedPic( float x, float y, float width, float height, const char *picname )
+{
qhandle_t hShader;
hShader = trap_R_RegisterShaderNoMip( picname );
@@ -205,28 +221,33 @@ void UI_DrawNamedPic( float x, float y, float width, float height, const char *p
trap_R_DrawStretchPic( x, y, width, height, 0, 0, 1, 1, hShader );
}
-void UI_DrawHandlePic( float x, float y, float w, float h, qhandle_t hShader ) {
+void UI_DrawHandlePic( float x, float y, float w, float h, qhandle_t hShader )
+{
float s0;
float s1;
float t0;
float t1;
- if( w < 0 ) { // flip about vertical
+ if( w < 0 )
+ { // flip about vertical
w = -w;
s0 = 1;
s1 = 0;
}
- else {
+ else
+ {
s0 = 0;
s1 = 1;
}
- if( h < 0 ) { // flip about horizontal
+ if( h < 0 )
+ { // flip about horizontal
h = -h;
t0 = 1;
t1 = 0;
}
- else {
+ else
+ {
t0 = 0;
t1 = 1;
}
@@ -238,11 +259,12 @@ void UI_DrawHandlePic( float x, float y, float w, float h, qhandle_t hShader ) {
/*
================
UI_FillRect
-
+
Coordinates are 640*480 virtual values
=================
*/
-void UI_FillRect( float x, float y, float width, float height, const float *color ) {
+void UI_FillRect( float x, float y, float width, float height, const float *color )
+{
trap_R_SetColor( color );
UI_AdjustFrom640( &x, &y, &width, &height );
@@ -251,6 +273,7 @@ void UI_FillRect( float x, float y, float width, float height, const float *colo
trap_R_SetColor( NULL );
}
-void UI_SetColor( const float *rgba ) {
+void UI_SetColor( const float *rgba )
+{
trap_R_SetColor( rgba );
}