mirror of
https://github.com/Q3Rally-Team/q3rally.git
synced 2024-11-21 19:41:36 +00:00
removed the useless "crosshair" code
version number upcount
This commit is contained in:
q3rally
parent
25e49bf181
commit
cafe7d3f32
3 changed files with 32 additions and 43 deletions
|
|
@ -44,7 +44,7 @@ GAME OPTIONS MENU
|
|||
|
||||
#define PREFERENCES_X_POS 360
|
||||
|
||||
#define ID_CROSSHAIR 127
|
||||
//#define ID_CROSSHAIR 127
|
||||
#define ID_SIMPLEITEMS 128
|
||||
#define ID_HIGHQUALITYSKY 129
|
||||
#define ID_EJECTINGBRASS 130
|
||||
|
|
@ -71,7 +71,7 @@ typedef struct {
|
|||
*/
|
||||
// END
|
||||
|
||||
menulist_s crosshair;
|
||||
// menulist_s crosshair;
|
||||
menuradiobutton_s simpleitems;
|
||||
menuradiobutton_s brass;
|
||||
menuradiobutton_s wallmarks;
|
||||
|
|
@ -102,7 +102,7 @@ static const char *teamoverlay_names[] =
|
|||
};
|
||||
|
||||
static void Preferences_SetMenuItems( void ) {
|
||||
s_preferences.crosshair.curvalue = (int)trap_Cvar_VariableValue( "cg_drawCrosshair" ) % NUM_CROSSHAIRS;
|
||||
// s_preferences.crosshair.curvalue = (int)trap_Cvar_VariableValue( "cg_drawCrosshair" ) % NUM_CROSSHAIRS;
|
||||
s_preferences.simpleitems.curvalue = trap_Cvar_VariableValue( "cg_simpleItems" ) != 0;
|
||||
s_preferences.brass.curvalue = trap_Cvar_VariableValue( "cg_brassTime" ) != 0;
|
||||
s_preferences.wallmarks.curvalue = trap_Cvar_VariableValue( "cg_marks" ) != 0;
|
||||
|
|
@ -122,9 +122,9 @@ static void Preferences_Event( void* ptr, int notification ) {
|
|||
}
|
||||
|
||||
switch( ((menucommon_s*)ptr)->id ) {
|
||||
case ID_CROSSHAIR:
|
||||
trap_Cvar_SetValue( "cg_drawCrosshair", s_preferences.crosshair.curvalue );
|
||||
break;
|
||||
// case ID_CROSSHAIR:
|
||||
// trap_Cvar_SetValue( "cg_drawCrosshair", s_preferences.crosshair.curvalue );
|
||||
// break;
|
||||
|
||||
case ID_SIMPLEITEMS:
|
||||
trap_Cvar_SetValue( "cg_simpleItems", s_preferences.simpleitems.curvalue );
|
||||
|
|
@ -180,7 +180,7 @@ static void Preferences_Event( void* ptr, int notification ) {
|
|||
=================
|
||||
Crosshair_Draw
|
||||
=================
|
||||
*/
|
||||
|
||||
static void Crosshair_Draw( void *self ) {
|
||||
menulist_s *s;
|
||||
float *color;
|
||||
|
|
@ -223,7 +223,7 @@ static void Crosshair_Draw( void *self ) {
|
|||
}
|
||||
UI_DrawHandlePic( x + SMALLCHAR_WIDTH, y - 4, 24, 24, s_preferences.crosshairShader[s->curvalue] );
|
||||
}
|
||||
|
||||
*/
|
||||
|
||||
static void Preferences_MenuInit( void ) {
|
||||
int y;
|
||||
|
|
@ -261,7 +261,7 @@ static void Preferences_MenuInit( void ) {
|
|||
s_preferences.framer.height = 334;
|
||||
*/
|
||||
// END
|
||||
|
||||
/*
|
||||
y = 144;
|
||||
s_preferences.crosshair.generic.type = MTYPE_SPINCONTROL;
|
||||
s_preferences.crosshair.generic.flags = QMF_PULSEIFFOCUS|QMF_SMALLFONT|QMF_NODEFAULTINIT|QMF_OWNERDRAW;
|
||||
|
|
@ -276,8 +276,9 @@ static void Preferences_MenuInit( void ) {
|
|||
s_preferences.crosshair.generic.left = PREFERENCES_X_POS - ( ( strlen(s_preferences.crosshair.generic.name) + 1 ) * SMALLCHAR_WIDTH );
|
||||
s_preferences.crosshair.generic.right = PREFERENCES_X_POS + 48;
|
||||
s_preferences.crosshair.numitems = NUM_CROSSHAIRS;
|
||||
|
||||
y += BIGCHAR_HEIGHT+2+4;
|
||||
*/
|
||||
// y += BIGCHAR_HEIGHT+2+4;
|
||||
y = 144;
|
||||
s_preferences.simpleitems.generic.type = MTYPE_RADIOBUTTON;
|
||||
s_preferences.simpleitems.generic.name = "Simple Items:";
|
||||
s_preferences.simpleitems.generic.flags = QMF_PULSEIFFOCUS|QMF_SMALLFONT;
|
||||
|
|
@ -401,7 +402,7 @@ static void Preferences_MenuInit( void ) {
|
|||
*/
|
||||
// END
|
||||
|
||||
Menu_AddItem( &s_preferences.menu, &s_preferences.crosshair );
|
||||
// Menu_AddItem( &s_preferences.menu, &s_preferences.crosshair );
|
||||
Menu_AddItem( &s_preferences.menu, &s_preferences.simpleitems );
|
||||
Menu_AddItem( &s_preferences.menu, &s_preferences.wallmarks );
|
||||
Menu_AddItem( &s_preferences.menu, &s_preferences.brass );
|
||||
|
|
|
|||
|
|
@ -67,7 +67,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
|
|||
#define BASETA "missionpack"
|
||||
|
||||
#ifndef PRODUCT_VERSION
|
||||
#define PRODUCT_VERSION "v0.0.3.0_r354"
|
||||
#define PRODUCT_VERSION "v0.0.3.0_r360"
|
||||
#endif
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -427,7 +427,7 @@ q3rallycode
|
|||
engine\code\null\null_main.c
|
||||
engine\code\null\null_net.c
|
||||
engine\code\null\null_snddma.c
|
||||
-q3_ui
|
||||
+q3_ui
|
||||
engine\code\q3_ui\ui.def
|
||||
engine\code\q3_ui\ui_addbots.c
|
||||
engine\code\q3_ui\ui_atoms.c
|
||||
|
|
@ -859,37 +859,25 @@ q3rallycode
|
|||
engine\cross-make-mingw64.sh
|
||||
[Open project files]
|
||||
0=engine\code\qcommon\q_shared.h
|
||||
1=engine\code\cgame\cg_rally_hud.c
|
||||
2=engine\code\qcommon\surfaceflags.h
|
||||
3=engine\code\cgame\cg_players.c
|
||||
4=engine\code\cgame\cg_main.c
|
||||
5=engine\code\game\bg_physics.c
|
||||
6=engine\code\game\bg_physics.h
|
||||
7=engine\code\cgame\cg_local.h
|
||||
1=engine\code\q3_ui\ui_rally_controls.c
|
||||
2=engine\code\q3_ui\ui_controls2.c
|
||||
3=engine\code\q3_ui\ui_options.c
|
||||
4=engine\code\q3_ui\ui_preferences.c
|
||||
[Selected Project Files]
|
||||
Main=
|
||||
Selected=engine\code\cgame\cg_main.c
|
||||
Selected=engine\code\qcommon\q_shared.h
|
||||
[engine\code\qcommon\q_shared.h]
|
||||
TopLine=53
|
||||
Caret=39,70
|
||||
[engine\code\cgame\cg_rally_hud.c]
|
||||
TopLine=440
|
||||
Caret=22,430
|
||||
[engine\code\qcommon\surfaceflags.h]
|
||||
TopLine=63
|
||||
Caret=1,86
|
||||
[engine\code\cgame\cg_players.c]
|
||||
TopLine=2023
|
||||
Caret=31,2044
|
||||
[engine\code\cgame\cg_main.c]
|
||||
TopLine=965
|
||||
Caret=73,707
|
||||
[engine\code\game\bg_physics.c]
|
||||
TopLine=995
|
||||
Caret=1,998
|
||||
[engine\code\game\bg_physics.h]
|
||||
TopLine=81
|
||||
Caret=32,108
|
||||
[engine\code\cgame\cg_local.h]
|
||||
TopLine=185
|
||||
Caret=35,201
|
||||
[engine\code\q3_ui\ui_rally_controls.c]
|
||||
TopLine=373
|
||||
Caret=1,1
|
||||
[engine\code\q3_ui\ui_controls2.c]
|
||||
TopLine=199
|
||||
Caret=1,1
|
||||
[engine\code\q3_ui\ui_options.c]
|
||||
TopLine=27
|
||||
Caret=1,1
|
||||
[engine\code\q3_ui\ui_preferences.c]
|
||||
TopLine=383
|
||||
Caret=3,405
|
||||
|
|
|
|||
Loading…
Reference in a new issue