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

added discord button to main menu

Browse source 
(still needs work for hyperlinking)
version number upcount
This commit is contained in:
q3rally 2021-05-03 14:46:16 +00:00
parent 920221f50f
commit aa1d5aa0c7
3 changed files with 38 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
engine/code/q3_ui/ui_menu.c
View file

@ -32,6 +32,7 @@ MAIN MENU
#include "ui_local.h" #include "ui_local.h"
#define ART_DISCORDLOGO "menu/art/discordlogo"
#define ID_SINGLEPLAYER 10 #define ID_SINGLEPLAYER 10
#define ID_MULTIPLAYER 11 #define ID_MULTIPLAYER 11
@ -72,6 +73,7 @@ typedef struct {
// STONELANCE // STONELANCE
menutext_s banner; menutext_s banner;
menubitmap_s carlogo; menubitmap_s carlogo;
menubitmap_s discordlogo;
playerInfo_t playerinfo; playerInfo_t playerinfo;
char modelskin[MAX_QPATH]; char modelskin[MAX_QPATH];
@ -580,6 +582,14 @@ void UI_MainMenu( void ) {
s_main.carlogo.generic.y = 0; s_main.carlogo.generic.y = 0;
s_main.carlogo.width = 480; s_main.carlogo.width = 480;
s_main.carlogo.height = 480; s_main.carlogo.height = 480;
s_main.discordlogo.generic.type = MTYPE_BITMAP;
s_main.discordlogo.generic.flags = QMF_INACTIVE;
s_main.discordlogo.generic.name = ART_DISCORDLOGO;
s_main.discordlogo.generic.x = - 95;
s_main.discordlogo.generic.y = 430;
s_main.discordlogo.width = 40;
s_main.discordlogo.height = 40;
y += MAIN_MENU_VERTICAL_SPACING; y += MAIN_MENU_VERTICAL_SPACING;
@ -596,6 +606,7 @@ void UI_MainMenu( void ) {
Menu_AddItem( &s_main.menu, &s_main.banner ); Menu_AddItem( &s_main.menu, &s_main.banner );
Menu_AddItem( &s_main.menu, &s_main.carlogo ); Menu_AddItem( &s_main.menu, &s_main.carlogo );
Menu_AddItem( &s_main.menu, &s_main.discordlogo );
Menu_AddItem( &s_main.menu, &s_main.singleplayer ); Menu_AddItem( &s_main.menu, &s_main.singleplayer );
Menu_AddItem( &s_main.menu, &s_main.multiplayer ); Menu_AddItem( &s_main.menu, &s_main.multiplayer );
Menu_AddItem( &s_main.menu, &s_main.setup ); Menu_AddItem( &s_main.menu, &s_main.setup );

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_r389" #define PRODUCT_VERSION "v0.0.3.0_r394"
#endif #endif

28
q3rallycode.ppr
View file

@ -860,6 +860,12 @@ q3rallycode
[Open project files] [Open project files]
0=engine\code\qcommon\q_shared.h 0=engine\code\qcommon\q_shared.h
1=engine\code\q3_ui\ui_rally_controls.c 1=engine\code\q3_ui\ui_rally_controls.c
2=engine\code\cgame\cg_weapons.c
3=engine\code\q3_ui\ui_menu.c
4=engine\code\q3_ui\ui_cinematics.c
5=engine\code\q3_ui\ui_loadconfig.c
6=engine\code\cgame\cg_consolecmds.c
7=engine\code\game\g_cmds.c
[Selected Project Files] [Selected Project Files]
Main= Main=
Selected=engine\code\qcommon\q_shared.h Selected=engine\code\qcommon\q_shared.h
@ -867,5 +873,23 @@ Selected=engine\code\qcommon\q_shared.h
TopLine=55 TopLine=55
Caret=39,70 Caret=39,70
[engine\code\q3_ui\ui_rally_controls.c] [engine\code\q3_ui\ui_rally_controls.c]
TopLine=517 TopLine=1266
Caret=38,528 Caret=1,1277
[engine\code\cgame\cg_weapons.c]
TopLine=1264
Caret=1,1279
[engine\code\q3_ui\ui_menu.c]
TopLine=524
Caret=45,533
[engine\code\q3_ui\ui_cinematics.c]
TopLine=126
Caret=1,141
[engine\code\q3_ui\ui_loadconfig.c]
TopLine=85
Caret=1,85
[engine\code\cgame\cg_consolecmds.c]
TopLine=590
Caret=1,590
[engine\code\game\g_cmds.c]
TopLine=2195
Caret=1,2208