mirror of
https://github.com/UberGames/rpgxEF.git
synced 2025-04-19 07:21:12 +00:00
more ui updates
This commit is contained in:
Walter Julius Hennecke
parent
636d72a1c9
commit
71bdb3d0b8
8 changed files with 3419 additions and 3447 deletions
|
|
@ -367,14 +367,6 @@
|
|||
<Optimization Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">MaxSpeed</Optimization>
|
||||
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">WIN32;NDEBUG;_WINDOWS;_MBCS;_USRDLL;UI_EXPORTS</PreprocessorDefinitions>
|
||||
</ClCompile>
|
||||
<ClCompile Include="ui_removebots.c">
|
||||
<Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
|
||||
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">WIN32;_DEBUG;_WINDOWS;_MBCS;_USRDLL;UI_EXPORTS</PreprocessorDefinitions>
|
||||
<BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">EnableFastChecks</BasicRuntimeChecks>
|
||||
<BrowseInformation Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</BrowseInformation>
|
||||
<Optimization Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">MaxSpeed</Optimization>
|
||||
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">WIN32;NDEBUG;_WINDOWS;_MBCS;_USRDLL;UI_EXPORTS</PreprocessorDefinitions>
|
||||
</ClCompile>
|
||||
<ClCompile Include="ui_serverinfo.c">
|
||||
<Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
|
||||
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">WIN32;_DEBUG;_WINDOWS;_MBCS;_USRDLL;UI_EXPORTS</PreprocessorDefinitions>
|
||||
|
|
@ -399,14 +391,6 @@
|
|||
<Optimization Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">MaxSpeed</Optimization>
|
||||
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">WIN32;NDEBUG;_WINDOWS;_MBCS;_USRDLL;UI_EXPORTS</PreprocessorDefinitions>
|
||||
</ClCompile>
|
||||
<ClCompile Include="ui_sparena.c">
|
||||
<Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
|
||||
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">WIN32;_DEBUG;_WINDOWS;_MBCS;_USRDLL;UI_EXPORTS</PreprocessorDefinitions>
|
||||
<BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">EnableFastChecks</BasicRuntimeChecks>
|
||||
<BrowseInformation Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</BrowseInformation>
|
||||
<Optimization Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">MaxSpeed</Optimization>
|
||||
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">WIN32;NDEBUG;_WINDOWS;_MBCS;_USRDLL;UI_EXPORTS</PreprocessorDefinitions>
|
||||
</ClCompile>
|
||||
<ClCompile Include="ui_specifyserver.c">
|
||||
<Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
|
||||
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">WIN32;_DEBUG;_WINDOWS;_MBCS;_USRDLL;UI_EXPORTS</PreprocessorDefinitions>
|
||||
|
|
@ -415,30 +399,6 @@
|
|||
<Optimization Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">MaxSpeed</Optimization>
|
||||
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">WIN32;NDEBUG;_WINDOWS;_MBCS;_USRDLL;UI_EXPORTS</PreprocessorDefinitions>
|
||||
</ClCompile>
|
||||
<ClCompile Include="ui_splevel.c">
|
||||
<Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
|
||||
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">WIN32;_DEBUG;_WINDOWS;_MBCS;_USRDLL;UI_EXPORTS</PreprocessorDefinitions>
|
||||
<BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">EnableFastChecks</BasicRuntimeChecks>
|
||||
<BrowseInformation Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</BrowseInformation>
|
||||
<Optimization Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">MaxSpeed</Optimization>
|
||||
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">WIN32;NDEBUG;_WINDOWS;_MBCS;_USRDLL;UI_EXPORTS</PreprocessorDefinitions>
|
||||
</ClCompile>
|
||||
<ClCompile Include="ui_sppostgame.c">
|
||||
<Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
|
||||
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">WIN32;_DEBUG;_WINDOWS;_MBCS;_USRDLL;UI_EXPORTS</PreprocessorDefinitions>
|
||||
<BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">EnableFastChecks</BasicRuntimeChecks>
|
||||
<BrowseInformation Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</BrowseInformation>
|
||||
<Optimization Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">MaxSpeed</Optimization>
|
||||
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">WIN32;NDEBUG;_WINDOWS;_MBCS;_USRDLL;UI_EXPORTS</PreprocessorDefinitions>
|
||||
</ClCompile>
|
||||
<ClCompile Include="ui_spskill.c">
|
||||
<Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
|
||||
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">WIN32;_DEBUG;_WINDOWS;_MBCS;_USRDLL;UI_EXPORTS</PreprocessorDefinitions>
|
||||
<BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">EnableFastChecks</BasicRuntimeChecks>
|
||||
<BrowseInformation Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</BrowseInformation>
|
||||
<Optimization Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">MaxSpeed</Optimization>
|
||||
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">WIN32;NDEBUG;_WINDOWS;_MBCS;_USRDLL;UI_EXPORTS</PreprocessorDefinitions>
|
||||
</ClCompile>
|
||||
<ClCompile Include="ui_sql.c" />
|
||||
<ClCompile Include="ui_startserver.c">
|
||||
<Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
|
||||
|
|
|
|||
|
|
@ -95,9 +95,6 @@
|
|||
<ClCompile Include="ui_qmenu.c">
|
||||
<Filter>Source Files</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="ui_removebots.c">
|
||||
<Filter>Source Files</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="ui_serverinfo.c">
|
||||
<Filter>Source Files</Filter>
|
||||
</ClCompile>
|
||||
|
|
@ -107,21 +104,9 @@
|
|||
<ClCompile Include="ui_sound.c">
|
||||
<Filter>Source Files</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="ui_sparena.c">
|
||||
<Filter>Source Files</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="ui_specifyserver.c">
|
||||
<Filter>Source Files</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="ui_splevel.c">
|
||||
<Filter>Source Files</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="ui_sppostgame.c">
|
||||
<Filter>Source Files</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="ui_spskill.c">
|
||||
<Filter>Source Files</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="ui_startserver.c">
|
||||
<Filter>Source Files</Filter>
|
||||
</ClCompile>
|
||||
|
|
|
|||
|
|
@ -3,12 +3,16 @@
|
|||
#include "ui_local.h"
|
||||
#include "ui_logger.h"
|
||||
|
||||
#define MAX_VIDEODRIVER_LINES 20
|
||||
enum ui_serverinfoLimits_e {
|
||||
MAX_VIDEODRIVER_LINES = 20
|
||||
};
|
||||
|
||||
#define ID_ADD 100
|
||||
#define ID_MAINMENU 101
|
||||
#define ID_ARROWUP 102
|
||||
#define ID_ARROWDWN 103
|
||||
enum ui_serverinfoIDs_e {
|
||||
ID_ADD = 100,
|
||||
ID_MAINMENU,
|
||||
ID_ARROWUP,
|
||||
ID_ARROWDWN
|
||||
};
|
||||
|
||||
|
||||
typedef struct
|
||||
|
|
@ -18,7 +22,7 @@ typedef struct
|
|||
menubitmap_s add;
|
||||
char info[MAX_INFO_STRING];
|
||||
qhandle_t cornerLower;
|
||||
int32_t lineCnt;
|
||||
int32_t lineCnt;
|
||||
int32_t lineStartCnt;
|
||||
menubitmap_s arrowdwn;
|
||||
menubitmap_s arrowup;
|
||||
|
|
@ -68,7 +72,7 @@ typedef struct
|
|||
|
||||
static serverinfo_t s_serverinfo;
|
||||
|
||||
static void ServerInfo_LinePrep( void);
|
||||
static void ServerInfo_LinePrep(void);
|
||||
|
||||
/*
|
||||
=================
|
||||
|
|
@ -77,7 +81,7 @@ Favorites_Add
|
|||
Add current server to favorites
|
||||
=================
|
||||
*/
|
||||
void Favorites_Add( void )
|
||||
void Favorites_Add(void)
|
||||
{
|
||||
UI_LogFuncBegin();
|
||||
char adrstr[128];
|
||||
|
|
@ -85,30 +89,30 @@ void Favorites_Add( void )
|
|||
int32_t i;
|
||||
int32_t best;
|
||||
|
||||
trap_Cvar_VariableStringBuffer( "cl_currentServerAddress", serverbuff, sizeof(serverbuff) );
|
||||
trap_Cvar_VariableStringBuffer("cl_currentServerAddress", serverbuff, sizeof(serverbuff));
|
||||
if (!serverbuff[0]){
|
||||
UI_LogFuncEnd();
|
||||
return;
|
||||
}
|
||||
|
||||
best = 0;
|
||||
for (i=0; i<MAX_FAVORITESERVERS; i++)
|
||||
for (i = 0; i < MAX_FAVORITESERVERS; i++)
|
||||
{
|
||||
trap_Cvar_VariableStringBuffer( va("server%d",i+1), adrstr, sizeof(adrstr) );
|
||||
if (!Q_stricmp(serverbuff,adrstr))
|
||||
trap_Cvar_VariableStringBuffer(va("server%d", i + 1), adrstr, sizeof(adrstr));
|
||||
if (!Q_stricmp(serverbuff, adrstr))
|
||||
{
|
||||
// already in list
|
||||
UI_LogFuncEnd();
|
||||
return;
|
||||
}
|
||||
|
||||
|
||||
// use first empty or non-numeric available slot
|
||||
if ((adrstr[0] < '0' || adrstr[0] > '9' ) && !best)
|
||||
best = i+1;
|
||||
if ((adrstr[0] < '0' || adrstr[0] > '9') && !best)
|
||||
best = i + 1;
|
||||
}
|
||||
|
||||
if (best)
|
||||
trap_Cvar_Set( va("server%d",best), serverbuff);
|
||||
trap_Cvar_Set(va("server%d", best), serverbuff);
|
||||
UI_LogFuncEnd();
|
||||
|
||||
}
|
||||
|
|
@ -119,60 +123,60 @@ void Favorites_Add( void )
|
|||
ServerInfo_Event
|
||||
=================
|
||||
*/
|
||||
static void ServerInfo_Event( void* ptr, int32_t event )
|
||||
static void ServerInfo_Event(void* ptr, int32_t event)
|
||||
{
|
||||
UI_LogFuncBegin();
|
||||
switch (((menucommon_s*)ptr)->id)
|
||||
{
|
||||
case ID_ADD:
|
||||
if (event != QM_ACTIVATED)
|
||||
break;
|
||||
|
||||
Favorites_Add();
|
||||
UI_PopMenu();
|
||||
case ID_ADD:
|
||||
if (event != QM_ACTIVATED)
|
||||
break;
|
||||
|
||||
case ID_MAINMENU:
|
||||
if (event != QM_ACTIVATED)
|
||||
break;
|
||||
Favorites_Add();
|
||||
UI_PopMenu();
|
||||
break;
|
||||
|
||||
UI_PopMenu();
|
||||
case ID_MAINMENU:
|
||||
if (event != QM_ACTIVATED)
|
||||
break;
|
||||
|
||||
case ID_ARROWUP:
|
||||
if (event != QM_ACTIVATED)
|
||||
break;
|
||||
s_serverinfo.lineStartCnt--;
|
||||
if (s_serverinfo.lineStartCnt>=0)
|
||||
{
|
||||
ServerInfo_LinePrep();
|
||||
s_serverinfo.arrowdwn.generic.flags &= ~QMF_HIDDEN;
|
||||
s_serverinfo.arrowdwn.generic.flags &= ~QMF_INACTIVE;
|
||||
}
|
||||
else
|
||||
{
|
||||
s_serverinfo.arrowup.generic.flags |= QMF_HIDDEN|QMF_INACTIVE;
|
||||
s_serverinfo.lineStartCnt=0;
|
||||
}
|
||||
break;
|
||||
UI_PopMenu();
|
||||
break;
|
||||
|
||||
case ID_ARROWDWN:
|
||||
if (event != QM_ACTIVATED)
|
||||
break;
|
||||
s_serverinfo.lineStartCnt++;
|
||||
if ((s_serverinfo.lineStartCnt + MAX_VIDEODRIVER_LINES) <=s_serverinfo.lineCnt)
|
||||
{
|
||||
ServerInfo_LinePrep();
|
||||
s_serverinfo.arrowup.generic.flags &= ~QMF_HIDDEN;
|
||||
s_serverinfo.arrowup.generic.flags &= ~QMF_INACTIVE;
|
||||
}
|
||||
else
|
||||
{
|
||||
s_serverinfo.arrowdwn.generic.flags |= QMF_HIDDEN|QMF_INACTIVE;
|
||||
|
||||
s_serverinfo.lineStartCnt = s_serverinfo.lineCnt - MAX_VIDEODRIVER_LINES;
|
||||
}
|
||||
case ID_ARROWUP:
|
||||
if (event != QM_ACTIVATED)
|
||||
break;
|
||||
s_serverinfo.lineStartCnt--;
|
||||
if (s_serverinfo.lineStartCnt >= 0)
|
||||
{
|
||||
ServerInfo_LinePrep();
|
||||
s_serverinfo.arrowdwn.generic.flags &= ~QMF_HIDDEN;
|
||||
s_serverinfo.arrowdwn.generic.flags &= ~QMF_INACTIVE;
|
||||
}
|
||||
else
|
||||
{
|
||||
s_serverinfo.arrowup.generic.flags |= QMF_HIDDEN | QMF_INACTIVE;
|
||||
s_serverinfo.lineStartCnt = 0;
|
||||
}
|
||||
break;
|
||||
|
||||
case ID_ARROWDWN:
|
||||
if (event != QM_ACTIVATED)
|
||||
break;
|
||||
s_serverinfo.lineStartCnt++;
|
||||
if ((s_serverinfo.lineStartCnt + MAX_VIDEODRIVER_LINES) <= s_serverinfo.lineCnt)
|
||||
{
|
||||
ServerInfo_LinePrep();
|
||||
s_serverinfo.arrowup.generic.flags &= ~QMF_HIDDEN;
|
||||
s_serverinfo.arrowup.generic.flags &= ~QMF_INACTIVE;
|
||||
}
|
||||
else
|
||||
{
|
||||
s_serverinfo.arrowdwn.generic.flags |= QMF_HIDDEN | QMF_INACTIVE;
|
||||
|
||||
s_serverinfo.lineStartCnt = s_serverinfo.lineCnt - MAX_VIDEODRIVER_LINES;
|
||||
}
|
||||
break;
|
||||
|
||||
}
|
||||
UI_LogFuncEnd();
|
||||
|
|
@ -183,17 +187,17 @@ static void ServerInfo_Event( void* ptr, int32_t event )
|
|||
ServerInfoMenu_Graphics
|
||||
=================
|
||||
*/
|
||||
void ServerInfoMenu_Graphics (void)
|
||||
void ServerInfoMenu_Graphics(void)
|
||||
{
|
||||
UI_LogFuncBegin();
|
||||
// Draw the basic screen layout
|
||||
UI_MenuFrame2(&s_serverinfo.menu);
|
||||
|
||||
trap_R_SetColor( colorTable[CT_LTPURPLE1]);
|
||||
UI_DrawHandlePic(30,202, 47, 188, uis.whiteShader);
|
||||
trap_R_SetColor(colorTable[CT_LTPURPLE1]);
|
||||
UI_DrawHandlePic(30, 202, 47, 188, uis.whiteShader);
|
||||
|
||||
trap_R_SetColor( colorTable[CT_LTPURPLE1]);
|
||||
UI_DrawHandlePic(250,400, 180, 20, uis.whiteShader);
|
||||
trap_R_SetColor(colorTable[CT_LTPURPLE1]);
|
||||
UI_DrawHandlePic(250, 400, 180, 20, uis.whiteShader);
|
||||
UI_LogFuncEnd();
|
||||
}
|
||||
|
||||
|
|
@ -202,12 +206,12 @@ void ServerInfoMenu_Graphics (void)
|
|||
ServerInfo_MenuDraw
|
||||
=================
|
||||
*/
|
||||
static void ServerInfo_MenuDraw( void )
|
||||
static void ServerInfo_MenuDraw(void)
|
||||
{
|
||||
UI_LogFuncBegin();
|
||||
ServerInfoMenu_Graphics();
|
||||
|
||||
Menu_Draw( &s_serverinfo.menu );
|
||||
Menu_Draw(&s_serverinfo.menu);
|
||||
UI_LogFuncEnd();
|
||||
}
|
||||
|
||||
|
|
@ -217,7 +221,7 @@ static void ServerInfo_MenuDraw( void )
|
|||
ServerInfo_LinePrep
|
||||
=================
|
||||
*/
|
||||
static void ServerInfo_LinePrep( void)
|
||||
static void ServerInfo_LinePrep(void)
|
||||
{
|
||||
UI_LogFuncBegin();
|
||||
int32_t i;
|
||||
|
|
@ -227,16 +231,16 @@ static void ServerInfo_LinePrep( void)
|
|||
|
||||
s = s_serverinfo.info;
|
||||
s_serverinfo.lineCnt = 0;
|
||||
i=0;
|
||||
while ( s )
|
||||
i = 0;
|
||||
while (s)
|
||||
{
|
||||
Info_NextPair( &s, key, value );
|
||||
Info_NextPair(&s, key, value);
|
||||
if (!key[0])
|
||||
{
|
||||
break;
|
||||
}
|
||||
|
||||
Q_strcat( key, MAX_INFO_KEY, ":" );
|
||||
Q_strcat(key, MAX_INFO_KEY, ":");
|
||||
|
||||
if ((s_serverinfo.lineStartCnt <= s_serverinfo.lineCnt) && (i < MAX_VIDEODRIVER_LINES))
|
||||
{
|
||||
|
|
@ -255,9 +259,9 @@ static void ServerInfo_LinePrep( void)
|
|||
ServerInfo_MenuKey
|
||||
=================
|
||||
*/
|
||||
static sfxHandle_t ServerInfo_MenuKey( int32_t key )
|
||||
static sfxHandle_t ServerInfo_MenuKey(int32_t key)
|
||||
{
|
||||
return ( Menu_DefaultKey( &s_serverinfo.menu, key ) );
|
||||
return (Menu_DefaultKey(&s_serverinfo.menu, key));
|
||||
}
|
||||
|
||||
/*
|
||||
|
|
@ -265,7 +269,7 @@ static sfxHandle_t ServerInfo_MenuKey( int32_t key )
|
|||
ServerInfo_Cache
|
||||
=================
|
||||
*/
|
||||
void ServerInfo_Cache( void )
|
||||
void ServerInfo_Cache(void)
|
||||
{
|
||||
s_serverinfo.cornerLower = trap_R_RegisterShaderNoMip("menu/common/corner_ll_47_18.tga");
|
||||
|
||||
|
|
@ -276,105 +280,105 @@ void ServerInfo_Cache( void )
|
|||
PlayerSettings_MenuInit
|
||||
=================
|
||||
*/
|
||||
static void UI_ServerInfoMenu_Init(void)
|
||||
static void UI_ServerInfoMenu_Init(void)
|
||||
{
|
||||
UI_LogFuncBegin();
|
||||
int32_t i,x,y;
|
||||
menutext_s *hold_key,*hold_value;
|
||||
int32_t i, x, y;
|
||||
menutext_s *hold_key, *hold_value;
|
||||
|
||||
// zero set all our globals
|
||||
memset( &s_serverinfo, 0 ,sizeof(serverinfo_t) );
|
||||
memset(&s_serverinfo, 0, sizeof(serverinfo_t));
|
||||
|
||||
ServerInfo_Cache();
|
||||
|
||||
s_serverinfo.menu.draw = ServerInfo_MenuDraw;
|
||||
s_serverinfo.menu.key = ServerInfo_MenuKey;
|
||||
s_serverinfo.menu.wrapAround = qtrue;
|
||||
s_serverinfo.menu.fullscreen = qtrue;
|
||||
s_serverinfo.menu.nitems = 0;
|
||||
s_serverinfo.menu.descX = MENU_DESC_X;
|
||||
s_serverinfo.menu.descY = MENU_DESC_Y;
|
||||
s_serverinfo.menu.listX = 230;
|
||||
s_serverinfo.menu.listY = 188;
|
||||
s_serverinfo.menu.titleX = MENU_TITLE_X;
|
||||
s_serverinfo.menu.titleY = MENU_TITLE_Y;
|
||||
s_serverinfo.menu.titleI = MNT_SERVERINFO_TITLE;
|
||||
s_serverinfo.menu.footNoteEnum = MNT_SERVERINFO;
|
||||
s_serverinfo.menu.draw = ServerInfo_MenuDraw;
|
||||
s_serverinfo.menu.key = ServerInfo_MenuKey;
|
||||
s_serverinfo.menu.wrapAround = qtrue;
|
||||
s_serverinfo.menu.fullscreen = qtrue;
|
||||
s_serverinfo.menu.nitems = 0;
|
||||
s_serverinfo.menu.descX = MENU_DESC_X;
|
||||
s_serverinfo.menu.descY = MENU_DESC_Y;
|
||||
s_serverinfo.menu.listX = 230;
|
||||
s_serverinfo.menu.listY = 188;
|
||||
s_serverinfo.menu.titleX = MENU_TITLE_X;
|
||||
s_serverinfo.menu.titleY = MENU_TITLE_Y;
|
||||
s_serverinfo.menu.titleI = MNT_SERVERINFO_TITLE;
|
||||
s_serverinfo.menu.footNoteEnum = MNT_SERVERINFO;
|
||||
|
||||
y = 400;
|
||||
// Button Data
|
||||
s_serverinfo.mainmenu.generic.type = MTYPE_BITMAP;
|
||||
s_serverinfo.mainmenu.generic.flags = QMF_HIGHLIGHT_IF_FOCUS;
|
||||
s_serverinfo.mainmenu.generic.x = 90;
|
||||
s_serverinfo.mainmenu.generic.y = 400;
|
||||
s_serverinfo.mainmenu.generic.name = GRAPHIC_SQUARE;
|
||||
s_serverinfo.mainmenu.generic.id = ID_MAINMENU;
|
||||
s_serverinfo.mainmenu.generic.callback = ServerInfo_Event;
|
||||
s_serverinfo.mainmenu.width = MENU_BUTTON_MED_WIDTH;
|
||||
s_serverinfo.mainmenu.height = MENU_BUTTON_MED_HEIGHT;
|
||||
s_serverinfo.mainmenu.color = CT_DKPURPLE1;
|
||||
s_serverinfo.mainmenu.color2 = CT_LTPURPLE1;
|
||||
s_serverinfo.mainmenu.textX = MENU_BUTTON_TEXT_X;
|
||||
s_serverinfo.mainmenu.textY = MENU_BUTTON_TEXT_Y;
|
||||
s_serverinfo.mainmenu.textEnum = MBT_INGAMEMENU;
|
||||
s_serverinfo.mainmenu.textcolor = CT_BLACK;
|
||||
s_serverinfo.mainmenu.textcolor2 = CT_WHITE;
|
||||
s_serverinfo.mainmenu.generic.type = MTYPE_BITMAP;
|
||||
s_serverinfo.mainmenu.generic.flags = QMF_HIGHLIGHT_IF_FOCUS;
|
||||
s_serverinfo.mainmenu.generic.x = 90;
|
||||
s_serverinfo.mainmenu.generic.y = 400;
|
||||
s_serverinfo.mainmenu.generic.name = GRAPHIC_SQUARE;
|
||||
s_serverinfo.mainmenu.generic.id = ID_MAINMENU;
|
||||
s_serverinfo.mainmenu.generic.callback = ServerInfo_Event;
|
||||
s_serverinfo.mainmenu.width = MENU_BUTTON_MED_WIDTH;
|
||||
s_serverinfo.mainmenu.height = MENU_BUTTON_MED_HEIGHT;
|
||||
s_serverinfo.mainmenu.color = CT_DKPURPLE1;
|
||||
s_serverinfo.mainmenu.color2 = CT_LTPURPLE1;
|
||||
s_serverinfo.mainmenu.textX = MENU_BUTTON_TEXT_X;
|
||||
s_serverinfo.mainmenu.textY = MENU_BUTTON_TEXT_Y;
|
||||
s_serverinfo.mainmenu.textEnum = MBT_INGAMEMENU;
|
||||
s_serverinfo.mainmenu.textcolor = CT_BLACK;
|
||||
s_serverinfo.mainmenu.textcolor2 = CT_WHITE;
|
||||
|
||||
s_serverinfo.add.generic.type = MTYPE_BITMAP;
|
||||
s_serverinfo.add.generic.flags = QMF_HIGHLIGHT_IF_FOCUS;
|
||||
s_serverinfo.add.generic.x = 460;
|
||||
s_serverinfo.add.generic.y = y;
|
||||
s_serverinfo.add.generic.name = GRAPHIC_SQUARE;
|
||||
s_serverinfo.add.generic.id = ID_ADD;
|
||||
s_serverinfo.add.generic.callback = ServerInfo_Event;
|
||||
s_serverinfo.add.width = MENU_BUTTON_MED_WIDTH;
|
||||
s_serverinfo.add.height = MENU_BUTTON_MED_HEIGHT;
|
||||
s_serverinfo.add.color = CT_DKPURPLE1;
|
||||
s_serverinfo.add.color2 = CT_LTPURPLE1;
|
||||
s_serverinfo.add.textX = MENU_BUTTON_TEXT_X;
|
||||
s_serverinfo.add.textY = MENU_BUTTON_TEXT_Y;
|
||||
s_serverinfo.add.textEnum = MBT_ADDTOFAVS;
|
||||
s_serverinfo.add.textcolor = CT_BLACK;
|
||||
s_serverinfo.add.textcolor2 = CT_WHITE;
|
||||
|
||||
s_serverinfo.arrowup.generic.type = MTYPE_BITMAP;
|
||||
s_serverinfo.arrowup.generic.flags = QMF_HIGHLIGHT_IF_FOCUS;
|
||||
s_serverinfo.arrowup.generic.x = 270;
|
||||
s_serverinfo.arrowup.generic.y = y+2;
|
||||
s_serverinfo.arrowup.generic.name = "menu/common/arrow_up_16.tga";
|
||||
s_serverinfo.arrowup.generic.id = ID_ARROWUP;
|
||||
s_serverinfo.arrowup.generic.callback = ServerInfo_Event;
|
||||
s_serverinfo.arrowup.width = 16;
|
||||
s_serverinfo.arrowup.height = 16;
|
||||
s_serverinfo.arrowup.color = CT_DKBLUE1;
|
||||
s_serverinfo.arrowup.color2 = CT_LTBLUE1;
|
||||
s_serverinfo.arrowup.textX = 0;
|
||||
s_serverinfo.arrowup.textY = 0;
|
||||
s_serverinfo.arrowup.textEnum = MBT_NONE;
|
||||
s_serverinfo.arrowup.textcolor = CT_BLACK;
|
||||
s_serverinfo.arrowup.textcolor2 = CT_WHITE;
|
||||
s_serverinfo.add.generic.type = MTYPE_BITMAP;
|
||||
s_serverinfo.add.generic.flags = QMF_HIGHLIGHT_IF_FOCUS;
|
||||
s_serverinfo.add.generic.x = 460;
|
||||
s_serverinfo.add.generic.y = y;
|
||||
s_serverinfo.add.generic.name = GRAPHIC_SQUARE;
|
||||
s_serverinfo.add.generic.id = ID_ADD;
|
||||
s_serverinfo.add.generic.callback = ServerInfo_Event;
|
||||
s_serverinfo.add.width = MENU_BUTTON_MED_WIDTH;
|
||||
s_serverinfo.add.height = MENU_BUTTON_MED_HEIGHT;
|
||||
s_serverinfo.add.color = CT_DKPURPLE1;
|
||||
s_serverinfo.add.color2 = CT_LTPURPLE1;
|
||||
s_serverinfo.add.textX = MENU_BUTTON_TEXT_X;
|
||||
s_serverinfo.add.textY = MENU_BUTTON_TEXT_Y;
|
||||
s_serverinfo.add.textEnum = MBT_ADDTOFAVS;
|
||||
s_serverinfo.add.textcolor = CT_BLACK;
|
||||
s_serverinfo.add.textcolor2 = CT_WHITE;
|
||||
|
||||
s_serverinfo.arrowdwn.generic.type = MTYPE_BITMAP;
|
||||
s_serverinfo.arrowdwn.generic.flags = QMF_HIGHLIGHT_IF_FOCUS;
|
||||
s_serverinfo.arrowdwn.generic.x = 394;
|
||||
s_serverinfo.arrowdwn.generic.y = y+2;
|
||||
s_serverinfo.arrowdwn.generic.name = "menu/common/arrow_dn_16.tga";
|
||||
s_serverinfo.arrowdwn.generic.id = ID_ARROWDWN;
|
||||
s_serverinfo.arrowdwn.generic.callback = ServerInfo_Event;
|
||||
s_serverinfo.arrowdwn.width = 16;
|
||||
s_serverinfo.arrowdwn.height = 16;
|
||||
s_serverinfo.arrowdwn.color = CT_DKBLUE1;
|
||||
s_serverinfo.arrowdwn.color2 = CT_LTBLUE1;
|
||||
s_serverinfo.arrowdwn.textX = 0;
|
||||
s_serverinfo.arrowdwn.textY = 0;
|
||||
s_serverinfo.arrowdwn.textEnum = MBT_NONE;
|
||||
s_serverinfo.arrowdwn.textcolor = CT_BLACK;
|
||||
s_serverinfo.arrowdwn.textcolor2 = CT_WHITE;
|
||||
s_serverinfo.arrowup.generic.type = MTYPE_BITMAP;
|
||||
s_serverinfo.arrowup.generic.flags = QMF_HIGHLIGHT_IF_FOCUS;
|
||||
s_serverinfo.arrowup.generic.x = 270;
|
||||
s_serverinfo.arrowup.generic.y = y + 2;
|
||||
s_serverinfo.arrowup.generic.name = "menu/common/arrow_up_16.tga";
|
||||
s_serverinfo.arrowup.generic.id = ID_ARROWUP;
|
||||
s_serverinfo.arrowup.generic.callback = ServerInfo_Event;
|
||||
s_serverinfo.arrowup.width = 16;
|
||||
s_serverinfo.arrowup.height = 16;
|
||||
s_serverinfo.arrowup.color = CT_DKBLUE1;
|
||||
s_serverinfo.arrowup.color2 = CT_LTBLUE1;
|
||||
s_serverinfo.arrowup.textX = 0;
|
||||
s_serverinfo.arrowup.textY = 0;
|
||||
s_serverinfo.arrowup.textEnum = MBT_NONE;
|
||||
s_serverinfo.arrowup.textcolor = CT_BLACK;
|
||||
s_serverinfo.arrowup.textcolor2 = CT_WHITE;
|
||||
|
||||
Menu_AddItem( &s_serverinfo.menu, (void*) &s_serverinfo.mainmenu );
|
||||
Menu_AddItem( &s_serverinfo.menu, (void*) &s_serverinfo.add );
|
||||
Menu_AddItem( &s_serverinfo.menu,( void * ) &s_serverinfo.arrowup);
|
||||
Menu_AddItem( &s_serverinfo.menu, ( void * ) &s_serverinfo.arrowdwn);
|
||||
s_serverinfo.arrowdwn.generic.type = MTYPE_BITMAP;
|
||||
s_serverinfo.arrowdwn.generic.flags = QMF_HIGHLIGHT_IF_FOCUS;
|
||||
s_serverinfo.arrowdwn.generic.x = 394;
|
||||
s_serverinfo.arrowdwn.generic.y = y + 2;
|
||||
s_serverinfo.arrowdwn.generic.name = "menu/common/arrow_dn_16.tga";
|
||||
s_serverinfo.arrowdwn.generic.id = ID_ARROWDWN;
|
||||
s_serverinfo.arrowdwn.generic.callback = ServerInfo_Event;
|
||||
s_serverinfo.arrowdwn.width = 16;
|
||||
s_serverinfo.arrowdwn.height = 16;
|
||||
s_serverinfo.arrowdwn.color = CT_DKBLUE1;
|
||||
s_serverinfo.arrowdwn.color2 = CT_LTBLUE1;
|
||||
s_serverinfo.arrowdwn.textX = 0;
|
||||
s_serverinfo.arrowdwn.textY = 0;
|
||||
s_serverinfo.arrowdwn.textEnum = MBT_NONE;
|
||||
s_serverinfo.arrowdwn.textcolor = CT_BLACK;
|
||||
s_serverinfo.arrowdwn.textcolor2 = CT_WHITE;
|
||||
|
||||
Menu_AddItem(&s_serverinfo.menu, (void*)&s_serverinfo.mainmenu);
|
||||
Menu_AddItem(&s_serverinfo.menu, (void*)&s_serverinfo.add);
|
||||
Menu_AddItem(&s_serverinfo.menu, (void *)&s_serverinfo.arrowup);
|
||||
Menu_AddItem(&s_serverinfo.menu, (void *)&s_serverinfo.arrowdwn);
|
||||
|
||||
s_serverinfo.lineStartCnt = 0;
|
||||
|
||||
|
|
@ -382,26 +386,26 @@ static void UI_ServerInfoMenu_Init(void)
|
|||
hold_value = &s_serverinfo.value1;
|
||||
y = 62;
|
||||
x = SCREEN_WIDTH*0.50;
|
||||
for (i=0;i<MAX_VIDEODRIVER_LINES;i++)
|
||||
for (i = 0; i < MAX_VIDEODRIVER_LINES; i++)
|
||||
{
|
||||
hold_key->generic.x = x-8;
|
||||
hold_key->generic.y = y;
|
||||
hold_key->generic.type = MTYPE_TEXT;
|
||||
hold_key->generic.flags = UI_RIGHT|UI_SMALLFONT;
|
||||
hold_key->color = colorTable[CT_LTBLUE2];
|
||||
hold_key->string = s_serverinfo.key[i];
|
||||
hold_key->style = UI_RIGHT|UI_SMALLFONT;
|
||||
hold_key->generic.x = x - 8;
|
||||
hold_key->generic.y = y;
|
||||
hold_key->generic.type = MTYPE_TEXT;
|
||||
hold_key->generic.flags = UI_RIGHT | UI_SMALLFONT;
|
||||
hold_key->color = colorTable[CT_LTBLUE2];
|
||||
hold_key->string = s_serverinfo.key[i];
|
||||
hold_key->style = UI_RIGHT | UI_SMALLFONT;
|
||||
|
||||
hold_value->generic.x = x+8;
|
||||
hold_value->generic.y = y;
|
||||
hold_value->generic.type = MTYPE_TEXT;
|
||||
hold_value->generic.flags = UI_LEFT|UI_SMALLFONT;
|
||||
hold_value->color = colorTable[CT_LTGOLD1];
|
||||
hold_value->string = s_serverinfo.value[i];
|
||||
hold_value->style = UI_LEFT|UI_SMALLFONT;
|
||||
hold_value->generic.x = x + 8;
|
||||
hold_value->generic.y = y;
|
||||
hold_value->generic.type = MTYPE_TEXT;
|
||||
hold_value->generic.flags = UI_LEFT | UI_SMALLFONT;
|
||||
hold_value->color = colorTable[CT_LTGOLD1];
|
||||
hold_value->string = s_serverinfo.value[i];
|
||||
hold_value->style = UI_LEFT | UI_SMALLFONT;
|
||||
|
||||
Menu_AddItem( &s_serverinfo.menu, ( void * ) hold_key);
|
||||
Menu_AddItem( &s_serverinfo.menu, ( void * ) hold_value);
|
||||
Menu_AddItem(&s_serverinfo.menu, (void *)hold_key);
|
||||
Menu_AddItem(&s_serverinfo.menu, (void *)hold_value);
|
||||
|
||||
y += SMALLCHAR_HEIGHT;
|
||||
++hold_key;
|
||||
|
|
@ -410,16 +414,16 @@ static void UI_ServerInfoMenu_Init(void)
|
|||
}
|
||||
|
||||
|
||||
if( trap_Cvar_VariableValue( "sv_running" ) )
|
||||
if (trap_Cvar_VariableValue("sv_running"))
|
||||
{
|
||||
s_serverinfo.add.generic.flags |= QMF_GRAYED;
|
||||
}
|
||||
|
||||
trap_GetConfigString( CS_SERVERINFO, s_serverinfo.info, MAX_INFO_STRING );
|
||||
trap_GetConfigString(CS_SERVERINFO, s_serverinfo.info, MAX_INFO_STRING);
|
||||
|
||||
ServerInfo_LinePrep();
|
||||
|
||||
s_serverinfo.arrowup.generic.flags |= QMF_HIDDEN|QMF_INACTIVE;
|
||||
s_serverinfo.arrowup.generic.flags |= QMF_HIDDEN | QMF_INACTIVE;
|
||||
UI_LogFuncEnd();
|
||||
}
|
||||
|
||||
|
|
@ -428,12 +432,12 @@ static void UI_ServerInfoMenu_Init(void)
|
|||
UI_ServerInfoMenu
|
||||
=================
|
||||
*/
|
||||
void UI_ServerInfoMenu( void )
|
||||
void UI_ServerInfoMenu(void)
|
||||
{
|
||||
UI_LogFuncBegin();
|
||||
UI_ServerInfoMenu_Init();
|
||||
|
||||
UI_PushMenu( &s_serverinfo.menu );
|
||||
UI_PushMenu(&s_serverinfo.menu);
|
||||
UI_LogFuncEnd();
|
||||
}
|
||||
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load diff
|
|
@ -7,11 +7,13 @@
|
|||
extern int32_t rate_items[];
|
||||
|
||||
// action identifiers
|
||||
#define ID_EFFECTSVOLUME 14
|
||||
#define ID_MUSICVOLUME 15
|
||||
#define ID_QUALITY 16
|
||||
#define ID_A3D 17
|
||||
#define ID_RATE 18
|
||||
enum ui_soundIDs_e {
|
||||
ID_EFFECTSVOLUME = 14,
|
||||
ID_MUSICVOLUME,
|
||||
ID_QUALITY,
|
||||
ID_A3D,
|
||||
ID_RATE
|
||||
};
|
||||
|
||||
static int32_t s_sndquality_Names[] =
|
||||
{
|
||||
|
|
@ -31,50 +33,50 @@ SOUND OPTIONS MENU
|
|||
=======================================================================
|
||||
*/
|
||||
|
||||
typedef struct
|
||||
typedef struct
|
||||
{
|
||||
menuframework_s menu;
|
||||
menuframework_s menu;
|
||||
|
||||
qhandle_t corner;
|
||||
qhandle_t grid;
|
||||
qhandle_t wave1;
|
||||
qhandle_t wave2;
|
||||
qhandle_t corner;
|
||||
qhandle_t grid;
|
||||
qhandle_t wave1;
|
||||
qhandle_t wave2;
|
||||
|
||||
menulist_s rate;
|
||||
menuslider_s sfxvolume;
|
||||
menuslider_s musicvolume;
|
||||
menulist_s quality;
|
||||
menulist_s a3d;
|
||||
menulist_s rate;
|
||||
menuslider_s sfxvolume;
|
||||
menuslider_s musicvolume;
|
||||
menulist_s quality;
|
||||
menulist_s a3d;
|
||||
|
||||
menubitmap_s back;
|
||||
int32_t holdSoundQuality;
|
||||
int32_t a3dtimer;
|
||||
menubitmap_s back;
|
||||
int32_t holdSoundQuality;
|
||||
int32_t a3dtimer;
|
||||
} soundOptionsInfo_t;
|
||||
|
||||
static soundOptionsInfo_t soundOptionsInfo;
|
||||
|
||||
static void SoundQualityAction( qboolean result )
|
||||
static void SoundQualityAction(qboolean result)
|
||||
{
|
||||
UI_LogFuncBegin();
|
||||
if ( result )
|
||||
if (result)
|
||||
{
|
||||
soundOptionsInfo.holdSoundQuality = soundOptionsInfo.quality.curvalue;
|
||||
if( soundOptionsInfo.quality.curvalue )
|
||||
soundOptionsInfo.holdSoundQuality = soundOptionsInfo.quality.curvalue;
|
||||
if (soundOptionsInfo.quality.curvalue)
|
||||
{
|
||||
trap_Cvar_SetValue( "s_khz", 22 );
|
||||
// trap_Cvar_SetValue( "s_compression", 0 );
|
||||
trap_Cvar_SetValue("s_khz", 22);
|
||||
// trap_Cvar_SetValue( "s_compression", 0 );
|
||||
}
|
||||
else
|
||||
else
|
||||
{
|
||||
trap_Cvar_SetValue( "s_khz", 11 );
|
||||
// trap_Cvar_SetValue( "s_compression", 1 );
|
||||
trap_Cvar_SetValue("s_khz", 11);
|
||||
// trap_Cvar_SetValue( "s_compression", 1 );
|
||||
}
|
||||
//UI_ForceMenuOff();
|
||||
trap_Cmd_ExecuteText( EXEC_APPEND, "snd_restart\n" );
|
||||
trap_Cmd_ExecuteText(EXEC_APPEND, "snd_restart\n");
|
||||
}
|
||||
else
|
||||
{
|
||||
soundOptionsInfo.quality.curvalue = soundOptionsInfo.holdSoundQuality;
|
||||
soundOptionsInfo.quality.curvalue = soundOptionsInfo.holdSoundQuality;
|
||||
}
|
||||
UI_LogFuncEnd();
|
||||
}
|
||||
|
|
@ -85,48 +87,48 @@ UI_SoundOptionsMenu_Event
|
|||
=================
|
||||
*/
|
||||
|
||||
static void UI_SoundOptionsMenu_Event( void* ptr, int32_t event )
|
||||
static void UI_SoundOptionsMenu_Event(void* ptr, int32_t event)
|
||||
{
|
||||
UI_LogFuncBegin();
|
||||
int32_t holdCurvalue;
|
||||
|
||||
if( event != QM_ACTIVATED )
|
||||
if (event != QM_ACTIVATED)
|
||||
{
|
||||
UI_LogFuncEnd();
|
||||
return;
|
||||
}
|
||||
|
||||
switch( ((menucommon_s*)ptr)->id )
|
||||
switch (((menucommon_s*)ptr)->id)
|
||||
{
|
||||
case ID_RATE:
|
||||
if( soundOptionsInfo.rate.curvalue == 0 )
|
||||
if (soundOptionsInfo.rate.curvalue == 0)
|
||||
{
|
||||
trap_Cvar_SetValue( "rate", 2500 );
|
||||
trap_Cvar_SetValue("rate", 2500);
|
||||
}
|
||||
else if( soundOptionsInfo.rate.curvalue == 1 )
|
||||
else if (soundOptionsInfo.rate.curvalue == 1)
|
||||
{
|
||||
trap_Cvar_SetValue( "rate", 3000 );
|
||||
trap_Cvar_SetValue("rate", 3000);
|
||||
}
|
||||
else if( soundOptionsInfo.rate.curvalue == 2 )
|
||||
else if (soundOptionsInfo.rate.curvalue == 2)
|
||||
{
|
||||
trap_Cvar_SetValue( "rate", 4000 );
|
||||
trap_Cvar_SetValue("rate", 4000);
|
||||
}
|
||||
else if( soundOptionsInfo.rate.curvalue == 3 )
|
||||
else if (soundOptionsInfo.rate.curvalue == 3)
|
||||
{
|
||||
trap_Cvar_SetValue( "rate", 5000 );
|
||||
trap_Cvar_SetValue("rate", 5000);
|
||||
}
|
||||
else if( soundOptionsInfo.rate.curvalue == 4 )
|
||||
else if (soundOptionsInfo.rate.curvalue == 4)
|
||||
{
|
||||
trap_Cvar_SetValue( "rate", 25000 );
|
||||
trap_Cvar_SetValue("rate", 25000);
|
||||
}
|
||||
break;
|
||||
|
||||
case ID_EFFECTSVOLUME:
|
||||
trap_Cvar_SetValue( "s_volume", soundOptionsInfo.sfxvolume.curvalue / 10 );
|
||||
trap_Cvar_SetValue("s_volume", soundOptionsInfo.sfxvolume.curvalue / 10);
|
||||
break;
|
||||
|
||||
case ID_MUSICVOLUME:
|
||||
trap_Cvar_SetValue( "s_musicvolume", soundOptionsInfo.musicvolume.curvalue / 10 );
|
||||
trap_Cvar_SetValue("s_musicvolume", soundOptionsInfo.musicvolume.curvalue / 10);
|
||||
break;
|
||||
|
||||
case ID_QUALITY:
|
||||
|
|
@ -135,15 +137,15 @@ static void UI_SoundOptionsMenu_Event( void* ptr, int32_t event )
|
|||
break;
|
||||
|
||||
case ID_A3D:
|
||||
if( soundOptionsInfo.a3d.curvalue ) {
|
||||
trap_Cmd_ExecuteText( EXEC_NOW, "s_enable_a3d\n" );
|
||||
if (soundOptionsInfo.a3d.curvalue) {
|
||||
trap_Cmd_ExecuteText(EXEC_NOW, "s_enable_a3d\n");
|
||||
}
|
||||
else {
|
||||
trap_Cmd_ExecuteText( EXEC_NOW, "s_disable_a3d\n" );
|
||||
trap_Cmd_ExecuteText(EXEC_NOW, "s_disable_a3d\n");
|
||||
}
|
||||
|
||||
holdCurvalue = (int32_t)trap_Cvar_VariableValue( "s_usingA3D" );
|
||||
if ((soundOptionsInfo.a3d.curvalue == 1) && (holdCurvalue !=1))
|
||||
holdCurvalue = (int32_t)trap_Cvar_VariableValue("s_usingA3D");
|
||||
if ((soundOptionsInfo.a3d.curvalue == 1) && (holdCurvalue != 1))
|
||||
{
|
||||
soundOptionsInfo.a3dtimer = uis.realtime + 10000;
|
||||
}
|
||||
|
|
@ -161,67 +163,67 @@ static void UI_SoundOptionsMenu_Event( void* ptr, int32_t event )
|
|||
M_Sound_Graphics
|
||||
=================
|
||||
*/
|
||||
void M_Sound_Graphics (void)
|
||||
void M_Sound_Graphics(void)
|
||||
{
|
||||
UI_LogFuncBegin();
|
||||
UI_MenuFrame(&soundOptionsInfo.menu);
|
||||
|
||||
trap_R_SetColor( colorTable[CT_LTBROWN1]);
|
||||
UI_DrawHandlePic(30,203, 47, 186, uis.whiteShader); // Long left column square on bottom 3rd
|
||||
trap_R_SetColor(colorTable[CT_LTBROWN1]);
|
||||
UI_DrawHandlePic(30, 203, 47, 186, uis.whiteShader); // Long left column square on bottom 3rd
|
||||
|
||||
// Network Frame
|
||||
trap_R_SetColor( colorTable[CT_LTBROWN1]);
|
||||
UI_DrawHandlePic(88,164, 524, 18, uis.whiteShader); // Top line
|
||||
UI_DrawHandlePic(88,182, 36, 39, uis.whiteShader); // Left column
|
||||
UI_DrawProportionalString( 130, 165, menu_normal_text[MNT_NETWORK],UI_SMALLFONT,colorTable[CT_BLACK]); // Top
|
||||
trap_R_SetColor(colorTable[CT_LTBROWN1]);
|
||||
UI_DrawHandlePic(88, 164, 524, 18, uis.whiteShader); // Top line
|
||||
UI_DrawHandlePic(88, 182, 36, 39, uis.whiteShader); // Left column
|
||||
UI_DrawProportionalString(130, 165, menu_normal_text[MNT_NETWORK], UI_SMALLFONT, colorTable[CT_BLACK]); // Top
|
||||
|
||||
if (soundOptionsInfo.a3dtimer > uis.realtime)
|
||||
{
|
||||
UI_DrawProportionalString( 490, 305, menu_normal_text[MNT_A3DNOTAVAILABLE],UI_CENTER|UI_SMALLFONT, colorTable[CT_WHITE]);
|
||||
UI_DrawProportionalString(490, 305, menu_normal_text[MNT_A3DNOTAVAILABLE], UI_CENTER | UI_SMALLFONT, colorTable[CT_WHITE]);
|
||||
}
|
||||
|
||||
// Sound Frame
|
||||
trap_R_SetColor( colorTable[CT_LTBROWN1]);
|
||||
UI_DrawHandlePic(88,228, 524, 18, uis.whiteShader); // Top line
|
||||
UI_DrawHandlePic(88,246, 36, 27, uis.whiteShader); // Left column
|
||||
UI_DrawHandlePic(88,277, 36, 25, uis.whiteShader); // Left column
|
||||
UI_DrawProportionalString( 130, 229, menu_normal_text[MNT_SOUND],UI_SMALLFONT,colorTable[CT_BLACK]); // Top
|
||||
trap_R_SetColor(colorTable[CT_LTBROWN1]);
|
||||
UI_DrawHandlePic(88, 228, 524, 18, uis.whiteShader); // Top line
|
||||
UI_DrawHandlePic(88, 246, 36, 27, uis.whiteShader); // Left column
|
||||
UI_DrawHandlePic(88, 277, 36, 25, uis.whiteShader); // Left column
|
||||
UI_DrawProportionalString(130, 229, menu_normal_text[MNT_SOUND], UI_SMALLFONT, colorTable[CT_BLACK]); // Top
|
||||
|
||||
trap_R_SetColor( colorTable[CT_LTBROWN1]);
|
||||
UI_DrawHandlePic(112,303, 500, 4, uis.whiteShader); // Middle long line
|
||||
UI_DrawHandlePic( 88, 300, 64, 8, soundOptionsInfo.corner); // Corner graphic
|
||||
trap_R_SetColor(colorTable[CT_LTBROWN1]);
|
||||
UI_DrawHandlePic(112, 303, 500, 4, uis.whiteShader); // Middle long line
|
||||
UI_DrawHandlePic(88, 300, 64, 8, soundOptionsInfo.corner); // Corner graphic
|
||||
|
||||
trap_R_SetColor( colorTable[CT_DKBROWN1]);
|
||||
UI_DrawHandlePic(356,342, 8, 93, uis.whiteShader); // Middle Bottom Left column
|
||||
trap_R_SetColor( colorTable[CT_LTPURPLE1]);
|
||||
UI_DrawHandlePic( 98, 359, 248, 64,soundOptionsInfo.grid);
|
||||
trap_R_SetColor( colorTable[CT_LTBLUE1]);
|
||||
UI_DrawHandlePic( 98, 359, 248, 64, soundOptionsInfo.wave1);
|
||||
trap_R_SetColor( colorTable[CT_DKBROWN1]);
|
||||
UI_DrawHandlePic(96,359, 4, 64, uis.whiteShader); // Left side of frame
|
||||
UI_DrawHandlePic(342,359, 4, 64, uis.whiteShader); // Right side of frame
|
||||
UI_DrawHandlePic(96,355, 250, 4, uis.whiteShader); // Top of frame
|
||||
UI_DrawHandlePic(96,423, 250, 4, uis.whiteShader); // Bottom of frame
|
||||
trap_R_SetColor(colorTable[CT_DKBROWN1]);
|
||||
UI_DrawHandlePic(356, 342, 8, 93, uis.whiteShader); // Middle Bottom Left column
|
||||
trap_R_SetColor(colorTable[CT_LTPURPLE1]);
|
||||
UI_DrawHandlePic(98, 359, 248, 64, soundOptionsInfo.grid);
|
||||
trap_R_SetColor(colorTable[CT_LTBLUE1]);
|
||||
UI_DrawHandlePic(98, 359, 248, 64, soundOptionsInfo.wave1);
|
||||
trap_R_SetColor(colorTable[CT_DKBROWN1]);
|
||||
UI_DrawHandlePic(96, 359, 4, 64, uis.whiteShader); // Left side of frame
|
||||
UI_DrawHandlePic(342, 359, 4, 64, uis.whiteShader); // Right side of frame
|
||||
UI_DrawHandlePic(96, 355, 250, 4, uis.whiteShader); // Top of frame
|
||||
UI_DrawHandlePic(96, 423, 250, 4, uis.whiteShader); // Bottom of frame
|
||||
|
||||
|
||||
UI_DrawHandlePic(367,342, 8, 93, uis.whiteShader); // Middle Bottom Right column
|
||||
trap_R_SetColor( colorTable[CT_LTPURPLE1]);
|
||||
UI_DrawHandlePic( 392, 359, 220, 64, soundOptionsInfo.grid);
|
||||
trap_R_SetColor( colorTable[CT_LTRED1]);
|
||||
UI_DrawHandlePic( 392, 359, 220, 64, soundOptionsInfo.wave2);
|
||||
trap_R_SetColor( colorTable[CT_DKBROWN1]);
|
||||
UI_DrawHandlePic(392, 359, 4, 64, uis.whiteShader); // Left side of frame
|
||||
UI_DrawHandlePic(608, 359, 4, 64, uis.whiteShader); // Right side of frame
|
||||
UI_DrawHandlePic(392,355, 220, 4, uis.whiteShader); // Top of frame
|
||||
UI_DrawHandlePic(392,423, 220, 4, uis.whiteShader); // Bottom of frame
|
||||
UI_DrawHandlePic(367, 342, 8, 93, uis.whiteShader); // Middle Bottom Right column
|
||||
trap_R_SetColor(colorTable[CT_LTPURPLE1]);
|
||||
UI_DrawHandlePic(392, 359, 220, 64, soundOptionsInfo.grid);
|
||||
trap_R_SetColor(colorTable[CT_LTRED1]);
|
||||
UI_DrawHandlePic(392, 359, 220, 64, soundOptionsInfo.wave2);
|
||||
trap_R_SetColor(colorTable[CT_DKBROWN1]);
|
||||
UI_DrawHandlePic(392, 359, 4, 64, uis.whiteShader); // Left side of frame
|
||||
UI_DrawHandlePic(608, 359, 4, 64, uis.whiteShader); // Right side of frame
|
||||
UI_DrawHandlePic(392, 355, 220, 4, uis.whiteShader); // Top of frame
|
||||
UI_DrawHandlePic(392, 423, 220, 4, uis.whiteShader); // Bottom of frame
|
||||
|
||||
UI_Setup_MenuButtons();
|
||||
|
||||
UI_DrawProportionalString( 74, 66, "29876",UI_RIGHT|UI_TINYFONT, colorTable[CT_BLACK]);
|
||||
UI_DrawProportionalString( 74, 84, "568",UI_RIGHT|UI_TINYFONT, colorTable[CT_BLACK]);
|
||||
UI_DrawProportionalString( 74, 188, "45-009",UI_RIGHT|UI_TINYFONT, colorTable[CT_BLACK]);
|
||||
UI_DrawProportionalString( 74, 206, "18856",UI_RIGHT|UI_TINYFONT, colorTable[CT_BLACK]);
|
||||
UI_DrawProportionalString( 74, 395, "18857",UI_RIGHT|UI_TINYFONT, colorTable[CT_BLACK]);
|
||||
UI_DrawProportionalString(74, 66, "29876", UI_RIGHT | UI_TINYFONT, colorTable[CT_BLACK]);
|
||||
UI_DrawProportionalString(74, 84, "568", UI_RIGHT | UI_TINYFONT, colorTable[CT_BLACK]);
|
||||
UI_DrawProportionalString(74, 188, "45-009", UI_RIGHT | UI_TINYFONT, colorTable[CT_BLACK]);
|
||||
UI_DrawProportionalString(74, 206, "18856", UI_RIGHT | UI_TINYFONT, colorTable[CT_BLACK]);
|
||||
UI_DrawProportionalString(74, 395, "18857", UI_RIGHT | UI_TINYFONT, colorTable[CT_BLACK]);
|
||||
UI_LogFuncEnd();
|
||||
}
|
||||
|
||||
|
|
@ -230,12 +232,12 @@ void M_Sound_Graphics (void)
|
|||
M_Sound_MenuDraw
|
||||
=================
|
||||
*/
|
||||
void M_Sound_MenuDraw (void)
|
||||
void M_Sound_MenuDraw(void)
|
||||
{
|
||||
UI_LogFuncBegin();
|
||||
M_Sound_Graphics();
|
||||
|
||||
Menu_Draw( &soundOptionsInfo.menu );
|
||||
Menu_Draw(&soundOptionsInfo.menu);
|
||||
UI_LogFuncEnd();
|
||||
}
|
||||
|
||||
|
|
@ -245,11 +247,11 @@ void M_Sound_MenuDraw (void)
|
|||
M_Sound_MenuKey
|
||||
=================
|
||||
*/
|
||||
static sfxHandle_t M_Sound_MenuKey( int32_t key )
|
||||
static sfxHandle_t M_Sound_MenuKey(int32_t key)
|
||||
{
|
||||
UI_LogFuncBegin();
|
||||
UI_LogFuncEnd();
|
||||
return Menu_DefaultKey( &soundOptionsInfo.menu, key );
|
||||
return Menu_DefaultKey(&soundOptionsInfo.menu, key);
|
||||
}
|
||||
|
||||
|
||||
|
|
@ -258,13 +260,13 @@ static sfxHandle_t M_Sound_MenuKey( int32_t key )
|
|||
SoundMenu_Cache
|
||||
===============
|
||||
*/
|
||||
void UI_SoundMenu_Cache( void )
|
||||
void UI_SoundMenu_Cache(void)
|
||||
{
|
||||
UI_LogFuncBegin();
|
||||
soundOptionsInfo.corner = trap_R_RegisterShaderNoMip("menu/common/con_ssetup.tga");
|
||||
soundOptionsInfo.grid = trap_R_RegisterShaderNoMip("menu/special/grid.tga");
|
||||
soundOptionsInfo.wave1 = trap_R_RegisterShaderNoMip("menu/special/sinwave_1.tga");
|
||||
soundOptionsInfo.wave2 = trap_R_RegisterShaderNoMip("menu/special/sinwave_2.tga");
|
||||
soundOptionsInfo.corner = trap_R_RegisterShaderNoMip("menu/common/con_ssetup.tga");
|
||||
soundOptionsInfo.grid = trap_R_RegisterShaderNoMip("menu/special/grid.tga");
|
||||
soundOptionsInfo.wave1 = trap_R_RegisterShaderNoMip("menu/special/sinwave_1.tga");
|
||||
soundOptionsInfo.wave2 = trap_R_RegisterShaderNoMip("menu/special/sinwave_2.tga");
|
||||
UI_LogFuncEnd();
|
||||
}
|
||||
|
||||
|
|
@ -274,174 +276,174 @@ void UI_SoundMenu_Cache( void )
|
|||
SoundMenu_Init
|
||||
===============
|
||||
*/
|
||||
void SoundMenu_Init(void)
|
||||
void SoundMenu_Init(void)
|
||||
{
|
||||
UI_LogFuncBegin();
|
||||
int32_t x,y;
|
||||
int32_t x, y;
|
||||
int32_t rate;
|
||||
|
||||
UI_SoundMenu_Cache();
|
||||
|
||||
soundOptionsInfo.menu.nitems = 0;
|
||||
soundOptionsInfo.menu.wrapAround = qtrue;
|
||||
soundOptionsInfo.menu.draw = M_Sound_MenuDraw;
|
||||
soundOptionsInfo.menu.key = M_Sound_MenuKey;
|
||||
soundOptionsInfo.menu.fullscreen = qtrue;
|
||||
soundOptionsInfo.menu.wrapAround = qfalse;
|
||||
soundOptionsInfo.menu.descX = MENU_DESC_X;
|
||||
soundOptionsInfo.menu.descY = MENU_DESC_Y;
|
||||
soundOptionsInfo.menu.titleX = MENU_TITLE_X;
|
||||
soundOptionsInfo.menu.titleY = MENU_TITLE_Y;
|
||||
soundOptionsInfo.menu.titleI = MNT_CONTROLSMENU_TITLE;
|
||||
soundOptionsInfo.menu.footNoteEnum = MNT_SOUND_SETUP;
|
||||
soundOptionsInfo.menu.nitems = 0;
|
||||
soundOptionsInfo.menu.wrapAround = qtrue;
|
||||
soundOptionsInfo.menu.draw = M_Sound_MenuDraw;
|
||||
soundOptionsInfo.menu.key = M_Sound_MenuKey;
|
||||
soundOptionsInfo.menu.fullscreen = qtrue;
|
||||
soundOptionsInfo.menu.wrapAround = qfalse;
|
||||
soundOptionsInfo.menu.descX = MENU_DESC_X;
|
||||
soundOptionsInfo.menu.descY = MENU_DESC_Y;
|
||||
soundOptionsInfo.menu.titleX = MENU_TITLE_X;
|
||||
soundOptionsInfo.menu.titleY = MENU_TITLE_Y;
|
||||
soundOptionsInfo.menu.titleI = MNT_CONTROLSMENU_TITLE;
|
||||
soundOptionsInfo.menu.footNoteEnum = MNT_SOUND_SETUP;
|
||||
|
||||
x = 212;
|
||||
soundOptionsInfo.rate.generic.type = MTYPE_SPINCONTROL;
|
||||
soundOptionsInfo.rate.generic.flags = QMF_HIGHLIGHT_IF_FOCUS;
|
||||
soundOptionsInfo.rate.generic.x = x;
|
||||
soundOptionsInfo.rate.generic.y = 192;
|
||||
soundOptionsInfo.rate.textEnum = MBT_DATARATE;
|
||||
soundOptionsInfo.rate.generic.callback = UI_SoundOptionsMenu_Event;
|
||||
soundOptionsInfo.rate.generic.id = ID_RATE;
|
||||
soundOptionsInfo.rate.textcolor = CT_BLACK;
|
||||
soundOptionsInfo.rate.textcolor2 = CT_WHITE;
|
||||
soundOptionsInfo.rate.color = CT_DKPURPLE1;
|
||||
soundOptionsInfo.rate.color2 = CT_LTPURPLE1;
|
||||
soundOptionsInfo.rate.textX = 5;
|
||||
soundOptionsInfo.rate.textY = 2;
|
||||
soundOptionsInfo.rate.listnames = rate_items;
|
||||
soundOptionsInfo.rate.generic.type = MTYPE_SPINCONTROL;
|
||||
soundOptionsInfo.rate.generic.flags = QMF_HIGHLIGHT_IF_FOCUS;
|
||||
soundOptionsInfo.rate.generic.x = x;
|
||||
soundOptionsInfo.rate.generic.y = 192;
|
||||
soundOptionsInfo.rate.textEnum = MBT_DATARATE;
|
||||
soundOptionsInfo.rate.generic.callback = UI_SoundOptionsMenu_Event;
|
||||
soundOptionsInfo.rate.generic.id = ID_RATE;
|
||||
soundOptionsInfo.rate.textcolor = CT_BLACK;
|
||||
soundOptionsInfo.rate.textcolor2 = CT_WHITE;
|
||||
soundOptionsInfo.rate.color = CT_DKPURPLE1;
|
||||
soundOptionsInfo.rate.color2 = CT_LTPURPLE1;
|
||||
soundOptionsInfo.rate.textX = 5;
|
||||
soundOptionsInfo.rate.textY = 2;
|
||||
soundOptionsInfo.rate.listnames = rate_items;
|
||||
|
||||
y = 256;
|
||||
soundOptionsInfo.sfxvolume.generic.type = MTYPE_SLIDER;
|
||||
soundOptionsInfo.sfxvolume.generic.x = x + MENU_BUTTON_MED_WIDTH + 35;
|
||||
soundOptionsInfo.sfxvolume.generic.y = y;
|
||||
soundOptionsInfo.sfxvolume.generic.flags = QMF_SMALLFONT;
|
||||
soundOptionsInfo.sfxvolume.generic.callback = UI_SoundOptionsMenu_Event;
|
||||
soundOptionsInfo.sfxvolume.generic.id = ID_EFFECTSVOLUME;
|
||||
soundOptionsInfo.sfxvolume.minvalue = 0;
|
||||
soundOptionsInfo.sfxvolume.maxvalue = 10;
|
||||
soundOptionsInfo.sfxvolume.color = CT_DKPURPLE1;
|
||||
soundOptionsInfo.sfxvolume.color2 = CT_LTPURPLE1;
|
||||
soundOptionsInfo.sfxvolume.generic.name = "menu/common/monbar_2.tga";
|
||||
soundOptionsInfo.sfxvolume.width = 256;
|
||||
soundOptionsInfo.sfxvolume.height = 32;
|
||||
soundOptionsInfo.sfxvolume.focusWidth = 145;
|
||||
soundOptionsInfo.sfxvolume.focusHeight = 18;
|
||||
soundOptionsInfo.sfxvolume.picName = "menu/common/square.tga";
|
||||
soundOptionsInfo.sfxvolume.picX = x;
|
||||
soundOptionsInfo.sfxvolume.picY = y;
|
||||
soundOptionsInfo.sfxvolume.picWidth = MENU_BUTTON_MED_WIDTH;
|
||||
soundOptionsInfo.sfxvolume.picHeight = MENU_BUTTON_MED_HEIGHT;
|
||||
soundOptionsInfo.sfxvolume.textEnum = MBT_EFFECTSVOLUME;
|
||||
soundOptionsInfo.sfxvolume.textX = 5;
|
||||
soundOptionsInfo.sfxvolume.textY = 1;
|
||||
soundOptionsInfo.sfxvolume.textcolor = CT_BLACK;
|
||||
soundOptionsInfo.sfxvolume.textcolor2 = CT_WHITE;
|
||||
soundOptionsInfo.sfxvolume.thumbName = "menu/common/slider.tga";
|
||||
soundOptionsInfo.sfxvolume.thumbHeight = 32;
|
||||
soundOptionsInfo.sfxvolume.thumbWidth = 16;
|
||||
soundOptionsInfo.sfxvolume.thumbGraphicWidth = 9;
|
||||
soundOptionsInfo.sfxvolume.thumbColor = CT_DKBLUE1;
|
||||
soundOptionsInfo.sfxvolume.thumbColor2 = CT_LTBLUE1;
|
||||
soundOptionsInfo.sfxvolume.generic.type = MTYPE_SLIDER;
|
||||
soundOptionsInfo.sfxvolume.generic.x = x + MENU_BUTTON_MED_WIDTH + 35;
|
||||
soundOptionsInfo.sfxvolume.generic.y = y;
|
||||
soundOptionsInfo.sfxvolume.generic.flags = QMF_SMALLFONT;
|
||||
soundOptionsInfo.sfxvolume.generic.callback = UI_SoundOptionsMenu_Event;
|
||||
soundOptionsInfo.sfxvolume.generic.id = ID_EFFECTSVOLUME;
|
||||
soundOptionsInfo.sfxvolume.minvalue = 0;
|
||||
soundOptionsInfo.sfxvolume.maxvalue = 10;
|
||||
soundOptionsInfo.sfxvolume.color = CT_DKPURPLE1;
|
||||
soundOptionsInfo.sfxvolume.color2 = CT_LTPURPLE1;
|
||||
soundOptionsInfo.sfxvolume.generic.name = "menu/common/monbar_2.tga";
|
||||
soundOptionsInfo.sfxvolume.width = 256;
|
||||
soundOptionsInfo.sfxvolume.height = 32;
|
||||
soundOptionsInfo.sfxvolume.focusWidth = 145;
|
||||
soundOptionsInfo.sfxvolume.focusHeight = 18;
|
||||
soundOptionsInfo.sfxvolume.picName = "menu/common/square.tga";
|
||||
soundOptionsInfo.sfxvolume.picX = x;
|
||||
soundOptionsInfo.sfxvolume.picY = y;
|
||||
soundOptionsInfo.sfxvolume.picWidth = MENU_BUTTON_MED_WIDTH;
|
||||
soundOptionsInfo.sfxvolume.picHeight = MENU_BUTTON_MED_HEIGHT;
|
||||
soundOptionsInfo.sfxvolume.textEnum = MBT_EFFECTSVOLUME;
|
||||
soundOptionsInfo.sfxvolume.textX = 5;
|
||||
soundOptionsInfo.sfxvolume.textY = 1;
|
||||
soundOptionsInfo.sfxvolume.textcolor = CT_BLACK;
|
||||
soundOptionsInfo.sfxvolume.textcolor2 = CT_WHITE;
|
||||
soundOptionsInfo.sfxvolume.thumbName = "menu/common/slider.tga";
|
||||
soundOptionsInfo.sfxvolume.thumbHeight = 32;
|
||||
soundOptionsInfo.sfxvolume.thumbWidth = 16;
|
||||
soundOptionsInfo.sfxvolume.thumbGraphicWidth = 9;
|
||||
soundOptionsInfo.sfxvolume.thumbColor = CT_DKBLUE1;
|
||||
soundOptionsInfo.sfxvolume.thumbColor2 = CT_LTBLUE1;
|
||||
|
||||
y = 278;
|
||||
soundOptionsInfo.musicvolume.generic.type = MTYPE_SLIDER;
|
||||
soundOptionsInfo.musicvolume.generic.x = x + MENU_BUTTON_MED_WIDTH + 35;
|
||||
soundOptionsInfo.musicvolume.generic.y = y;
|
||||
soundOptionsInfo.musicvolume.generic.flags = QMF_SMALLFONT;
|
||||
soundOptionsInfo.musicvolume.generic.callback = UI_SoundOptionsMenu_Event;
|
||||
soundOptionsInfo.musicvolume.generic.id = ID_MUSICVOLUME;
|
||||
soundOptionsInfo.musicvolume.minvalue = 0;
|
||||
soundOptionsInfo.musicvolume.maxvalue = 10;
|
||||
soundOptionsInfo.musicvolume.color = CT_DKPURPLE1;
|
||||
soundOptionsInfo.musicvolume.color2 = CT_LTPURPLE1;
|
||||
soundOptionsInfo.musicvolume.generic.name = "menu/common/monbar_2.tga";
|
||||
soundOptionsInfo.musicvolume.width = 256;
|
||||
soundOptionsInfo.musicvolume.height = 32;
|
||||
soundOptionsInfo.musicvolume.focusWidth = 145;
|
||||
soundOptionsInfo.musicvolume.focusHeight = 18;
|
||||
soundOptionsInfo.musicvolume.picName = "menu/common/square.tga";
|
||||
soundOptionsInfo.musicvolume.picX = x;
|
||||
soundOptionsInfo.musicvolume.picY = y;
|
||||
soundOptionsInfo.musicvolume.picWidth = MENU_BUTTON_MED_WIDTH;
|
||||
soundOptionsInfo.musicvolume.picHeight = MENU_BUTTON_MED_HEIGHT;
|
||||
soundOptionsInfo.musicvolume.textEnum = MBT_MUSICVOLUME;
|
||||
soundOptionsInfo.musicvolume.textX = 5;
|
||||
soundOptionsInfo.musicvolume.textY = 1;
|
||||
soundOptionsInfo.musicvolume.textcolor = CT_BLACK;
|
||||
soundOptionsInfo.musicvolume.textcolor2 = CT_WHITE;
|
||||
soundOptionsInfo.musicvolume.thumbName = "menu/common/slider.tga";
|
||||
soundOptionsInfo.musicvolume.thumbHeight = 32;
|
||||
soundOptionsInfo.musicvolume.thumbWidth = 16;
|
||||
soundOptionsInfo.musicvolume.thumbGraphicWidth = 9;
|
||||
soundOptionsInfo.musicvolume.thumbColor = CT_DKBLUE1;
|
||||
soundOptionsInfo.musicvolume.thumbColor2 = CT_LTBLUE1;
|
||||
soundOptionsInfo.musicvolume.generic.type = MTYPE_SLIDER;
|
||||
soundOptionsInfo.musicvolume.generic.x = x + MENU_BUTTON_MED_WIDTH + 35;
|
||||
soundOptionsInfo.musicvolume.generic.y = y;
|
||||
soundOptionsInfo.musicvolume.generic.flags = QMF_SMALLFONT;
|
||||
soundOptionsInfo.musicvolume.generic.callback = UI_SoundOptionsMenu_Event;
|
||||
soundOptionsInfo.musicvolume.generic.id = ID_MUSICVOLUME;
|
||||
soundOptionsInfo.musicvolume.minvalue = 0;
|
||||
soundOptionsInfo.musicvolume.maxvalue = 10;
|
||||
soundOptionsInfo.musicvolume.color = CT_DKPURPLE1;
|
||||
soundOptionsInfo.musicvolume.color2 = CT_LTPURPLE1;
|
||||
soundOptionsInfo.musicvolume.generic.name = "menu/common/monbar_2.tga";
|
||||
soundOptionsInfo.musicvolume.width = 256;
|
||||
soundOptionsInfo.musicvolume.height = 32;
|
||||
soundOptionsInfo.musicvolume.focusWidth = 145;
|
||||
soundOptionsInfo.musicvolume.focusHeight = 18;
|
||||
soundOptionsInfo.musicvolume.picName = "menu/common/square.tga";
|
||||
soundOptionsInfo.musicvolume.picX = x;
|
||||
soundOptionsInfo.musicvolume.picY = y;
|
||||
soundOptionsInfo.musicvolume.picWidth = MENU_BUTTON_MED_WIDTH;
|
||||
soundOptionsInfo.musicvolume.picHeight = MENU_BUTTON_MED_HEIGHT;
|
||||
soundOptionsInfo.musicvolume.textEnum = MBT_MUSICVOLUME;
|
||||
soundOptionsInfo.musicvolume.textX = 5;
|
||||
soundOptionsInfo.musicvolume.textY = 1;
|
||||
soundOptionsInfo.musicvolume.textcolor = CT_BLACK;
|
||||
soundOptionsInfo.musicvolume.textcolor2 = CT_WHITE;
|
||||
soundOptionsInfo.musicvolume.thumbName = "menu/common/slider.tga";
|
||||
soundOptionsInfo.musicvolume.thumbHeight = 32;
|
||||
soundOptionsInfo.musicvolume.thumbWidth = 16;
|
||||
soundOptionsInfo.musicvolume.thumbGraphicWidth = 9;
|
||||
soundOptionsInfo.musicvolume.thumbColor = CT_DKBLUE1;
|
||||
soundOptionsInfo.musicvolume.thumbColor2 = CT_LTBLUE1;
|
||||
|
||||
soundOptionsInfo.quality.generic.type = MTYPE_SPINCONTROL;
|
||||
soundOptionsInfo.quality.generic.flags = QMF_HIGHLIGHT_IF_FOCUS;
|
||||
soundOptionsInfo.quality.generic.x = 120;
|
||||
soundOptionsInfo.quality.generic.y = 322;
|
||||
soundOptionsInfo.quality.generic.callback = UI_SoundOptionsMenu_Event;
|
||||
soundOptionsInfo.quality.generic.id = ID_QUALITY;
|
||||
soundOptionsInfo.quality.textEnum = MBT_SOUNDQUALITY;
|
||||
soundOptionsInfo.quality.textcolor = CT_BLACK;
|
||||
soundOptionsInfo.quality.textcolor2 = CT_WHITE;
|
||||
soundOptionsInfo.quality.color = CT_DKPURPLE1;
|
||||
soundOptionsInfo.quality.color2 = CT_LTPURPLE1;
|
||||
soundOptionsInfo.quality.textX = 5;
|
||||
soundOptionsInfo.quality.textY = 2;
|
||||
soundOptionsInfo.quality.listnames = s_sndquality_Names;
|
||||
soundOptionsInfo.quality.generic.type = MTYPE_SPINCONTROL;
|
||||
soundOptionsInfo.quality.generic.flags = QMF_HIGHLIGHT_IF_FOCUS;
|
||||
soundOptionsInfo.quality.generic.x = 120;
|
||||
soundOptionsInfo.quality.generic.y = 322;
|
||||
soundOptionsInfo.quality.generic.callback = UI_SoundOptionsMenu_Event;
|
||||
soundOptionsInfo.quality.generic.id = ID_QUALITY;
|
||||
soundOptionsInfo.quality.textEnum = MBT_SOUNDQUALITY;
|
||||
soundOptionsInfo.quality.textcolor = CT_BLACK;
|
||||
soundOptionsInfo.quality.textcolor2 = CT_WHITE;
|
||||
soundOptionsInfo.quality.color = CT_DKPURPLE1;
|
||||
soundOptionsInfo.quality.color2 = CT_LTPURPLE1;
|
||||
soundOptionsInfo.quality.textX = 5;
|
||||
soundOptionsInfo.quality.textY = 2;
|
||||
soundOptionsInfo.quality.listnames = s_sndquality_Names;
|
||||
|
||||
soundOptionsInfo.a3d.generic.type = MTYPE_SPINCONTROL;
|
||||
soundOptionsInfo.a3d.generic.flags = QMF_HIGHLIGHT_IF_FOCUS;
|
||||
soundOptionsInfo.a3d.generic.x = 416;
|
||||
soundOptionsInfo.a3d.generic.y = 322;
|
||||
soundOptionsInfo.a3d.generic.callback = UI_SoundOptionsMenu_Event;
|
||||
soundOptionsInfo.a3d.generic.id = ID_A3D;
|
||||
soundOptionsInfo.a3d.textEnum = MBT_A3D;
|
||||
soundOptionsInfo.a3d.textcolor = CT_BLACK;
|
||||
soundOptionsInfo.a3d.textcolor2 = CT_WHITE;
|
||||
soundOptionsInfo.a3d.color = CT_DKPURPLE1;
|
||||
soundOptionsInfo.a3d.color2 = CT_LTPURPLE1;
|
||||
soundOptionsInfo.a3d.textX = 5;
|
||||
soundOptionsInfo.a3d.textY = 2;
|
||||
soundOptionsInfo.a3d.listnames = s_OffOnNone_Names;
|
||||
soundOptionsInfo.a3d.generic.type = MTYPE_SPINCONTROL;
|
||||
soundOptionsInfo.a3d.generic.flags = QMF_HIGHLIGHT_IF_FOCUS;
|
||||
soundOptionsInfo.a3d.generic.x = 416;
|
||||
soundOptionsInfo.a3d.generic.y = 322;
|
||||
soundOptionsInfo.a3d.generic.callback = UI_SoundOptionsMenu_Event;
|
||||
soundOptionsInfo.a3d.generic.id = ID_A3D;
|
||||
soundOptionsInfo.a3d.textEnum = MBT_A3D;
|
||||
soundOptionsInfo.a3d.textcolor = CT_BLACK;
|
||||
soundOptionsInfo.a3d.textcolor2 = CT_WHITE;
|
||||
soundOptionsInfo.a3d.color = CT_DKPURPLE1;
|
||||
soundOptionsInfo.a3d.color2 = CT_LTPURPLE1;
|
||||
soundOptionsInfo.a3d.textX = 5;
|
||||
soundOptionsInfo.a3d.textY = 2;
|
||||
soundOptionsInfo.a3d.listnames = s_OffOnNone_Names;
|
||||
|
||||
SetupMenu_TopButtons(&soundOptionsInfo.menu,MENU_SOUND,NULL);
|
||||
SetupMenu_TopButtons(&soundOptionsInfo.menu, MENU_SOUND, NULL);
|
||||
|
||||
Menu_AddItem( &soundOptionsInfo.menu, ( void * )&soundOptionsInfo.rate );
|
||||
Menu_AddItem( &soundOptionsInfo.menu, ( void * )&soundOptionsInfo.sfxvolume);
|
||||
Menu_AddItem( &soundOptionsInfo.menu, ( void * )&soundOptionsInfo.musicvolume);
|
||||
Menu_AddItem( &soundOptionsInfo.menu, ( void * )&soundOptionsInfo.quality);
|
||||
Menu_AddItem( &soundOptionsInfo.menu, ( void * )&soundOptionsInfo.a3d);
|
||||
Menu_AddItem(&soundOptionsInfo.menu, (void *)&soundOptionsInfo.rate);
|
||||
Menu_AddItem(&soundOptionsInfo.menu, (void *)&soundOptionsInfo.sfxvolume);
|
||||
Menu_AddItem(&soundOptionsInfo.menu, (void *)&soundOptionsInfo.musicvolume);
|
||||
Menu_AddItem(&soundOptionsInfo.menu, (void *)&soundOptionsInfo.quality);
|
||||
Menu_AddItem(&soundOptionsInfo.menu, (void *)&soundOptionsInfo.a3d);
|
||||
|
||||
soundOptionsInfo.sfxvolume.curvalue = trap_Cvar_VariableValue( "s_volume" ) * 10;
|
||||
soundOptionsInfo.musicvolume.curvalue = trap_Cvar_VariableValue( "s_musicvolume" ) * 10;
|
||||
soundOptionsInfo.quality.curvalue = trap_Cvar_VariableValue( "s_khz" ) != 11;
|
||||
soundOptionsInfo.holdSoundQuality = soundOptionsInfo.quality.curvalue;
|
||||
soundOptionsInfo.a3d.curvalue = (int32_t)trap_Cvar_VariableValue( "s_usingA3D" );
|
||||
soundOptionsInfo.sfxvolume.curvalue = trap_Cvar_VariableValue("s_volume") * 10;
|
||||
soundOptionsInfo.musicvolume.curvalue = trap_Cvar_VariableValue("s_musicvolume") * 10;
|
||||
soundOptionsInfo.quality.curvalue = trap_Cvar_VariableValue("s_khz") != 11;
|
||||
soundOptionsInfo.holdSoundQuality = soundOptionsInfo.quality.curvalue;
|
||||
soundOptionsInfo.a3d.curvalue = (int32_t)trap_Cvar_VariableValue("s_usingA3D");
|
||||
|
||||
soundOptionsInfo.menu.initialized = qtrue;
|
||||
|
||||
|
||||
rate = trap_Cvar_VariableValue( "rate" );
|
||||
if( rate <= 2500 )
|
||||
rate = trap_Cvar_VariableValue("rate");
|
||||
if (rate <= 2500)
|
||||
{
|
||||
soundOptionsInfo.rate.curvalue = 0;
|
||||
}
|
||||
else if( rate <= 3000 )
|
||||
else if (rate <= 3000)
|
||||
{
|
||||
soundOptionsInfo.rate.curvalue = 1;
|
||||
}
|
||||
else if( rate <= 4000 )
|
||||
else if (rate <= 4000)
|
||||
{
|
||||
soundOptionsInfo.rate.curvalue = 2;
|
||||
}
|
||||
else if( rate <= 5000 )
|
||||
else if (rate <= 5000)
|
||||
{
|
||||
soundOptionsInfo.rate.curvalue = 3;
|
||||
}
|
||||
else
|
||||
else
|
||||
{
|
||||
soundOptionsInfo.rate.curvalue = 4;
|
||||
}
|
||||
|
|
@ -453,12 +455,12 @@ void SoundMenu_Init(void)
|
|||
UI_SoundMenu
|
||||
===============
|
||||
*/
|
||||
void UI_SoundMenu( void)
|
||||
void UI_SoundMenu(void)
|
||||
{
|
||||
UI_LogFuncBegin();
|
||||
SoundMenu_Init();
|
||||
SoundMenu_Init();
|
||||
|
||||
UI_PushMenu( &soundOptionsInfo.menu);
|
||||
UI_PushMenu(&soundOptionsInfo.menu);
|
||||
UI_LogFuncEnd();
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -5,12 +5,13 @@
|
|||
|
||||
/*********************************************************************************
|
||||
SPECIFY SERVER
|
||||
*********************************************************************************/
|
||||
|
||||
#define ID_MAINMENU 100
|
||||
#define ID_BACK 102
|
||||
#define ID_SPECIFYSERVERGO 103
|
||||
*********************************************************************************/
|
||||
|
||||
enum ui_specifyserverIDs_e {
|
||||
ID_MAINMENU = 100,
|
||||
ID_BACK = 102,
|
||||
ID_SPECIFYSERVERGO
|
||||
};
|
||||
|
||||
typedef struct
|
||||
{
|
||||
|
|
@ -36,7 +37,7 @@ static specifyserver_t s_specifyserver;
|
|||
SpecifyServer_Event
|
||||
=================
|
||||
*/
|
||||
static void SpecifyServer_Event( void* ptr, int32_t event )
|
||||
static void SpecifyServer_Event(void* ptr, int32_t event)
|
||||
{
|
||||
UI_LogFuncBegin();
|
||||
char buff[256];
|
||||
|
|
@ -49,25 +50,25 @@ static void SpecifyServer_Event( void* ptr, int32_t event )
|
|||
|
||||
switch (((menucommon_s*)ptr)->id)
|
||||
{
|
||||
case ID_MAINMENU:
|
||||
UI_PopMenu();
|
||||
UI_MainMenu();
|
||||
break;
|
||||
case ID_MAINMENU:
|
||||
UI_PopMenu();
|
||||
UI_MainMenu();
|
||||
break;
|
||||
|
||||
case ID_SPECIFYSERVERGO:
|
||||
if (s_specifyserver.domain.field.buffer[0])
|
||||
{
|
||||
strcpy(buff,s_specifyserver.domain.field.buffer);
|
||||
if (s_specifyserver.port.field.buffer[0])
|
||||
Com_sprintf( buff+strlen(buff), 128, ":%s", s_specifyserver.port.field.buffer );
|
||||
case ID_SPECIFYSERVERGO:
|
||||
if (s_specifyserver.domain.field.buffer[0])
|
||||
{
|
||||
strcpy(buff, s_specifyserver.domain.field.buffer);
|
||||
if (s_specifyserver.port.field.buffer[0])
|
||||
Com_sprintf(buff + strlen(buff), 128, ":%s", s_specifyserver.port.field.buffer);
|
||||
|
||||
trap_Cmd_ExecuteText( EXEC_APPEND, va( "connect %s\n", buff ) );
|
||||
}
|
||||
break;
|
||||
trap_Cmd_ExecuteText(EXEC_APPEND, va("connect %s\n", buff));
|
||||
}
|
||||
break;
|
||||
|
||||
case ID_BACK:
|
||||
UI_PopMenu();
|
||||
break;
|
||||
case ID_BACK:
|
||||
UI_PopMenu();
|
||||
break;
|
||||
}
|
||||
UI_LogFuncEnd();
|
||||
}
|
||||
|
|
@ -77,55 +78,55 @@ static void SpecifyServer_Event( void* ptr, int32_t event )
|
|||
SpecifyServer_Graphics
|
||||
=================
|
||||
*/
|
||||
void SpecifyServer_Graphics (void)
|
||||
void SpecifyServer_Graphics(void)
|
||||
{
|
||||
UI_LogFuncBegin();
|
||||
UI_MenuFrame2(&s_specifyserver.menu);
|
||||
|
||||
trap_R_SetColor( colorTable[CT_LTBROWN1]);
|
||||
UI_DrawHandlePic( 30,203, 47, 186, uis.whiteShader); // Left hand column of screen frame
|
||||
trap_R_SetColor(colorTable[CT_LTBROWN1]);
|
||||
UI_DrawHandlePic(30, 203, 47, 186, uis.whiteShader); // Left hand column of screen frame
|
||||
|
||||
trap_R_SetColor( colorTable[CT_LTPURPLE3]);
|
||||
UI_DrawHandlePic(135, 100, 32, 32,s_specifyserver.corner_ul); // Upper left corner
|
||||
UI_DrawHandlePic(574, 100, 32, 32,s_specifyserver.corner_ur); // Upper Right corner
|
||||
UI_DrawHandlePic(135, 282, 32, 32,s_specifyserver.corner_ll); // corner
|
||||
UI_DrawHandlePic(574, 282, 32, 32,s_specifyserver.corner_lr); // corner
|
||||
trap_R_SetColor(colorTable[CT_LTPURPLE3]);
|
||||
UI_DrawHandlePic(135, 100, 32, 32, s_specifyserver.corner_ul); // Upper left corner
|
||||
UI_DrawHandlePic(574, 100, 32, 32, s_specifyserver.corner_ur); // Upper Right corner
|
||||
UI_DrawHandlePic(135, 282, 32, 32, s_specifyserver.corner_ll); // corner
|
||||
UI_DrawHandlePic(574, 282, 32, 32, s_specifyserver.corner_lr); // corner
|
||||
|
||||
// Address label
|
||||
trap_R_SetColor( colorTable[CT_LTPURPLE3]);
|
||||
UI_DrawHandlePic( 189,166, 385, 20, uis.whiteShader); // Background for Address label
|
||||
trap_R_SetColor( colorTable[CT_BLACK]);
|
||||
UI_DrawHandlePic( 253,168, 315, 16, uis.whiteShader); // Black square for data
|
||||
trap_R_SetColor(colorTable[CT_LTPURPLE3]);
|
||||
UI_DrawHandlePic(189, 166, 385, 20, uis.whiteShader); // Background for Address label
|
||||
trap_R_SetColor(colorTable[CT_BLACK]);
|
||||
UI_DrawHandlePic(253, 168, 315, 16, uis.whiteShader); // Black square for data
|
||||
|
||||
// Port label
|
||||
trap_R_SetColor( colorTable[CT_LTPURPLE3]);
|
||||
UI_DrawHandlePic( 191, 214, 135, 20, uis.whiteShader); // Background for Port label
|
||||
trap_R_SetColor( colorTable[CT_BLACK]);
|
||||
UI_DrawHandlePic( 254, 216, 58, 16, uis.whiteShader); // Black square for data
|
||||
trap_R_SetColor(colorTable[CT_LTPURPLE3]);
|
||||
UI_DrawHandlePic(191, 214, 135, 20, uis.whiteShader); // Background for Port label
|
||||
trap_R_SetColor(colorTable[CT_BLACK]);
|
||||
UI_DrawHandlePic(254, 216, 58, 16, uis.whiteShader); // Black square for data
|
||||
|
||||
// Frame around data
|
||||
trap_R_SetColor( colorTable[CT_LTPURPLE3]);
|
||||
UI_DrawHandlePic( 152,100, 426, 18, uis.whiteShader); // Top line
|
||||
UI_DrawHandlePic( 135,120, 18, 171, uis.whiteShader); // Left side
|
||||
UI_DrawHandlePic( 578,120, 18, 171, uis.whiteShader); // Right side
|
||||
UI_DrawHandlePic( 160,286, 411, 18, uis.whiteShader); // Bottom line to left of Engage button
|
||||
trap_R_SetColor(colorTable[CT_LTPURPLE3]);
|
||||
UI_DrawHandlePic(152, 100, 426, 18, uis.whiteShader); // Top line
|
||||
UI_DrawHandlePic(135, 120, 18, 171, uis.whiteShader); // Left side
|
||||
UI_DrawHandlePic(578, 120, 18, 171, uis.whiteShader); // Right side
|
||||
UI_DrawHandlePic(160, 286, 411, 18, uis.whiteShader); // Bottom line to left of Engage button
|
||||
|
||||
UI_DrawProportionalString( 169, 102, menu_normal_text[MNT_SERVERINFORMATION],UI_SMALLFONT, colorTable[CT_BLACK]);
|
||||
UI_DrawProportionalString(169, 102, menu_normal_text[MNT_SERVERINFORMATION], UI_SMALLFONT, colorTable[CT_BLACK]);
|
||||
|
||||
|
||||
UI_DrawProportionalString( 74, 27, "216",UI_RIGHT|UI_TINYFONT, colorTable[CT_BLACK]);
|
||||
UI_DrawProportionalString( 74, 74, "1009-3",UI_RIGHT|UI_TINYFONT, colorTable[CT_BLACK]);
|
||||
UI_DrawProportionalString( 74, 188, "9-3001",UI_RIGHT|UI_TINYFONT, colorTable[CT_BLACK]);
|
||||
UI_DrawProportionalString( 74, 206, "10963",UI_RIGHT|UI_TINYFONT, colorTable[CT_BLACK]);
|
||||
UI_DrawProportionalString( 74, 395, "10961",UI_RIGHT|UI_TINYFONT, colorTable[CT_BLACK]);
|
||||
UI_DrawProportionalString(74, 27, "216", UI_RIGHT | UI_TINYFONT, colorTable[CT_BLACK]);
|
||||
UI_DrawProportionalString(74, 74, "1009-3", UI_RIGHT | UI_TINYFONT, colorTable[CT_BLACK]);
|
||||
UI_DrawProportionalString(74, 188, "9-3001", UI_RIGHT | UI_TINYFONT, colorTable[CT_BLACK]);
|
||||
UI_DrawProportionalString(74, 206, "10963", UI_RIGHT | UI_TINYFONT, colorTable[CT_BLACK]);
|
||||
UI_DrawProportionalString(74, 395, "10961", UI_RIGHT | UI_TINYFONT, colorTable[CT_BLACK]);
|
||||
|
||||
// Left rounded ends for buttons
|
||||
trap_R_SetColor( colorTable[s_specifyserver.mainmenu.color]);
|
||||
UI_DrawHandlePic(s_specifyserver.mainmenu.generic.x - 14, s_specifyserver.mainmenu.generic.y,
|
||||
trap_R_SetColor(colorTable[s_specifyserver.mainmenu.color]);
|
||||
UI_DrawHandlePic(s_specifyserver.mainmenu.generic.x - 14, s_specifyserver.mainmenu.generic.y,
|
||||
MENU_BUTTON_MED_HEIGHT, MENU_BUTTON_MED_HEIGHT, uis.graphicButtonLeftEnd);
|
||||
|
||||
trap_R_SetColor( colorTable[s_specifyserver.back.color]);
|
||||
UI_DrawHandlePic(s_specifyserver.back.generic.x - 14, s_specifyserver.back.generic.y,
|
||||
trap_R_SetColor(colorTable[s_specifyserver.back.color]);
|
||||
UI_DrawHandlePic(s_specifyserver.back.generic.x - 14, s_specifyserver.back.generic.y,
|
||||
MENU_BUTTON_MED_HEIGHT, MENU_BUTTON_MED_HEIGHT, uis.graphicButtonLeftEnd);
|
||||
|
||||
UI_LogFuncEnd();
|
||||
|
|
@ -136,12 +137,12 @@ void SpecifyServer_Graphics (void)
|
|||
SpecifyServer_MenuDraw
|
||||
=================
|
||||
*/
|
||||
static void SpecifyServer_MenuDraw( void )
|
||||
static void SpecifyServer_MenuDraw(void)
|
||||
{
|
||||
UI_LogFuncBegin();
|
||||
SpecifyServer_Graphics();
|
||||
|
||||
Menu_Draw( &s_specifyserver.menu );
|
||||
Menu_Draw(&s_specifyserver.menu);
|
||||
|
||||
UI_LogFuncEnd();
|
||||
}
|
||||
|
|
@ -151,107 +152,107 @@ static void SpecifyServer_MenuDraw( void )
|
|||
SpecifyServer_MenuInit
|
||||
=================
|
||||
*/
|
||||
void SpecifyServer_MenuInit( void )
|
||||
void SpecifyServer_MenuInit(void)
|
||||
{
|
||||
UI_LogFuncBegin();
|
||||
// zero set all our globals
|
||||
memset( &s_specifyserver, 0 ,sizeof(specifyserver_t) );
|
||||
memset(&s_specifyserver, 0, sizeof(specifyserver_t));
|
||||
|
||||
SpecifyServer_Cache();
|
||||
|
||||
s_specifyserver.menu.wrapAround = qtrue;
|
||||
s_specifyserver.menu.fullscreen = qtrue;
|
||||
s_specifyserver.menu.draw = SpecifyServer_MenuDraw;
|
||||
s_specifyserver.menu.descX = MENU_DESC_X;
|
||||
s_specifyserver.menu.descY = MENU_DESC_Y;
|
||||
s_specifyserver.menu.titleX = MENU_TITLE_X;
|
||||
s_specifyserver.menu.titleY = MENU_TITLE_Y;
|
||||
s_specifyserver.menu.titleI = MNT_MULTIPLAYER_TITLE;
|
||||
s_specifyserver.menu.footNoteEnum = MNT_SPECIFYSERVER;
|
||||
s_specifyserver.menu.wrapAround = qtrue;
|
||||
s_specifyserver.menu.fullscreen = qtrue;
|
||||
s_specifyserver.menu.draw = SpecifyServer_MenuDraw;
|
||||
s_specifyserver.menu.descX = MENU_DESC_X;
|
||||
s_specifyserver.menu.descY = MENU_DESC_Y;
|
||||
s_specifyserver.menu.titleX = MENU_TITLE_X;
|
||||
s_specifyserver.menu.titleY = MENU_TITLE_Y;
|
||||
s_specifyserver.menu.titleI = MNT_MULTIPLAYER_TITLE;
|
||||
s_specifyserver.menu.footNoteEnum = MNT_SPECIFYSERVER;
|
||||
|
||||
s_specifyserver.mainmenu.generic.type = MTYPE_BITMAP;
|
||||
s_specifyserver.mainmenu.generic.flags = QMF_HIGHLIGHT_IF_FOCUS;
|
||||
s_specifyserver.mainmenu.generic.x = 110;
|
||||
s_specifyserver.mainmenu.generic.y = 391;
|
||||
s_specifyserver.mainmenu.generic.name = BUTTON_GRAPHIC_LONGRIGHT;
|
||||
s_specifyserver.mainmenu.generic.id = ID_MAINMENU;
|
||||
s_specifyserver.mainmenu.generic.callback = SpecifyServer_Event;
|
||||
s_specifyserver.mainmenu.width = MENU_BUTTON_MED_WIDTH;
|
||||
s_specifyserver.mainmenu.height = MENU_BUTTON_MED_HEIGHT;
|
||||
s_specifyserver.mainmenu.color = CT_DKPURPLE1;
|
||||
s_specifyserver.mainmenu.color2 = CT_LTPURPLE1;
|
||||
s_specifyserver.mainmenu.textX = 5;
|
||||
s_specifyserver.mainmenu.textY = 2;
|
||||
s_specifyserver.mainmenu.textEnum = MBT_MAINMENU;
|
||||
s_specifyserver.mainmenu.textcolor = CT_BLACK;
|
||||
s_specifyserver.mainmenu.textcolor2 = CT_WHITE;
|
||||
s_specifyserver.mainmenu.generic.type = MTYPE_BITMAP;
|
||||
s_specifyserver.mainmenu.generic.flags = QMF_HIGHLIGHT_IF_FOCUS;
|
||||
s_specifyserver.mainmenu.generic.x = 110;
|
||||
s_specifyserver.mainmenu.generic.y = 391;
|
||||
s_specifyserver.mainmenu.generic.name = BUTTON_GRAPHIC_LONGRIGHT;
|
||||
s_specifyserver.mainmenu.generic.id = ID_MAINMENU;
|
||||
s_specifyserver.mainmenu.generic.callback = SpecifyServer_Event;
|
||||
s_specifyserver.mainmenu.width = MENU_BUTTON_MED_WIDTH;
|
||||
s_specifyserver.mainmenu.height = MENU_BUTTON_MED_HEIGHT;
|
||||
s_specifyserver.mainmenu.color = CT_DKPURPLE1;
|
||||
s_specifyserver.mainmenu.color2 = CT_LTPURPLE1;
|
||||
s_specifyserver.mainmenu.textX = 5;
|
||||
s_specifyserver.mainmenu.textY = 2;
|
||||
s_specifyserver.mainmenu.textEnum = MBT_MAINMENU;
|
||||
s_specifyserver.mainmenu.textcolor = CT_BLACK;
|
||||
s_specifyserver.mainmenu.textcolor2 = CT_WHITE;
|
||||
|
||||
s_specifyserver.back.generic.type = MTYPE_BITMAP;
|
||||
s_specifyserver.back.generic.flags = QMF_HIGHLIGHT_IF_FOCUS;
|
||||
s_specifyserver.back.generic.x = 110;
|
||||
s_specifyserver.back.generic.y = 415;
|
||||
s_specifyserver.back.generic.name = BUTTON_GRAPHIC_LONGRIGHT;
|
||||
s_specifyserver.back.generic.id = ID_BACK;
|
||||
s_specifyserver.back.generic.callback = SpecifyServer_Event;
|
||||
s_specifyserver.back.width = MENU_BUTTON_MED_WIDTH;
|
||||
s_specifyserver.back.height = MENU_BUTTON_MED_HEIGHT;
|
||||
s_specifyserver.back.color = CT_DKPURPLE1;
|
||||
s_specifyserver.back.color2 = CT_LTPURPLE1;
|
||||
s_specifyserver.back.textX = 5;
|
||||
s_specifyserver.back.textY = 2;
|
||||
s_specifyserver.back.textEnum = MBT_BACK;
|
||||
s_specifyserver.back.textcolor = CT_BLACK;
|
||||
s_specifyserver.back.textcolor2 = CT_WHITE;
|
||||
s_specifyserver.back.generic.type = MTYPE_BITMAP;
|
||||
s_specifyserver.back.generic.flags = QMF_HIGHLIGHT_IF_FOCUS;
|
||||
s_specifyserver.back.generic.x = 110;
|
||||
s_specifyserver.back.generic.y = 415;
|
||||
s_specifyserver.back.generic.name = BUTTON_GRAPHIC_LONGRIGHT;
|
||||
s_specifyserver.back.generic.id = ID_BACK;
|
||||
s_specifyserver.back.generic.callback = SpecifyServer_Event;
|
||||
s_specifyserver.back.width = MENU_BUTTON_MED_WIDTH;
|
||||
s_specifyserver.back.height = MENU_BUTTON_MED_HEIGHT;
|
||||
s_specifyserver.back.color = CT_DKPURPLE1;
|
||||
s_specifyserver.back.color2 = CT_LTPURPLE1;
|
||||
s_specifyserver.back.textX = 5;
|
||||
s_specifyserver.back.textY = 2;
|
||||
s_specifyserver.back.textEnum = MBT_BACK;
|
||||
s_specifyserver.back.textcolor = CT_BLACK;
|
||||
s_specifyserver.back.textcolor2 = CT_WHITE;
|
||||
|
||||
s_specifyserver.domain.generic.type = MTYPE_FIELD;
|
||||
s_specifyserver.domain.generic.flags = QMF_HIGHLIGHT_IF_FOCUS;
|
||||
s_specifyserver.domain.generic.x = 255;
|
||||
s_specifyserver.domain.generic.y = 168;
|
||||
s_specifyserver.domain.field.widthInChars = 38;
|
||||
s_specifyserver.domain.field.maxchars = 80;
|
||||
s_specifyserver.domain.field.style = UI_SMALLFONT;
|
||||
s_specifyserver.domain.field.titleEnum = MBT_ADDRESS;
|
||||
s_specifyserver.domain.field.textcolor = CT_LTGOLD1;
|
||||
s_specifyserver.domain.field.textcolor2 = CT_LTGOLD1;
|
||||
s_specifyserver.domain.field.titlecolor = CT_LTGOLD1;
|
||||
s_specifyserver.domain.generic.type = MTYPE_FIELD;
|
||||
s_specifyserver.domain.generic.flags = QMF_HIGHLIGHT_IF_FOCUS;
|
||||
s_specifyserver.domain.generic.x = 255;
|
||||
s_specifyserver.domain.generic.y = 168;
|
||||
s_specifyserver.domain.field.widthInChars = 38;
|
||||
s_specifyserver.domain.field.maxchars = 80;
|
||||
s_specifyserver.domain.field.style = UI_SMALLFONT;
|
||||
s_specifyserver.domain.field.titleEnum = MBT_ADDRESS;
|
||||
s_specifyserver.domain.field.textcolor = CT_LTGOLD1;
|
||||
s_specifyserver.domain.field.textcolor2 = CT_LTGOLD1;
|
||||
s_specifyserver.domain.field.titlecolor = CT_LTGOLD1;
|
||||
|
||||
s_specifyserver.port.generic.type = MTYPE_FIELD;
|
||||
s_specifyserver.port.generic.flags = QMF_PULSEIFFOCUS|QMF_SMALLFONT|QMF_NUMBERSONLY;
|
||||
s_specifyserver.port.generic.x = 255;
|
||||
s_specifyserver.port.generic.y = 216;
|
||||
s_specifyserver.port.field.widthInChars = 6;
|
||||
s_specifyserver.port.field.maxchars = 5;
|
||||
s_specifyserver.port.field.style = UI_SMALLFONT;
|
||||
s_specifyserver.port.field.titleEnum = MBT_PORT;
|
||||
s_specifyserver.port.field.textcolor = CT_LTGOLD1;
|
||||
s_specifyserver.port.field.textcolor2 = CT_LTGOLD1;
|
||||
s_specifyserver.port.field.titlecolor = CT_LTGOLD1;
|
||||
s_specifyserver.port.generic.type = MTYPE_FIELD;
|
||||
s_specifyserver.port.generic.flags = QMF_PULSEIFFOCUS | QMF_SMALLFONT | QMF_NUMBERSONLY;
|
||||
s_specifyserver.port.generic.x = 255;
|
||||
s_specifyserver.port.generic.y = 216;
|
||||
s_specifyserver.port.field.widthInChars = 6;
|
||||
s_specifyserver.port.field.maxchars = 5;
|
||||
s_specifyserver.port.field.style = UI_SMALLFONT;
|
||||
s_specifyserver.port.field.titleEnum = MBT_PORT;
|
||||
s_specifyserver.port.field.textcolor = CT_LTGOLD1;
|
||||
s_specifyserver.port.field.textcolor2 = CT_LTGOLD1;
|
||||
s_specifyserver.port.field.titlecolor = CT_LTGOLD1;
|
||||
|
||||
s_specifyserver.go.generic.type = MTYPE_BITMAP;
|
||||
s_specifyserver.go.generic.flags = QMF_HIGHLIGHT_IF_FOCUS;
|
||||
s_specifyserver.go.generic.x = 462;
|
||||
s_specifyserver.go.generic.y = 391;
|
||||
s_specifyserver.go.generic.name = GRAPHIC_SQUARE;
|
||||
s_specifyserver.go.generic.id = ID_SPECIFYSERVERGO;
|
||||
s_specifyserver.go.generic.callback = SpecifyServer_Event;
|
||||
s_specifyserver.go.width = 150;
|
||||
s_specifyserver.go.height = 42;
|
||||
s_specifyserver.go.color = CT_DKPURPLE1;
|
||||
s_specifyserver.go.color2 = CT_LTPURPLE1;
|
||||
s_specifyserver.go.textX = 5;
|
||||
s_specifyserver.go.textY = 2;
|
||||
s_specifyserver.go.textEnum = MBT_ENGAGEMULTIPLAYER;
|
||||
s_specifyserver.go.textcolor = CT_BLACK;
|
||||
s_specifyserver.go.textcolor2 = CT_WHITE;
|
||||
s_specifyserver.go.generic.type = MTYPE_BITMAP;
|
||||
s_specifyserver.go.generic.flags = QMF_HIGHLIGHT_IF_FOCUS;
|
||||
s_specifyserver.go.generic.x = 462;
|
||||
s_specifyserver.go.generic.y = 391;
|
||||
s_specifyserver.go.generic.name = GRAPHIC_SQUARE;
|
||||
s_specifyserver.go.generic.id = ID_SPECIFYSERVERGO;
|
||||
s_specifyserver.go.generic.callback = SpecifyServer_Event;
|
||||
s_specifyserver.go.width = 150;
|
||||
s_specifyserver.go.height = 42;
|
||||
s_specifyserver.go.color = CT_DKPURPLE1;
|
||||
s_specifyserver.go.color2 = CT_LTPURPLE1;
|
||||
s_specifyserver.go.textX = 5;
|
||||
s_specifyserver.go.textY = 2;
|
||||
s_specifyserver.go.textEnum = MBT_ENGAGEMULTIPLAYER;
|
||||
s_specifyserver.go.textcolor = CT_BLACK;
|
||||
s_specifyserver.go.textcolor2 = CT_WHITE;
|
||||
|
||||
Menu_AddItem( &s_specifyserver.menu, &s_specifyserver.mainmenu );
|
||||
|
||||
Menu_AddItem( &s_specifyserver.menu, &s_specifyserver.domain );
|
||||
Menu_AddItem( &s_specifyserver.menu, &s_specifyserver.port );
|
||||
Menu_AddItem( &s_specifyserver.menu, &s_specifyserver.go );
|
||||
Menu_AddItem( &s_specifyserver.menu, &s_specifyserver.back );
|
||||
Menu_AddItem(&s_specifyserver.menu, &s_specifyserver.mainmenu);
|
||||
|
||||
Com_sprintf( s_specifyserver.port.field.buffer, 6, "%i", 27960 );
|
||||
Menu_AddItem(&s_specifyserver.menu, &s_specifyserver.domain);
|
||||
Menu_AddItem(&s_specifyserver.menu, &s_specifyserver.port);
|
||||
Menu_AddItem(&s_specifyserver.menu, &s_specifyserver.go);
|
||||
Menu_AddItem(&s_specifyserver.menu, &s_specifyserver.back);
|
||||
|
||||
Com_sprintf(s_specifyserver.port.field.buffer, 6, "%i", 27960);
|
||||
UI_LogFuncEnd();
|
||||
}
|
||||
|
||||
|
|
@ -260,7 +261,7 @@ void SpecifyServer_MenuInit( void )
|
|||
SpecifyServer_Cache
|
||||
=================
|
||||
*/
|
||||
void SpecifyServer_Cache( void )
|
||||
void SpecifyServer_Cache(void)
|
||||
{
|
||||
UI_LogFuncBegin();
|
||||
s_specifyserver.corner_ul = trap_R_RegisterShaderNoMip("menu/common/corner_ul_18_18.tga");
|
||||
|
|
@ -275,11 +276,11 @@ void SpecifyServer_Cache( void )
|
|||
UI_SpecifyServerMenu
|
||||
=================
|
||||
*/
|
||||
void UI_SpecifyServerMenu( void )
|
||||
void UI_SpecifyServerMenu(void)
|
||||
{
|
||||
UI_LogFuncBegin();
|
||||
SpecifyServer_MenuInit();
|
||||
UI_PushMenu( &s_specifyserver.menu );
|
||||
UI_PushMenu(&s_specifyserver.menu);
|
||||
UI_LogFuncEnd();
|
||||
}
|
||||
|
||||
|
|
|
|||
158
code/ui/ui_sql.c
158
code/ui/ui_sql.c
|
|
@ -2,7 +2,7 @@
|
|||
UI_sql.C
|
||||
|
||||
User interface trigger from within game
|
||||
**********************************************************************/
|
||||
**********************************************************************/
|
||||
|
||||
#include "ui_local.h"
|
||||
#include "ui_logger.h"
|
||||
|
|
@ -14,14 +14,16 @@ typedef struct {
|
|||
menufield_s user;
|
||||
menufield_s password;
|
||||
|
||||
char *sUsername;
|
||||
char *sPassword;
|
||||
char* sUsername;
|
||||
char* sPassword;
|
||||
} sql_t;
|
||||
|
||||
sql_t s_sql;
|
||||
|
||||
#define ID_QUIT 10
|
||||
#define ID_LOGIN 11
|
||||
enum ui_sqlIDs_e {
|
||||
ID_QUIT = 10,
|
||||
ID_LOGIN
|
||||
};
|
||||
|
||||
/*
|
||||
=================
|
||||
|
|
@ -38,12 +40,12 @@ static void M_sql_Event(void *ptr, int32_t notification) {
|
|||
switch (id)
|
||||
{
|
||||
case ID_QUIT:
|
||||
if(notification == QM_ACTIVATED) {
|
||||
if (notification == QM_ACTIVATED) {
|
||||
UI_PopMenu();
|
||||
}
|
||||
break;
|
||||
case ID_LOGIN:
|
||||
if(notification == QM_ACTIVATED) {
|
||||
if (notification == QM_ACTIVATED) {
|
||||
// do login
|
||||
}
|
||||
break;
|
||||
|
|
@ -58,13 +60,13 @@ static void M_sql_Event(void *ptr, int32_t notification) {
|
|||
sqlMenu_Key
|
||||
=================
|
||||
*/
|
||||
sfxHandle_t sqlMenu_Key (int32_t key)
|
||||
sfxHandle_t sqlMenu_Key(int32_t key)
|
||||
{
|
||||
return ( Menu_DefaultKey( &s_sql.menu, key ) );
|
||||
return (Menu_DefaultKey(&s_sql.menu, key));
|
||||
}
|
||||
|
||||
qhandle_t box_rounded;
|
||||
qhandle_t corner_lu;
|
||||
qhandle_t box_rounded;
|
||||
qhandle_t corner_lu;
|
||||
|
||||
|
||||
/*
|
||||
|
|
@ -72,7 +74,7 @@ qhandle_t corner_lu;
|
|||
M_sqlMenu_Graphics
|
||||
=================
|
||||
*/
|
||||
static void M_sqlMenu_Graphics (void)
|
||||
static void M_sqlMenu_Graphics(void)
|
||||
{
|
||||
UI_LogFuncBegin();
|
||||
float bg[] = { 0, 0, 0, 0.7 };
|
||||
|
|
@ -89,7 +91,7 @@ static void M_sqlMenu_Graphics (void)
|
|||
UI_DrawHandlePic(232, 324, 176, 31.75, uis.whiteShader);
|
||||
UI_DrawHandlePic(164, 192, 31.75, 96, uis.whiteShader);
|
||||
UI_DrawHandlePic(444, 192, 31.75, 96, uis.whiteShader);
|
||||
UI_DrawString(234, 132, "LCARS AUTH", UI_LEFT|UI_SMALLFONT, colorTable[CT_BLACK], qtrue); // TODO multi lang text
|
||||
UI_DrawString(234, 132, "LCARS AUTH", UI_LEFT | UI_SMALLFONT, colorTable[CT_BLACK], qtrue); // TODO multi lang text
|
||||
|
||||
// TODO
|
||||
UI_LogFuncEnd();
|
||||
|
|
@ -100,8 +102,8 @@ static void M_sqlMenu_Graphics (void)
|
|||
UI_sqlMenu_Cache
|
||||
===============
|
||||
*/
|
||||
void UI_sqlMenu_Cache (void)
|
||||
{
|
||||
void UI_sqlMenu_Cache(void)
|
||||
{
|
||||
UI_LogFuncBegin();
|
||||
box_rounded = trap_R_RegisterShaderNoMip("menu/common/box_rounded.tga");
|
||||
corner_lu = trap_R_RegisterShaderNoMip("menu/common/corner_lu.tga");
|
||||
|
|
@ -118,8 +120,8 @@ static void sqlMenu_Draw(void)
|
|||
UI_LogFuncBegin();
|
||||
// Draw graphics particular to Main Menu
|
||||
M_sqlMenu_Graphics();
|
||||
|
||||
Menu_Draw( &s_sql.menu );
|
||||
|
||||
Menu_Draw(&s_sql.menu);
|
||||
UI_LogFuncEnd();
|
||||
}
|
||||
|
||||
|
|
@ -131,67 +133,67 @@ msdMenu_Init
|
|||
void sqlMenu_Init(void)
|
||||
{
|
||||
UI_LogFuncBegin();
|
||||
s_sql.menu.nitems = 0;
|
||||
s_sql.menu.draw = sqlMenu_Draw;
|
||||
s_sql.menu.key = sqlMenu_Key;
|
||||
s_sql.menu.wrapAround = qtrue;
|
||||
s_sql.menu.descX = -400;
|
||||
s_sql.menu.descY = -400;
|
||||
s_sql.menu.titleX = MENU_TITLE_X;
|
||||
s_sql.menu.titleY = MENU_TITLE_Y;
|
||||
s_sql.menu.fullscreen = qfalse;
|
||||
s_sql.menu.nobackground = qtrue;
|
||||
s_sql.menu.nitems = 0;
|
||||
s_sql.menu.draw = sqlMenu_Draw;
|
||||
s_sql.menu.key = sqlMenu_Key;
|
||||
s_sql.menu.wrapAround = qtrue;
|
||||
s_sql.menu.descX = -400;
|
||||
s_sql.menu.descY = -400;
|
||||
s_sql.menu.titleX = MENU_TITLE_X;
|
||||
s_sql.menu.titleY = MENU_TITLE_Y;
|
||||
s_sql.menu.fullscreen = qfalse;
|
||||
s_sql.menu.nobackground = qtrue;
|
||||
|
||||
s_sql.quitmenu.generic.type = MTYPE_BITMAP;
|
||||
s_sql.quitmenu.generic.flags = QMF_HIGHLIGHT_IF_FOCUS;
|
||||
s_sql.quitmenu.generic.x = 490;
|
||||
s_sql.quitmenu.generic.y = 380;
|
||||
s_sql.quitmenu.generic.name = GRAPHIC_BUTTONLEFT;
|
||||
s_sql.quitmenu.generic.id = ID_QUIT;
|
||||
s_sql.quitmenu.generic.callback = M_sql_Event;
|
||||
s_sql.quitmenu.width = MENU_BUTTON_MED_WIDTH-20;
|
||||
s_sql.quitmenu.height = PROP_BIG_HEIGHT;
|
||||
s_sql.quitmenu.color = CT_DKPURPLE1;
|
||||
s_sql.quitmenu.color2 = CT_LTPURPLE1;
|
||||
s_sql.quitmenu.textX = MENU_BUTTON_TEXT_X;
|
||||
s_sql.quitmenu.textY = 12;
|
||||
s_sql.quitmenu.textEnum = MBT_QUIT; // TODO needs own text
|
||||
s_sql.quitmenu.textcolor = CT_BLACK;
|
||||
s_sql.quitmenu.textcolor2 = CT_WHITE;
|
||||
s_sql.quitmenu.textStyle = UI_TINYFONT;
|
||||
s_sql.quitmenu.generic.type = MTYPE_BITMAP;
|
||||
s_sql.quitmenu.generic.flags = QMF_HIGHLIGHT_IF_FOCUS;
|
||||
s_sql.quitmenu.generic.x = 490;
|
||||
s_sql.quitmenu.generic.y = 380;
|
||||
s_sql.quitmenu.generic.name = GRAPHIC_BUTTONLEFT;
|
||||
s_sql.quitmenu.generic.id = ID_QUIT;
|
||||
s_sql.quitmenu.generic.callback = M_sql_Event;
|
||||
s_sql.quitmenu.width = MENU_BUTTON_MED_WIDTH - 20;
|
||||
s_sql.quitmenu.height = PROP_BIG_HEIGHT;
|
||||
s_sql.quitmenu.color = CT_DKPURPLE1;
|
||||
s_sql.quitmenu.color2 = CT_LTPURPLE1;
|
||||
s_sql.quitmenu.textX = MENU_BUTTON_TEXT_X;
|
||||
s_sql.quitmenu.textY = 12;
|
||||
s_sql.quitmenu.textEnum = MBT_QUIT; // TODO needs own text
|
||||
s_sql.quitmenu.textcolor = CT_BLACK;
|
||||
s_sql.quitmenu.textcolor2 = CT_WHITE;
|
||||
s_sql.quitmenu.textStyle = UI_TINYFONT;
|
||||
|
||||
s_sql.login.generic.type = MTYPE_BITMAP;
|
||||
s_sql.login.generic.flags = QMF_HIGHLIGHT_IF_FOCUS;
|
||||
s_sql.login.generic.x = 350;
|
||||
s_sql.login.generic.y = 380;
|
||||
s_sql.login.generic.name = GRAPHIC_BUTTONRIGHT;
|
||||
s_sql.login.generic.id = ID_LOGIN;
|
||||
s_sql.login.generic.callback = M_sql_Event;
|
||||
s_sql.login.width = MENU_BUTTON_MED_WIDTH-20;
|
||||
s_sql.login.height = PROP_BIG_HEIGHT;
|
||||
s_sql.login.color = CT_DKPURPLE1;
|
||||
s_sql.login.color2 = CT_LTPURPLE1;
|
||||
s_sql.login.textX = MENU_BUTTON_TEXT_X;
|
||||
s_sql.login.textY = 12;
|
||||
s_sql.login.textEnum = MBT_ACCEPT; // TODO needs own text
|
||||
s_sql.login.textcolor = CT_BLACK;
|
||||
s_sql.login.textcolor2 = CT_WHITE;
|
||||
s_sql.login.textStyle = UI_TINYFONT;
|
||||
s_sql.login.generic.type = MTYPE_BITMAP;
|
||||
s_sql.login.generic.flags = QMF_HIGHLIGHT_IF_FOCUS;
|
||||
s_sql.login.generic.x = 350;
|
||||
s_sql.login.generic.y = 380;
|
||||
s_sql.login.generic.name = GRAPHIC_BUTTONRIGHT;
|
||||
s_sql.login.generic.id = ID_LOGIN;
|
||||
s_sql.login.generic.callback = M_sql_Event;
|
||||
s_sql.login.width = MENU_BUTTON_MED_WIDTH - 20;
|
||||
s_sql.login.height = PROP_BIG_HEIGHT;
|
||||
s_sql.login.color = CT_DKPURPLE1;
|
||||
s_sql.login.color2 = CT_LTPURPLE1;
|
||||
s_sql.login.textX = MENU_BUTTON_TEXT_X;
|
||||
s_sql.login.textY = 12;
|
||||
s_sql.login.textEnum = MBT_ACCEPT; // TODO needs own text
|
||||
s_sql.login.textcolor = CT_BLACK;
|
||||
s_sql.login.textcolor2 = CT_WHITE;
|
||||
s_sql.login.textStyle = UI_TINYFONT;
|
||||
|
||||
s_sql.user.generic.type = MTYPE_FIELD;
|
||||
s_sql.user.field.widthInChars = 16;
|
||||
s_sql.user.field.maxchars = 64;
|
||||
s_sql.user.generic.x = 260;
|
||||
s_sql.user.generic.y = 217;
|
||||
s_sql.user.field.style = UI_SMALLFONT;
|
||||
s_sql.user.field.titleEnum = MBT_ADMIN_ENTITY; // TODO ... needs own text
|
||||
s_sql.user.field.titlecolor = CT_WHITE;
|
||||
s_sql.user.field.textcolor = CT_WHITE;
|
||||
s_sql.user.field.textcolor2 = CT_LTGREY;
|
||||
s_sql.user.generic.type = MTYPE_FIELD;
|
||||
s_sql.user.field.widthInChars = 16;
|
||||
s_sql.user.field.maxchars = 64;
|
||||
s_sql.user.generic.x = 260;
|
||||
s_sql.user.generic.y = 217;
|
||||
s_sql.user.field.style = UI_SMALLFONT;
|
||||
s_sql.user.field.titleEnum = MBT_ADMIN_ENTITY; // TODO ... needs own text
|
||||
s_sql.user.field.titlecolor = CT_WHITE;
|
||||
s_sql.user.field.textcolor = CT_WHITE;
|
||||
s_sql.user.field.textcolor2 = CT_LTGREY;
|
||||
|
||||
Menu_AddItem( &s_sql.menu, &s_sql.quitmenu );
|
||||
Menu_AddItem( &s_sql.menu, &s_sql.login );
|
||||
Menu_AddItem( &s_sql.menu, &s_sql.user);
|
||||
Menu_AddItem(&s_sql.menu, &s_sql.quitmenu);
|
||||
Menu_AddItem(&s_sql.menu, &s_sql.login);
|
||||
Menu_AddItem(&s_sql.menu, &s_sql.user);
|
||||
UI_LogFuncEnd();
|
||||
}
|
||||
|
||||
|
|
@ -202,7 +204,7 @@ UI_sqlMenu
|
|||
*/
|
||||
void UI_sqlMenu(void) {
|
||||
UI_LogFuncBegin();
|
||||
memset( &s_sql, 0, sizeof( s_sql ) );
|
||||
memset(&s_sql, 0, sizeof(s_sql));
|
||||
|
||||
uis.menusp = 0;
|
||||
|
||||
|
|
@ -212,10 +214,10 @@ void UI_sqlMenu(void) {
|
|||
|
||||
UI_sqlMenu_Cache();
|
||||
|
||||
sqlMenu_Init();
|
||||
sqlMenu_Init();
|
||||
|
||||
UI_PushMenu( &s_sql.menu );
|
||||
UI_PushMenu(&s_sql.menu);
|
||||
|
||||
Menu_AdjustCursor( &s_sql.menu, 1 );
|
||||
Menu_AdjustCursor(&s_sql.menu, 1);
|
||||
UI_LogFuncEnd();
|
||||
}
|
||||
File diff suppressed because it is too large
Load diff
Loading…
Reference in a new issue