ubergames
/
rpgxef
mirror of https://github.com/UberGames/rpgxEF.git
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

more updates

This commit is contained in:
Walter Julius Hennecke 2014-11-08 11:59:05 +01:00
parent 211d287385
commit 636d72a1c9
3 changed files with 1436 additions and 1429 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
code/ui/ui_players.c
View File

@ -5,25 +5,26 @@
#include "ui_local.h"
#include "ui_logger.h"
enum ui_playersTimer_e {
UI_TIMER_WEAPON_DELAY = 250,
UI_TIMER_WEAPON_SWITCH = 300,
UI_TIMER_ATTACK = 500,
UI_TIMER_MUZZLE_FLASH = 20,
UI_TIMER_LAND = 130,
UI_TIMER_JUMP = 1000,
UI_TIMER_GESTURE = 2300
};
#define UI_TIMER_GESTURE 2300
#define UI_TIMER_JUMP 1000
#define UI_TIMER_LAND 130
#define UI_TIMER_WEAPON_SWITCH 300
#define UI_TIMER_ATTACK 500
#define UI_TIMER_MUZZLE_FLASH 20
#define UI_TIMER_WEAPON_DELAY 250
static const int32_t JUMP_HEIGHT = 56;
#define JUMP_HEIGHT 56
static const double SWINGSPEED = 0.2; //TiM - 0.3
#define SWINGSPEED 0.2 //TiM - 0.3
#define SPIN_SPEED 0.9
#define COAST_TIME 1000
static const double SPIN_SPEED = 0.9;
static const int32_t COAST_TIME = 1000;
static int32_t dp_realtime;
static float jumpHeight;
static int32_t dp_realtime;
static float jumpHeight;
//TiM : Bolton Table
stringID_table_t BoltonTable[BOLTON_MAX + 1] =

1103
code/ui/ui_playersettings.c
View File

File diff suppressed because it is too large Load Diff

527
code/ui/ui_preferences.c
View File

@ -12,9 +12,11 @@ GAME OPTIONS MENU
#include "ui_local.h"
#include "ui_logger.h"
enum ui_preferencesLimits_e {
NUM_CROSSHAIRS = 12
};
#define NUM_CROSSHAIRS 12
#define PIC_BUTTON2 "menu/common/full_button2.tga"
static const char PIC_BUTTON2[] = "menu/common/full_button2.tga";
extern void BG_LoadItemNames(void);
@ -39,31 +41,30 @@ static struct
extern int32_t s_OffOnNone_Names[];
#define ID_LIGHTFLARES 129
#define ID_LIGHTFLARES_VALUE 130
#define ID_WALLMARKS_VALUE 133
#define ID_DYNAMICLIGHTS_VALUE 135
#define ID_IDENTIFYTARGET_VALUE 137
#define ID_SYNCEVERYFRAME_VALUE 139
#define PREFERENCES_X_POS 360
#define ID_TEXTLANGUAGE 126
#define ID_CROSSHAIR 127
#define ID_SIMPLEITEMS 128
#define ID_HIGHQUALITYSKY 129
#define ID_EJECTINGBRASS 130
#define ID_WALLMARKS 131
#define ID_DYNAMICLIGHTS 132
#define ID_IDENTIFYTARGET 133
#define ID_SYNCEVERYFRAME 134
#define ID_FORCEMODEL 135
#define ID_DRAWTEAMOVERLAY 136
#define ID_ALLOWDOWNLOAD 137
#define ID_BACK 138
#define ID_VOICELANGUAGE 139
enum ui_preferencesIDs_e {
ID_TEXTLANGUAGE = 126,
ID_CROSSHAIR,
ID_SIMPLEITEMS,
ID_HIGHQUALITYSKY = 129,
ID_LIGHTFLARES = 129,
ID_LIGHTFLARES_VALUE = 130,
ID_EJECTINGBRASS = 130,
ID_WALLMARKS,
ID_DYNAMICLIGHTS,
ID_WALLMARKS_VALUE = 133,
ID_IDENTIFYTARGET = 133,
ID_SYNCEVERYFRAME,
ID_FORCEMODEL = 135,
ID_DYNAMICLIGHTS_VALUE = 135,
ID_DRAWTEAMOVERLAY,
ID_ALLOWDOWNLOAD = 137,
ID_IDENTIFYTARGET_VALUE = 137,
ID_BACK,
ID_VOICELANGUAGE = 139,
ID_SYNCEVERYFRAME_VALUE = 139
};
static const int32_t PREFERENCES_X_POS = 360;
typedef struct {
@ -104,33 +105,33 @@ int32_t s_voicelanguage_Names[] =
MNT_NONE
};
static void Preferences_SetMenuItems( void )
static void Preferences_SetMenuItems(void)
{
UI_LogFuncBegin();
char buffer[32];
int32_t *language;
s_preferences.currentcrosshair = trap_Cvar_VariableValue( "cg_drawCrosshair" ) != 0 /*% NUM_CROSSHAIRS*/;
s_preferences.simpleitems.curvalue = trap_Cvar_VariableValue( "cg_simpleItems" ) != 0;
s_preferences.wallmarks.curvalue = trap_Cvar_VariableValue( "cg_marks" ) != 0;
s_preferences.identifytarget.curvalue = trap_Cvar_VariableValue( "cg_drawCrosshairNames" ) != 0;
s_preferences.dynamiclights.curvalue = trap_Cvar_VariableValue( "r_dynamiclight" ) != 0;
s_preferences.synceveryframe.curvalue = trap_Cvar_VariableValue( "r_finish" ) != 0;
s_preferences.forcemodel.curvalue = trap_Cvar_VariableValue( "cg_forcemodel" ) != 0;
s_preferences.drawteamoverlay.curvalue = Com_Clamp( 0, 3, trap_Cvar_VariableValue( "cg_drawTeamOverlay" ) );
s_preferences.allowdownload.curvalue = trap_Cvar_VariableValue( "cl_allowDownload" ) != 0;
s_preferences.currentcrosshair = trap_Cvar_VariableValue("cg_drawCrosshair") != 0 /*% NUM_CROSSHAIRS*/;
s_preferences.simpleitems.curvalue = trap_Cvar_VariableValue("cg_simpleItems") != 0;
s_preferences.wallmarks.curvalue = trap_Cvar_VariableValue("cg_marks") != 0;
s_preferences.identifytarget.curvalue = trap_Cvar_VariableValue("cg_drawCrosshairNames") != 0;
s_preferences.dynamiclights.curvalue = trap_Cvar_VariableValue("r_dynamiclight") != 0;
s_preferences.synceveryframe.curvalue = trap_Cvar_VariableValue("r_finish") != 0;
s_preferences.forcemodel.curvalue = trap_Cvar_VariableValue("cg_forcemodel") != 0;
s_preferences.drawteamoverlay.curvalue = Com_Clamp(0, 3, trap_Cvar_VariableValue("cg_drawTeamOverlay"));
s_preferences.allowdownload.curvalue = trap_Cvar_VariableValue("cl_allowDownload") != 0;
s_preferences.flares.curvalue = Com_Clamp( 0, 1, trap_Cvar_VariableValue( "r_flares" ));
s_preferences.flares.curvalue = Com_Clamp(0, 1, trap_Cvar_VariableValue("r_flares"));
trap_Cvar_VariableStringBuffer( "g_language", buffer, 32 );
trap_Cvar_VariableStringBuffer("g_language", buffer, 32);
language = s_textlanguage_Names;
s_preferences.textlanguage.curvalue = 0;
if (buffer[0]) {
while (*language) //scan for a match
{
if (Q_stricmp(menu_normal_text[*language],buffer)==0)
if (Q_stricmp(menu_normal_text[*language], buffer) == 0)
{
break;
}
@ -144,14 +145,14 @@ static void Preferences_SetMenuItems( void )
}
}
trap_Cvar_VariableStringBuffer( "s_language", buffer, 32 );
trap_Cvar_VariableStringBuffer("s_language", buffer, 32);
language = s_voicelanguage_Names;
s_preferences.voicelanguage.curvalue = 0;
if (buffer[0]) {
while (*language) //scan for a match
{
if (Q_stricmp(menu_normal_text[*language],buffer)==0)
if (Q_stricmp(menu_normal_text[*language], buffer) == 0)
{
break;
}
@ -168,67 +169,67 @@ static void Preferences_SetMenuItems( void )
}
static void Preferences_Event( void* ptr, int32_t notification )
static void Preferences_Event(void* ptr, int32_t notification)
{
UI_LogFuncBegin();
if( notification != QM_ACTIVATED )
if (notification != QM_ACTIVATED)
{
UI_LogFuncEnd();
return;
}
switch( ((menucommon_s*)ptr)->id )
switch (((menucommon_s*)ptr)->id)
{
case ID_CROSSHAIR:
trap_Cvar_SetValue( "cg_drawCrosshair", s_preferences.crosshair.curvalue );
trap_Cvar_SetValue("cg_drawCrosshair", s_preferences.crosshair.curvalue);
break;
case ID_SIMPLEITEMS:
trap_Cvar_SetValue( "cg_simpleItems", s_preferences.simpleitems.curvalue );
trap_Cvar_SetValue("cg_simpleItems", s_preferences.simpleitems.curvalue);
break;
case ID_LIGHTFLARES:
trap_Cvar_SetValue( "r_flares", s_preferences.flares.curvalue );
trap_Cvar_SetValue("r_flares", s_preferences.flares.curvalue);
break;
case ID_WALLMARKS:
trap_Cvar_SetValue( "cg_marks", s_preferences.wallmarks.curvalue );
trap_Cvar_SetValue("cg_marks", s_preferences.wallmarks.curvalue);
break;
case ID_DYNAMICLIGHTS:
trap_Cvar_SetValue( "r_dynamiclight", s_preferences.dynamiclights.curvalue );
trap_Cvar_SetValue("r_dynamiclight", s_preferences.dynamiclights.curvalue);
break;
case ID_IDENTIFYTARGET:
trap_Cvar_SetValue( "cg_drawCrosshairNames", s_preferences.identifytarget.curvalue );
trap_Cvar_SetValue("cg_drawCrosshairNames", s_preferences.identifytarget.curvalue);
break;
case ID_SYNCEVERYFRAME:
trap_Cvar_SetValue( "r_finish", s_preferences.synceveryframe.curvalue );
trap_Cvar_SetValue("r_finish", s_preferences.synceveryframe.curvalue);
break;
case ID_FORCEMODEL:
trap_Cvar_SetValue( "cg_forcemodel", s_preferences.forcemodel.curvalue );
trap_Cvar_SetValue("cg_forcemodel", s_preferences.forcemodel.curvalue);
break;
case ID_DRAWTEAMOVERLAY:
trap_Cvar_SetValue( "cg_drawTeamOverlay", s_preferences.drawteamoverlay.curvalue );
trap_Cvar_SetValue("cg_drawTeamOverlay", s_preferences.drawteamoverlay.curvalue);
break;
case ID_ALLOWDOWNLOAD:
trap_Cvar_SetValue( "cl_allowDownload", s_preferences.allowdownload.curvalue );
trap_Cvar_SetValue("cl_allowDownload", s_preferences.allowdownload.curvalue);
break;
case ID_TEXTLANGUAGE:
trap_Cvar_Set( "g_language", menu_normal_text[s_textlanguage_Names[s_preferences.textlanguage.curvalue]] );
trap_Cvar_Set("g_language", menu_normal_text[s_textlanguage_Names[s_preferences.textlanguage.curvalue]]);
UI_LoadButtonText(); //reload the menus
UI_LoadMenuText();
BG_LoadItemNames();
break;
case ID_VOICELANGUAGE:
trap_Cvar_Set( "s_language", menu_normal_text[s_voicelanguage_Names[s_preferences.voicelanguage.curvalue]] );
trap_Cmd_ExecuteText( EXEC_APPEND, "snd_restart\n" );
trap_Cvar_Set("s_language", menu_normal_text[s_voicelanguage_Names[s_preferences.voicelanguage.curvalue]]);
trap_Cmd_ExecuteText(EXEC_APPEND, "snd_restart\n");
break;
case ID_BACK:
@ -243,7 +244,7 @@ static void Preferences_Event( void* ptr, int32_t notification )
GameOptions_MenuDraw
=================
*/
static void GameOptions_MenuDraw( void )
static void GameOptions_MenuDraw(void)
{
UI_LogFuncBegin();
@ -251,17 +252,17 @@ static void GameOptions_MenuDraw( void )
UI_Setup_MenuButtons();
trap_R_SetColor( colorTable[CT_DKPURPLE2]);
UI_DrawHandlePic(30,203, 47, 186, uis.whiteShader); // Long left hand column square
trap_R_SetColor(colorTable[CT_DKPURPLE2]);
UI_DrawHandlePic(30, 203, 47, 186, uis.whiteShader); // Long left hand column square
// Menu frame numbers
UI_DrawProportionalString( 74, 66, "1776",UI_RIGHT|UI_TINYFONT, colorTable[CT_BLACK]);
UI_DrawProportionalString( 74, 84, "9214",UI_RIGHT|UI_TINYFONT, colorTable[CT_BLACK]);
UI_DrawProportionalString( 74, 188, "2510-81",UI_RIGHT|UI_TINYFONT, colorTable[CT_BLACK]);
UI_DrawProportionalString( 74, 206, "644",UI_RIGHT|UI_TINYFONT, colorTable[CT_BLACK]);
UI_DrawProportionalString( 74, 395, "1001001",UI_RIGHT|UI_TINYFONT, colorTable[CT_BLACK]);
UI_DrawProportionalString(74, 66, "1776", UI_RIGHT | UI_TINYFONT, colorTable[CT_BLACK]);
UI_DrawProportionalString(74, 84, "9214", UI_RIGHT | UI_TINYFONT, colorTable[CT_BLACK]);
UI_DrawProportionalString(74, 188, "2510-81", UI_RIGHT | UI_TINYFONT, colorTable[CT_BLACK]);
UI_DrawProportionalString(74, 206, "644", UI_RIGHT | UI_TINYFONT, colorTable[CT_BLACK]);
UI_DrawProportionalString(74, 395, "1001001", UI_RIGHT | UI_TINYFONT, colorTable[CT_BLACK]);
Menu_Draw( &s_gameoptions.menu );
Menu_Draw(&s_gameoptions.menu);
UI_LogFuncEnd();
}
@ -270,16 +271,16 @@ static void GameOptions_MenuDraw( void )
GameOptions_MenuKey
=================
*/
static sfxHandle_t GameOptions_MenuKey( int32_t key )
static sfxHandle_t GameOptions_MenuKey(int32_t key)
{
return Menu_DefaultKey( &s_gameoptions.menu, key );
return Menu_DefaultKey(&s_gameoptions.menu, key);
}
/*
===============
UI_GameOptionsMenu_Cache
===============
*/
void UI_GameOptionsMenu_Cache( void )
void UI_GameOptionsMenu_Cache(void)
{
UI_LogFuncBegin();
@ -306,234 +307,234 @@ void UI_GameOptionsMenu_Cache( void )
GameOptions_MenuInit
=================
*/
static void GameOptions_MenuInit( void )
static void GameOptions_MenuInit(void)
{
UI_LogFuncBegin();
int32_t x,y,inc,width;
int32_t x, y, inc, width;
UI_GameOptionsMenu_Cache();
s_gameoptions.menu.nitems = 0;
s_gameoptions.menu.wrapAround = qtrue;
s_gameoptions.menu.draw = GameOptions_MenuDraw;
s_gameoptions.menu.key = GameOptions_MenuKey;
s_gameoptions.menu.fullscreen = qtrue;
s_gameoptions.menu.descX = MENU_DESC_X;
s_gameoptions.menu.descY = MENU_DESC_Y;
s_gameoptions.menu.titleX = MENU_TITLE_X;
s_gameoptions.menu.titleY = MENU_TITLE_Y;
s_gameoptions.menu.titleI = MNT_CONTROLSMENU_TITLE;
s_gameoptions.menu.footNoteEnum = MNT_GAMEOPTION_LABEL;
s_gameoptions.menu.nitems = 0;
s_gameoptions.menu.wrapAround = qtrue;
s_gameoptions.menu.draw = GameOptions_MenuDraw;
s_gameoptions.menu.key = GameOptions_MenuKey;
s_gameoptions.menu.fullscreen = qtrue;
s_gameoptions.menu.descX = MENU_DESC_X;
s_gameoptions.menu.descY = MENU_DESC_Y;
s_gameoptions.menu.titleX = MENU_TITLE_X;
s_gameoptions.menu.titleY = MENU_TITLE_Y;
s_gameoptions.menu.titleI = MNT_CONTROLSMENU_TITLE;
s_gameoptions.menu.footNoteEnum = MNT_GAMEOPTION_LABEL;
SetupMenu_TopButtons(&s_gameoptions.menu,MENU_GAME,NULL);
SetupMenu_TopButtons(&s_gameoptions.menu, MENU_GAME, NULL);
inc = 24;
x = 100;
y = 170;
width = 160; //170
s_preferences.flares.generic.type = MTYPE_SPINCONTROL;
s_preferences.flares.generic.flags = QMF_HIGHLIGHT_IF_FOCUS;
s_preferences.flares.generic.x = x;
s_preferences.flares.generic.y = y;
s_preferences.flares.generic.callback = Preferences_Event;
s_preferences.flares.generic.id = ID_LIGHTFLARES;
s_preferences.flares.textEnum = MBT_LIGHTFLARES;
s_preferences.flares.textcolor = CT_BLACK;
s_preferences.flares.textcolor2 = CT_WHITE;
s_preferences.flares.color = CT_DKPURPLE1;
s_preferences.flares.color2 = CT_LTPURPLE1;
s_preferences.flares.textX = MENU_BUTTON_TEXT_X;
s_preferences.flares.textY = MENU_BUTTON_TEXT_Y;
s_preferences.flares.listnames = s_OffOnNone_Names;
s_preferences.flares.width = width;
s_preferences.flares.generic.type = MTYPE_SPINCONTROL;
s_preferences.flares.generic.flags = QMF_HIGHLIGHT_IF_FOCUS;
s_preferences.flares.generic.x = x;
s_preferences.flares.generic.y = y;
s_preferences.flares.generic.callback = Preferences_Event;
s_preferences.flares.generic.id = ID_LIGHTFLARES;
s_preferences.flares.textEnum = MBT_LIGHTFLARES;
s_preferences.flares.textcolor = CT_BLACK;
s_preferences.flares.textcolor2 = CT_WHITE;
s_preferences.flares.color = CT_DKPURPLE1;
s_preferences.flares.color2 = CT_LTPURPLE1;
s_preferences.flares.textX = MENU_BUTTON_TEXT_X;
s_preferences.flares.textY = MENU_BUTTON_TEXT_Y;
s_preferences.flares.listnames = s_OffOnNone_Names;
s_preferences.flares.width = width;
y += inc;
s_preferences.wallmarks.generic.type = MTYPE_SPINCONTROL;
s_preferences.wallmarks.generic.flags = QMF_HIGHLIGHT_IF_FOCUS;
s_preferences.wallmarks.generic.x = x;
s_preferences.wallmarks.generic.y = y;
s_preferences.wallmarks.generic.callback = Preferences_Event;
s_preferences.wallmarks.generic.id = ID_WALLMARKS;
s_preferences.wallmarks.textEnum = MBT_WALLMARKS1;
s_preferences.wallmarks.textcolor = CT_BLACK;
s_preferences.wallmarks.textcolor2 = CT_WHITE;
s_preferences.wallmarks.color = CT_DKPURPLE1;
s_preferences.wallmarks.color2 = CT_LTPURPLE1;
s_preferences.wallmarks.textX = MENU_BUTTON_TEXT_X;
s_preferences.wallmarks.textY = MENU_BUTTON_TEXT_Y;
s_preferences.wallmarks.listnames = s_OffOnNone_Names;
s_preferences.wallmarks.width = width;
s_preferences.wallmarks.generic.type = MTYPE_SPINCONTROL;
s_preferences.wallmarks.generic.flags = QMF_HIGHLIGHT_IF_FOCUS;
s_preferences.wallmarks.generic.x = x;
s_preferences.wallmarks.generic.y = y;
s_preferences.wallmarks.generic.callback = Preferences_Event;
s_preferences.wallmarks.generic.id = ID_WALLMARKS;
s_preferences.wallmarks.textEnum = MBT_WALLMARKS1;
s_preferences.wallmarks.textcolor = CT_BLACK;
s_preferences.wallmarks.textcolor2 = CT_WHITE;
s_preferences.wallmarks.color = CT_DKPURPLE1;
s_preferences.wallmarks.color2 = CT_LTPURPLE1;
s_preferences.wallmarks.textX = MENU_BUTTON_TEXT_X;
s_preferences.wallmarks.textY = MENU_BUTTON_TEXT_Y;
s_preferences.wallmarks.listnames = s_OffOnNone_Names;
s_preferences.wallmarks.width = width;
y += inc;
s_preferences.dynamiclights.generic.type = MTYPE_SPINCONTROL;
s_preferences.dynamiclights.generic.flags = QMF_HIGHLIGHT_IF_FOCUS;
s_preferences.dynamiclights.generic.x = x;
s_preferences.dynamiclights.generic.y = y;
s_preferences.dynamiclights.generic.callback = Preferences_Event;
s_preferences.dynamiclights.generic.id = ID_DYNAMICLIGHTS;
s_preferences.dynamiclights.textEnum = MBT_DYNAMICLIGHTS1;
s_preferences.dynamiclights.textcolor = CT_BLACK;
s_preferences.dynamiclights.textcolor2 = CT_WHITE;
s_preferences.dynamiclights.color = CT_DKPURPLE1;
s_preferences.dynamiclights.color2 = CT_LTPURPLE1;
s_preferences.dynamiclights.textX = MENU_BUTTON_TEXT_X;
s_preferences.dynamiclights.textY = MENU_BUTTON_TEXT_Y;
s_preferences.dynamiclights.listnames = s_OffOnNone_Names;
s_preferences.dynamiclights.width = width;
s_preferences.dynamiclights.generic.type = MTYPE_SPINCONTROL;
s_preferences.dynamiclights.generic.flags = QMF_HIGHLIGHT_IF_FOCUS;
s_preferences.dynamiclights.generic.x = x;
s_preferences.dynamiclights.generic.y = y;
s_preferences.dynamiclights.generic.callback = Preferences_Event;
s_preferences.dynamiclights.generic.id = ID_DYNAMICLIGHTS;
s_preferences.dynamiclights.textEnum = MBT_DYNAMICLIGHTS1;
s_preferences.dynamiclights.textcolor = CT_BLACK;
s_preferences.dynamiclights.textcolor2 = CT_WHITE;
s_preferences.dynamiclights.color = CT_DKPURPLE1;
s_preferences.dynamiclights.color2 = CT_LTPURPLE1;
s_preferences.dynamiclights.textX = MENU_BUTTON_TEXT_X;
s_preferences.dynamiclights.textY = MENU_BUTTON_TEXT_Y;
s_preferences.dynamiclights.listnames = s_OffOnNone_Names;
s_preferences.dynamiclights.width = width;
y += inc;
s_preferences.identifytarget.generic.type = MTYPE_SPINCONTROL;
s_preferences.identifytarget.generic.flags = QMF_HIGHLIGHT_IF_FOCUS;
s_preferences.identifytarget.generic.x = x;
s_preferences.identifytarget.generic.y = y;
s_preferences.identifytarget.generic.callback = Preferences_Event;
s_preferences.identifytarget.generic.id = ID_IDENTIFYTARGET;
s_preferences.identifytarget.textEnum = MBT_IDENTIFYTARGET1;
s_preferences.identifytarget.textcolor = CT_BLACK;
s_preferences.identifytarget.textcolor2 = CT_WHITE;
s_preferences.identifytarget.color = CT_DKPURPLE1;
s_preferences.identifytarget.color2 = CT_LTPURPLE1;
s_preferences.identifytarget.textX = MENU_BUTTON_TEXT_X;
s_preferences.identifytarget.textY = MENU_BUTTON_TEXT_Y;
s_preferences.identifytarget.listnames = s_OffOnNone_Names;
s_preferences.identifytarget.width = width;
s_preferences.identifytarget.generic.type = MTYPE_SPINCONTROL;
s_preferences.identifytarget.generic.flags = QMF_HIGHLIGHT_IF_FOCUS;
s_preferences.identifytarget.generic.x = x;
s_preferences.identifytarget.generic.y = y;
s_preferences.identifytarget.generic.callback = Preferences_Event;
s_preferences.identifytarget.generic.id = ID_IDENTIFYTARGET;
s_preferences.identifytarget.textEnum = MBT_IDENTIFYTARGET1;
s_preferences.identifytarget.textcolor = CT_BLACK;
s_preferences.identifytarget.textcolor2 = CT_WHITE;
s_preferences.identifytarget.color = CT_DKPURPLE1;
s_preferences.identifytarget.color2 = CT_LTPURPLE1;
s_preferences.identifytarget.textX = MENU_BUTTON_TEXT_X;
s_preferences.identifytarget.textY = MENU_BUTTON_TEXT_Y;
s_preferences.identifytarget.listnames = s_OffOnNone_Names;
s_preferences.identifytarget.width = width;
y += inc;
s_preferences.synceveryframe.generic.type = MTYPE_SPINCONTROL;
s_preferences.synceveryframe.generic.flags = QMF_HIGHLIGHT_IF_FOCUS;
s_preferences.synceveryframe.generic.x = x;
s_preferences.synceveryframe.generic.y = y;
s_preferences.synceveryframe.generic.callback = Preferences_Event;
s_preferences.synceveryframe.generic.id = ID_SYNCEVERYFRAME;
s_preferences.synceveryframe.textEnum = MBT_SYNCEVERYFRAME1;
s_preferences.synceveryframe.textcolor = CT_BLACK;
s_preferences.synceveryframe.textcolor2 = CT_WHITE;
s_preferences.synceveryframe.color = CT_DKPURPLE1;
s_preferences.synceveryframe.color2 = CT_LTPURPLE1;
s_preferences.synceveryframe.textX = MENU_BUTTON_TEXT_X;
s_preferences.synceveryframe.textY = MENU_BUTTON_TEXT_Y;
s_preferences.synceveryframe.listnames = s_OffOnNone_Names;
s_preferences.synceveryframe.width = width;
s_preferences.synceveryframe.generic.type = MTYPE_SPINCONTROL;
s_preferences.synceveryframe.generic.flags = QMF_HIGHLIGHT_IF_FOCUS;
s_preferences.synceveryframe.generic.x = x;
s_preferences.synceveryframe.generic.y = y;
s_preferences.synceveryframe.generic.callback = Preferences_Event;
s_preferences.synceveryframe.generic.id = ID_SYNCEVERYFRAME;
s_preferences.synceveryframe.textEnum = MBT_SYNCEVERYFRAME1;
s_preferences.synceveryframe.textcolor = CT_BLACK;
s_preferences.synceveryframe.textcolor2 = CT_WHITE;
s_preferences.synceveryframe.color = CT_DKPURPLE1;
s_preferences.synceveryframe.color2 = CT_LTPURPLE1;
s_preferences.synceveryframe.textX = MENU_BUTTON_TEXT_X;
s_preferences.synceveryframe.textY = MENU_BUTTON_TEXT_Y;
s_preferences.synceveryframe.listnames = s_OffOnNone_Names;
s_preferences.synceveryframe.width = width;
y += inc;
s_preferences.forcemodel.generic.type = MTYPE_SPINCONTROL;
s_preferences.forcemodel.generic.flags = QMF_HIGHLIGHT_IF_FOCUS;
s_preferences.forcemodel.generic.x = x;
s_preferences.forcemodel.generic.y = y;
s_preferences.forcemodel.generic.callback = Preferences_Event;
s_preferences.forcemodel.generic.id = ID_FORCEMODEL;
s_preferences.forcemodel.textEnum = MBT_FORCEMODEL;
s_preferences.forcemodel.textcolor = CT_BLACK;
s_preferences.forcemodel.textcolor2 = CT_WHITE;
s_preferences.forcemodel.color = CT_DKPURPLE1;
s_preferences.forcemodel.color2 = CT_LTPURPLE1;
s_preferences.forcemodel.textX = MENU_BUTTON_TEXT_X;
s_preferences.forcemodel.textY = MENU_BUTTON_TEXT_Y;
s_preferences.forcemodel.listnames = s_OffOnNone_Names;
s_preferences.forcemodel.width = width;
s_preferences.forcemodel.generic.type = MTYPE_SPINCONTROL;
s_preferences.forcemodel.generic.flags = QMF_HIGHLIGHT_IF_FOCUS;
s_preferences.forcemodel.generic.x = x;
s_preferences.forcemodel.generic.y = y;
s_preferences.forcemodel.generic.callback = Preferences_Event;
s_preferences.forcemodel.generic.id = ID_FORCEMODEL;
s_preferences.forcemodel.textEnum = MBT_FORCEMODEL;
s_preferences.forcemodel.textcolor = CT_BLACK;
s_preferences.forcemodel.textcolor2 = CT_WHITE;
s_preferences.forcemodel.color = CT_DKPURPLE1;
s_preferences.forcemodel.color2 = CT_LTPURPLE1;
s_preferences.forcemodel.textX = MENU_BUTTON_TEXT_X;
s_preferences.forcemodel.textY = MENU_BUTTON_TEXT_Y;
s_preferences.forcemodel.listnames = s_OffOnNone_Names;
s_preferences.forcemodel.width = width;
//TiM - Replace overlay with crosshairs
y += inc;
s_preferences.crosshair.generic.type = MTYPE_SPINCONTROL;
s_preferences.crosshair.generic.flags = QMF_HIGHLIGHT_IF_FOCUS;
s_preferences.crosshair.generic.x = x;
s_preferences.crosshair.generic.y = y;
s_preferences.crosshair.generic.type = MTYPE_SPINCONTROL;
s_preferences.crosshair.generic.flags = QMF_HIGHLIGHT_IF_FOCUS;
s_preferences.crosshair.generic.x = x;
s_preferences.crosshair.generic.y = y;
//s_preferences.crosshair.generic.name = PIC_BUTTON2;
s_preferences.crosshair.generic.id = ID_CROSSHAIR;
s_preferences.crosshair.generic.callback = Preferences_Event;
s_preferences.crosshair.width = width;
s_preferences.crosshair.generic.id = ID_CROSSHAIR;
s_preferences.crosshair.generic.callback = Preferences_Event;
s_preferences.crosshair.width = width;
//s_preferences.crosshair.height = 32;
s_preferences.crosshair.color = CT_DKPURPLE1;
s_preferences.crosshair.color2 = CT_LTPURPLE1;
s_preferences.crosshair.textX = MENU_BUTTON_TEXT_X;
s_preferences.crosshair.textY = MENU_BUTTON_TEXT_Y;
s_preferences.crosshair.textEnum = MBT_CROSSHAIR;
s_preferences.crosshair.textcolor = CT_BLACK;
s_preferences.crosshair.textcolor2 = CT_WHITE;
s_preferences.crosshair.listnames = s_OffOnNone_Names;;
s_preferences.crosshair.color = CT_DKPURPLE1;
s_preferences.crosshair.color2 = CT_LTPURPLE1;
s_preferences.crosshair.textX = MENU_BUTTON_TEXT_X;
s_preferences.crosshair.textY = MENU_BUTTON_TEXT_Y;
s_preferences.crosshair.textEnum = MBT_CROSSHAIR;
s_preferences.crosshair.textcolor = CT_BLACK;
s_preferences.crosshair.textcolor2 = CT_WHITE;
s_preferences.crosshair.listnames = s_OffOnNone_Names;;
y += inc;
s_preferences.allowdownload.generic.type = MTYPE_SPINCONTROL;
s_preferences.allowdownload.generic.flags = QMF_HIGHLIGHT_IF_FOCUS;
s_preferences.allowdownload.generic.x = x;
s_preferences.allowdownload.generic.y = y;
s_preferences.allowdownload.generic.callback = Preferences_Event;
s_preferences.allowdownload.generic.id = ID_ALLOWDOWNLOAD;
s_preferences.allowdownload.textEnum = MBT_ALLOWDOWNLOAD;
s_preferences.allowdownload.textcolor = CT_BLACK;
s_preferences.allowdownload.textcolor2 = CT_WHITE;
s_preferences.allowdownload.color = CT_DKPURPLE1;
s_preferences.allowdownload.color2 = CT_LTPURPLE1;
s_preferences.allowdownload.textX = MENU_BUTTON_TEXT_X;
s_preferences.allowdownload.textY = MENU_BUTTON_TEXT_Y;
s_preferences.allowdownload.listnames = s_OffOnNone_Names;
s_preferences.allowdownload.width = width;
s_preferences.allowdownload.generic.type = MTYPE_SPINCONTROL;
s_preferences.allowdownload.generic.flags = QMF_HIGHLIGHT_IF_FOCUS;
s_preferences.allowdownload.generic.x = x;
s_preferences.allowdownload.generic.y = y;
s_preferences.allowdownload.generic.callback = Preferences_Event;
s_preferences.allowdownload.generic.id = ID_ALLOWDOWNLOAD;
s_preferences.allowdownload.textEnum = MBT_ALLOWDOWNLOAD;
s_preferences.allowdownload.textcolor = CT_BLACK;
s_preferences.allowdownload.textcolor2 = CT_WHITE;
s_preferences.allowdownload.color = CT_DKPURPLE1;
s_preferences.allowdownload.color2 = CT_LTPURPLE1;
s_preferences.allowdownload.textX = MENU_BUTTON_TEXT_X;
s_preferences.allowdownload.textY = MENU_BUTTON_TEXT_Y;
s_preferences.allowdownload.listnames = s_OffOnNone_Names;
s_preferences.allowdownload.width = width;
y += inc;
s_preferences.simpleitems.generic.type = MTYPE_SPINCONTROL;
s_preferences.simpleitems.generic.flags = QMF_HIGHLIGHT_IF_FOCUS;
s_preferences.simpleitems.generic.x = x;
s_preferences.simpleitems.generic.y = y;
s_preferences.simpleitems.generic.callback = Preferences_Event;
s_preferences.simpleitems.generic.id = ID_SIMPLEITEMS;
s_preferences.simpleitems.textEnum = MBT_SIMPLEITEMS;
s_preferences.simpleitems.textcolor = CT_BLACK;
s_preferences.simpleitems.textcolor2 = CT_WHITE;
s_preferences.simpleitems.color = CT_DKPURPLE1;
s_preferences.simpleitems.color2 = CT_LTPURPLE1;
s_preferences.simpleitems.textX = MENU_BUTTON_TEXT_X;
s_preferences.simpleitems.textY = MENU_BUTTON_TEXT_Y;
s_preferences.simpleitems.listnames = s_OffOnNone_Names;
s_preferences.simpleitems.width = width;
s_preferences.simpleitems.generic.type = MTYPE_SPINCONTROL;
s_preferences.simpleitems.generic.flags = QMF_HIGHLIGHT_IF_FOCUS;
s_preferences.simpleitems.generic.x = x;
s_preferences.simpleitems.generic.y = y;
s_preferences.simpleitems.generic.callback = Preferences_Event;
s_preferences.simpleitems.generic.id = ID_SIMPLEITEMS;
s_preferences.simpleitems.textEnum = MBT_SIMPLEITEMS;
s_preferences.simpleitems.textcolor = CT_BLACK;
s_preferences.simpleitems.textcolor2 = CT_WHITE;
s_preferences.simpleitems.color = CT_DKPURPLE1;
s_preferences.simpleitems.color2 = CT_LTPURPLE1;
s_preferences.simpleitems.textX = MENU_BUTTON_TEXT_X;
s_preferences.simpleitems.textY = MENU_BUTTON_TEXT_Y;
s_preferences.simpleitems.listnames = s_OffOnNone_Names;
s_preferences.simpleitems.width = width;
y += inc;
s_preferences.textlanguage.generic.type = MTYPE_SPINCONTROL;
s_preferences.textlanguage.generic.flags = QMF_HIGHLIGHT_IF_FOCUS;
s_preferences.textlanguage.generic.x = x;
s_preferences.textlanguage.generic.y = y;
s_preferences.textlanguage.generic.name = "menu/common/bar1.tga";
s_preferences.textlanguage.generic.callback = Preferences_Event;
s_preferences.textlanguage.generic.id = ID_TEXTLANGUAGE;
s_preferences.textlanguage.color = CT_DKPURPLE1;
s_preferences.textlanguage.color2 = CT_LTPURPLE1;
s_preferences.textlanguage.textX = MENU_BUTTON_TEXT_X;
s_preferences.textlanguage.textY = MENU_BUTTON_TEXT_Y;
s_preferences.textlanguage.textEnum = MBT_TEXTLANGUAGE;
s_preferences.textlanguage.textcolor = CT_BLACK;
s_preferences.textlanguage.textcolor2 = CT_WHITE;
s_preferences.textlanguage.listnames = s_textlanguage_Names;
s_preferences.textlanguage.width = width;
s_preferences.textlanguage.generic.type = MTYPE_SPINCONTROL;
s_preferences.textlanguage.generic.flags = QMF_HIGHLIGHT_IF_FOCUS;
s_preferences.textlanguage.generic.x = x;
s_preferences.textlanguage.generic.y = y;
s_preferences.textlanguage.generic.name = "menu/common/bar1.tga";
s_preferences.textlanguage.generic.callback = Preferences_Event;
s_preferences.textlanguage.generic.id = ID_TEXTLANGUAGE;
s_preferences.textlanguage.color = CT_DKPURPLE1;
s_preferences.textlanguage.color2 = CT_LTPURPLE1;
s_preferences.textlanguage.textX = MENU_BUTTON_TEXT_X;
s_preferences.textlanguage.textY = MENU_BUTTON_TEXT_Y;
s_preferences.textlanguage.textEnum = MBT_TEXTLANGUAGE;
s_preferences.textlanguage.textcolor = CT_BLACK;
s_preferences.textlanguage.textcolor2 = CT_WHITE;
s_preferences.textlanguage.listnames = s_textlanguage_Names;
s_preferences.textlanguage.width = width;
y += inc;
s_preferences.voicelanguage.generic.type = MTYPE_SPINCONTROL;
s_preferences.voicelanguage.generic.flags = QMF_HIGHLIGHT_IF_FOCUS;
s_preferences.voicelanguage.generic.x = x;
s_preferences.voicelanguage.generic.y = y;
s_preferences.voicelanguage.generic.name = "menu/common/bar1.tga";
s_preferences.voicelanguage.generic.callback = Preferences_Event;
s_preferences.voicelanguage.generic.id = ID_VOICELANGUAGE;
s_preferences.voicelanguage.color = CT_DKPURPLE1;
s_preferences.voicelanguage.color2 = CT_LTPURPLE1;
s_preferences.voicelanguage.textX = MENU_BUTTON_TEXT_X;
s_preferences.voicelanguage.textY = MENU_BUTTON_TEXT_Y;
s_preferences.voicelanguage.textEnum = MBT_VOICELANGUAGE;
s_preferences.voicelanguage.textcolor = CT_BLACK;
s_preferences.voicelanguage.textcolor2 = CT_WHITE;
s_preferences.voicelanguage.listnames = s_voicelanguage_Names;
s_preferences.voicelanguage.width = width;
s_preferences.voicelanguage.generic.type = MTYPE_SPINCONTROL;
s_preferences.voicelanguage.generic.flags = QMF_HIGHLIGHT_IF_FOCUS;
s_preferences.voicelanguage.generic.x = x;
s_preferences.voicelanguage.generic.y = y;
s_preferences.voicelanguage.generic.name = "menu/common/bar1.tga";
s_preferences.voicelanguage.generic.callback = Preferences_Event;
s_preferences.voicelanguage.generic.id = ID_VOICELANGUAGE;
s_preferences.voicelanguage.color = CT_DKPURPLE1;
s_preferences.voicelanguage.color2 = CT_LTPURPLE1;
s_preferences.voicelanguage.textX = MENU_BUTTON_TEXT_X;
s_preferences.voicelanguage.textY = MENU_BUTTON_TEXT_Y;
s_preferences.voicelanguage.textEnum = MBT_VOICELANGUAGE;
s_preferences.voicelanguage.textcolor = CT_BLACK;
s_preferences.voicelanguage.textcolor2 = CT_WHITE;
s_preferences.voicelanguage.listnames = s_voicelanguage_Names;
s_preferences.voicelanguage.width = width;
Menu_AddItem( &s_gameoptions.menu, &s_preferences.flares );
Menu_AddItem( &s_gameoptions.menu, &s_preferences.wallmarks );
Menu_AddItem( &s_gameoptions.menu, &s_preferences.dynamiclights );
Menu_AddItem( &s_gameoptions.menu, &s_preferences.identifytarget );
Menu_AddItem( &s_gameoptions.menu, &s_preferences.synceveryframe );
Menu_AddItem( &s_gameoptions.menu, &s_preferences.forcemodel );
Menu_AddItem( &s_gameoptions.menu, &s_preferences.allowdownload );
Menu_AddItem( &s_gameoptions.menu, &s_preferences.simpleitems );
Menu_AddItem( &s_gameoptions.menu, &s_preferences.textlanguage );
Menu_AddItem( &s_gameoptions.menu, &s_preferences.voicelanguage );
Menu_AddItem( &s_gameoptions.menu, &s_preferences.crosshair);
Menu_AddItem(&s_gameoptions.menu, &s_preferences.flares);
Menu_AddItem(&s_gameoptions.menu, &s_preferences.wallmarks);
Menu_AddItem(&s_gameoptions.menu, &s_preferences.dynamiclights);
Menu_AddItem(&s_gameoptions.menu, &s_preferences.identifytarget);
Menu_AddItem(&s_gameoptions.menu, &s_preferences.synceveryframe);
Menu_AddItem(&s_gameoptions.menu, &s_preferences.forcemodel);
Menu_AddItem(&s_gameoptions.menu, &s_preferences.allowdownload);
Menu_AddItem(&s_gameoptions.menu, &s_preferences.simpleitems);
Menu_AddItem(&s_gameoptions.menu, &s_preferences.textlanguage);
Menu_AddItem(&s_gameoptions.menu, &s_preferences.voicelanguage);
Menu_AddItem(&s_gameoptions.menu, &s_preferences.crosshair);
s_gameoptions.menu.initialized = qtrue; // Show we've been here
@ -546,12 +547,12 @@ static void GameOptions_MenuInit( void )
UI_GameOptionsMenu
=================
*/
void UI_GameOptionsMenu( void )
void UI_GameOptionsMenu(void)
{
UI_LogFuncBegin();
GameOptions_MenuInit();
UI_PushMenu( &s_gameoptions.menu );
UI_PushMenu(&s_gameoptions.menu);
UI_LogFuncEnd();
}