q3rally-team/q3rally
0
0
Fork 0
mirror of https://github.com/Q3Rally-Team/q3rally.git synced 2024-11-24 21:01:34 +00:00
Code Issues Projects Releases Packages Wiki Activity

minimap can now switched on/off via q3roptions menu

Browse source
This commit is contained in:
q3rally 2021-03-21 21:17:56 +00:00
parent 4ca9719bbc
commit 6ac080d361
5 changed files with 58 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
engine/code/q3_ui/ui_local.h
View file

@ -145,6 +145,7 @@ extern vmCvar_t ui_checkpointArrowMode;
extern vmCvar_t ui_atmosphericLevel; extern vmCvar_t ui_atmosphericLevel;
extern vmCvar_t ui_drawPositionSprites; extern vmCvar_t ui_drawPositionSprites;
extern vmCvar_t ui_engineSounds; extern vmCvar_t ui_engineSounds;
extern vmCvar_t ui_drawMinimap;
extern vmCvar_t ui_tightCamTracking; extern vmCvar_t ui_tightCamTracking;
extern vmCvar_t ui_rearViewRenderLevel; extern vmCvar_t ui_rearViewRenderLevel;
extern vmCvar_t ui_mainViewRenderLevel; extern vmCvar_t ui_mainViewRenderLevel;

3
engine/code/q3_ui/ui_main.c
View file

@ -203,6 +203,7 @@ vmCvar_t ui_checkpointArrowMode;
vmCvar_t ui_atmosphericLevel; vmCvar_t ui_atmosphericLevel;
vmCvar_t ui_drawPositionSprites; vmCvar_t ui_drawPositionSprites;
vmCvar_t ui_engineSounds; vmCvar_t ui_engineSounds;
vmCvar_t ui_drawMinimap;
vmCvar_t ui_tightCamTracking; vmCvar_t ui_tightCamTracking;
vmCvar_t ui_rearViewRenderLevel; vmCvar_t ui_rearViewRenderLevel;
vmCvar_t ui_mainViewRenderLevel; vmCvar_t ui_mainViewRenderLevel;
@ -315,7 +316,7 @@ static cvarTable_t cvarTable[] = {
{ &ui_atmosphericLevel, "cg_atmosphericLevel", "1", CVAR_ARCHIVE }, { &ui_atmosphericLevel, "cg_atmosphericLevel", "1", CVAR_ARCHIVE },
{ &ui_drawPositionSprites, "cg_drawPositionSprites", "1", CVAR_ARCHIVE }, { &ui_drawPositionSprites, "cg_drawPositionSprites", "1", CVAR_ARCHIVE },
{ &ui_engineSounds, "cg_engineSounds", "1", CVAR_ARCHIVE }, { &ui_engineSounds, "cg_engineSounds", "1", CVAR_ARCHIVE },
{ &ui_drawMinimap, "cg_drawMMap", "1", CVAR_ARCHIVE },
{ &ui_tightCamTracking, "cg_tightCamTracking", "1", CVAR_ARCHIVE }, { &ui_tightCamTracking, "cg_tightCamTracking", "1", CVAR_ARCHIVE },
{ &ui_rearViewRenderLevel, "cg_rearViewRenderLevel", "3", CVAR_ARCHIVE }, { &ui_rearViewRenderLevel, "cg_rearViewRenderLevel", "3", CVAR_ARCHIVE },
{ &ui_mainViewRenderLevel, "cg_mainViewRenderLevel", "31", CVAR_ARCHIVE }, { &ui_mainViewRenderLevel, "cg_mainViewRenderLevel", "31", CVAR_ARCHIVE },

65
engine/code/q3_ui/ui_rally_options.c
View file

@ -28,30 +28,31 @@ qboolean isRaceObserver( int clientNum )
return qfalse; return qfalse;
} }
#define ID_UNITS 10 #define ID_UNITS 10
#define ID_SKID_LENGTH 11 #define ID_SKID_LENGTH 11
#define ID_CONTROL_MODE 12 #define ID_CONTROL_MODE 12
#define ID_MANUAL_SHIFT 13 #define ID_MANUAL_SHIFT 13
#define ID_REAR_VIEW 14 #define ID_REAR_VIEW 14
#define ID_CP_ARROW_MODE 15 #define ID_CP_ARROW_MODE 15
#define ID_ATMOSPHERIC_LEVEL 16 #define ID_ATMOSPHERIC_LEVEL 16
#define ID_POSITION_SPRITES 17 #define ID_POSITION_SPRITES 17
#define ID_CAM_TRACKING 18 #define ID_CAM_TRACKING 18
#define ID_ENGINE_SOUNDS 19 #define ID_ENGINE_SOUNDS 19
#define ID_DRAW_MINIMAP 20
#define ID_RVRL_PLAYERS 20 #define ID_RVRL_PLAYERS 21
#define ID_RVRL_OBJECTS 21 #define ID_RVRL_OBJECTS 22
#define ID_RVRL_SMOKE 22 #define ID_RVRL_SMOKE 23
#define ID_RVRL_MARKS 23 #define ID_RVRL_MARKS 24
#define ID_RVRL_SPARKS 24 #define ID_RVRL_SPARKS 25
#define ID_MVRL_PLAYERS 30 #define ID_MVRL_PLAYERS 30
#define ID_MVRL_OBJECTS 31 #define ID_MVRL_OBJECTS 31
#define ID_MVRL_SMOKE 32 #define ID_MVRL_SMOKE 32
#define ID_MVRL_MARKS 33 #define ID_MVRL_MARKS 33
#define ID_MVRL_SPARKS 34 #define ID_MVRL_SPARKS 34
#define ID_BACK 40 #define ID_BACK 40
typedef struct { typedef struct {
menuframework_s menu; menuframework_s menu;
@ -85,6 +86,7 @@ typedef struct {
menutext_s mvrl_heading; menutext_s mvrl_heading;
menuradiobutton_s engineSounds; menuradiobutton_s engineSounds;
menuradiobutton_s drawMinimap;
menutext_s back; menutext_s back;
} q3roptionsmenu_t; } q3roptionsmenu_t;
@ -183,7 +185,9 @@ static void Q3ROptions_MenuEvent( void* ptr, int event ) {
trap_Cvar_SetValue( "cg_engineSounds", s_q3roptions.engineSounds.curvalue ); trap_Cvar_SetValue( "cg_engineSounds", s_q3roptions.engineSounds.curvalue );
break; break;
case ID_DRAW_MINIMAP:
trap_Cvar_SetValue( "cg_drawMMap", s_q3roptions.drawMinimap.curvalue );
break;
case ID_RVRL_PLAYERS: case ID_RVRL_PLAYERS:
case ID_RVRL_OBJECTS: case ID_RVRL_OBJECTS:
@ -288,7 +292,9 @@ static void Q3ROptions_StatusBar( void *self )
text = "Turns on engine sounds in game."; text = "Turns on engine sounds in game.";
break; break;
case ID_DRAW_MINIMAP:
text = "Turns on the Minimap in game.";
break;
case ID_RVRL_PLAYERS: case ID_RVRL_PLAYERS:
text = "Show other players in the rear view mirror."; text = "Show other players in the rear view mirror.";
@ -356,6 +362,8 @@ void Q3ROptions_MenuInit( void ) {
s_q3roptions.camtracking.curvalue = ui_tightCamTracking.integer; s_q3roptions.camtracking.curvalue = ui_tightCamTracking.integer;
s_q3roptions.engineSounds.curvalue = ui_engineSounds.integer; s_q3roptions.engineSounds.curvalue = ui_engineSounds.integer;
s_q3roptions.drawMinimap.curvalue = ui_drawMinimap.integer;
s_q3roptions.rvrl_players.curvalue = ( ui_rearViewRenderLevel.integer & RL_PLAYERS ) ? 1 : 0; s_q3roptions.rvrl_players.curvalue = ( ui_rearViewRenderLevel.integer & RL_PLAYERS ) ? 1 : 0;
s_q3roptions.rvrl_objects.curvalue = ( ui_rearViewRenderLevel.integer & RL_OBJECTS ) ? 1 : 0; s_q3roptions.rvrl_objects.curvalue = ( ui_rearViewRenderLevel.integer & RL_OBJECTS ) ? 1 : 0;
@ -464,7 +472,15 @@ void Q3ROptions_MenuInit( void ) {
s_q3roptions.engineSounds.generic.callback = Q3ROptions_MenuEvent; s_q3roptions.engineSounds.generic.callback = Q3ROptions_MenuEvent;
s_q3roptions.engineSounds.generic.statusbar = Q3ROptions_StatusBar; s_q3roptions.engineSounds.generic.statusbar = Q3ROptions_StatusBar;
s_q3roptions.drawMinimap.generic.type = MTYPE_RADIOBUTTON;
s_q3roptions.drawMinimap.generic.flags = QMF_SMALLFONT;
s_q3roptions.drawMinimap.generic.x = 500;
s_q3roptions.drawMinimap.generic.y = 90 + 80;
s_q3roptions.drawMinimap.generic.name = "Minimap:";
s_q3roptions.drawMinimap.generic.id = ID_DRAW_MINIMAP;
s_q3roptions.drawMinimap.generic.callback = Q3ROptions_MenuEvent;
s_q3roptions.drawMinimap.generic.statusbar = Q3ROptions_StatusBar;
// sliders // sliders
s_q3roptions.skidlength.generic.type = MTYPE_SLIDER; s_q3roptions.skidlength.generic.type = MTYPE_SLIDER;
s_q3roptions.skidlength.generic.flags = QMF_SMALLFONT; s_q3roptions.skidlength.generic.flags = QMF_SMALLFONT;
@ -630,6 +646,7 @@ void Q3ROptions_MenuInit( void ) {
Menu_AddItem( &s_q3roptions.menu, ( void * ) &s_q3roptions.rearView ); Menu_AddItem( &s_q3roptions.menu, ( void * ) &s_q3roptions.rearView );
Menu_AddItem( &s_q3roptions.menu, ( void * ) &s_q3roptions.positionSprites ); Menu_AddItem( &s_q3roptions.menu, ( void * ) &s_q3roptions.positionSprites );
Menu_AddItem( &s_q3roptions.menu, ( void * ) &s_q3roptions.engineSounds ); Menu_AddItem( &s_q3roptions.menu, ( void * ) &s_q3roptions.engineSounds );
Menu_AddItem( &s_q3roptions.menu, ( void * ) &s_q3roptions.drawMinimap );
Menu_AddItem( &s_q3roptions.menu, ( void * ) &s_q3roptions.skidlength ); Menu_AddItem( &s_q3roptions.menu, ( void * ) &s_q3roptions.skidlength );
Menu_AddItem( &s_q3roptions.menu, ( void * ) &s_q3roptions.camtracking ); Menu_AddItem( &s_q3roptions.menu, ( void * ) &s_q3roptions.camtracking );

2
engine/code/qcommon/q_shared.h
View file

@ -67,7 +67,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
#define BASETA "missionpack" #define BASETA "missionpack"
#ifndef PRODUCT_VERSION #ifndef PRODUCT_VERSION
#define PRODUCT_VERSION "v0.0.3.0_r317" #define PRODUCT_VERSION "v0.0.3.0_r320"
#endif #endif

14
q3rallycode.ppr
View file

@ -864,6 +864,9 @@ q3rallycode
3=engine\code\q3_ui\ui_startserver.c 3=engine\code\q3_ui\ui_startserver.c
4=engine\code\q3_ui\ui_rally_credits.c 4=engine\code\q3_ui\ui_rally_credits.c
5=engine\code\q3_ui\ui_credits.c 5=engine\code\q3_ui\ui_credits.c
6=engine\code\q3_ui\ui_rally_options.c
7=engine\code\q3_ui\ui_local.h
8=engine\code\q3_ui\ui_main.c
[Selected Project Files] [Selected Project Files]
Main= Main=
Selected=engine\code\qcommon\q_shared.h Selected=engine\code\qcommon\q_shared.h
@ -880,8 +883,17 @@ Caret=1,492
TopLine=436 TopLine=436
Caret=1,451 Caret=1,451
[engine\code\q3_ui\ui_rally_credits.c] [engine\code\q3_ui\ui_rally_credits.c]
TopLine=51 TopLine=80
Caret=1,106 Caret=1,106
[engine\code\q3_ui\ui_credits.c] [engine\code\q3_ui\ui_credits.c]
TopLine=113 TopLine=113
Caret=91,137 Caret=91,137
[engine\code\q3_ui\ui_rally_options.c]
TopLine=354
Caret=54,364
[engine\code\q3_ui\ui_local.h]
TopLine=132
Caret=32,148
[engine\code\q3_ui\ui_main.c]
TopLine=1
Caret=59,319