mirror of
https://github.com/UberGames/RPG-X2.git
synced 2024-11-15 01:11:46 +00:00
some minor fixes
This commit is contained in:
UberGames
parent
e82140f5a1
commit
685e93ad79
16 changed files with 231 additions and 221 deletions
BIN
stefgame.suo
BIN
stefgame.suo
Binary file not shown.
|
|
@ -79,7 +79,7 @@ SOOBJ = \
|
|||
ui_syscalls.o
|
||||
|
||||
# do cc for shared libraries
|
||||
DO_SOCC = $(CC) $(SOCFLAGS) -o $@ -c $<
|
||||
DO_SOCC = $(CC) $(SOCFLAGS) -Wall -o $@ -c $<
|
||||
|
||||
build_so: DO_CC=$(DO_SOCC)
|
||||
|
||||
|
|
|
|||
|
|
@ -98,7 +98,7 @@ const fxData_t s_admin_fxData[] = {
|
|||
{ "elec_explosion", QMF_HIGHLIGHT_IF_FOCUS, ( QMF_INACTIVE | QMF_GRAYED ), ( QMF_INACTIVE | QMF_GRAYED ), MNT_RADIUS, -1, -1 },
|
||||
{ "fire", QMF_HIGHLIGHT_IF_FOCUS, QMF_HIGHLIGHT_IF_FOCUS, ( QMF_INACTIVE | QMF_GRAYED ), MNT_RADIUS, MNT_TIMELENGTH, -1 },
|
||||
{ "shake", QMF_HIGHLIGHT_IF_FOCUS, QMF_HIGHLIGHT_IF_FOCUS, ( QMF_INACTIVE | QMF_GRAYED ), MNT_RADIUS, MNT_SHAKEINTENSITY, -1 },
|
||||
0
|
||||
{ NULL, 0, 0, 0, 0, 0, 0 }
|
||||
};
|
||||
|
||||
const char* s_admin_forceParams[] = {
|
||||
|
|
@ -2527,11 +2527,11 @@ static void AdminAudio_Draw( void )
|
|||
Menu_Draw( &s_adminAudio.menu );
|
||||
}
|
||||
|
||||
static void AdminAudio_Cache( void )
|
||||
/*static void AdminAudio_Cache( void )
|
||||
{
|
||||
trap_R_RegisterShaderNoMip( PIC_ARROW_UP );
|
||||
trap_R_RegisterShaderNoMip( PIC_ARROW_DOWN );
|
||||
}
|
||||
}*/
|
||||
|
||||
/*
|
||||
====================
|
||||
|
|
|
|||
183
ui/ui_credits.c
183
ui/ui_credits.c
|
|
@ -176,117 +176,126 @@ typedef struct
|
|||
static creditsInfo_t creditsInfo[MAX_MENUS] =
|
||||
{
|
||||
//The d00ds leading this shizzie :)
|
||||
{ "PROJECT LEADS",
|
||||
NAME_PHENIX, TITLE_LEADER,
|
||||
NAME_JAY, TITLE_LPROG,
|
||||
NAME_SHARKY, TITLE_L2DAS,
|
||||
NAME_TIM, TITLE_L3D,
|
||||
NAME_WILL, TITLE_LMAPPER
|
||||
{
|
||||
{ "PROJECT LEADS" },
|
||||
{ { NAME_PHENIX }, { TITLE_LEADER } },
|
||||
{ { NAME_JAY }, { TITLE_LPROG } },
|
||||
{ { NAME_SHARKY }, { TITLE_L2DAS } },
|
||||
{ { NAME_TIM }, { TITLE_L3D } },
|
||||
{ { NAME_WILL }, { TITLE_LMAPPER } }
|
||||
},
|
||||
|
||||
//The d00ds l33tzor haxxoring this shizzie.
|
||||
{ "PROGRAMMING",
|
||||
NAME_JAY, TITLE_LPROG,
|
||||
NAME_TIM, TITLE_PROG,
|
||||
NAME_PHENIX, TITLE_PROG,
|
||||
NAME_RED, TITLE_ADPROG,
|
||||
NAME_MARCIN, TITLE_PROG, // Scooter was originally here...sorry... not enough space!
|
||||
NAME_SCOOTER, TITLE_ADPROG,
|
||||
NAME_GSIO01, TITLE_PROG,
|
||||
{
|
||||
{ "PROGRAMMING" },
|
||||
{ { NAME_JAY }, { TITLE_LPROG } },
|
||||
{ { NAME_TIM }, { TITLE_PROG } },
|
||||
{ { NAME_PHENIX }, { TITLE_PROG } },
|
||||
{ { NAME_RED }, { TITLE_ADPROG } },
|
||||
{ { NAME_MARCIN }, { TITLE_PROG } }, // Scooter was originally here...sorry... not enough space!
|
||||
{ { NAME_SCOOTER }, { TITLE_ADPROG } },
|
||||
{ { NAME_GSIO01 }, { TITLE_PROG } },
|
||||
},
|
||||
|
||||
//The d00ds painting and texturing this shizzie.
|
||||
{ "2-D ART",
|
||||
NAME_SHARKY, TITLE_L2D,
|
||||
NAME_SIMMO, TITLE_LCARS,
|
||||
NAME_TIM, TITLE_AD2D,
|
||||
NAME_SCOOTER, TITLE_AD2D,
|
||||
NAME_KURO, TITLE_RANKS,
|
||||
{
|
||||
{ "2-D ART" },
|
||||
{ { NAME_SHARKY }, { TITLE_L2D } },
|
||||
{ { NAME_SIMMO }, { TITLE_LCARS } },
|
||||
{ { NAME_TIM }, { TITLE_AD2D } },
|
||||
{ { NAME_SCOOTER }, { TITLE_AD2D } },
|
||||
{ { NAME_KURO }, { TITLE_RANKS } },
|
||||
},
|
||||
|
||||
//The d00d modeling this shizzie. I feel so alone rofl.
|
||||
{ "3-D ART",
|
||||
NAME_TIM, TITLE_L3D,
|
||||
{
|
||||
{ "3-D ART" },
|
||||
{ { NAME_TIM }, { TITLE_L3D } },
|
||||
//{ "Ralph Schoberth", "Enterprise-E LightWave Mesh" }, //FixMe: Put mesh credits in a smaller section below here somehow lol
|
||||
},
|
||||
|
||||
//The d00ds mapping this shizzie.
|
||||
{ "LEVEL DESIGN",
|
||||
NAME_WILL, TITLE_LMAPPER ,
|
||||
NAME_ANT, TITLE_LEVELART,
|
||||
//{ "Jack Amzadi", "Level Artist" }, //Seriously... did we see ANYTHING come out of these guys? O_o
|
||||
//{ "Johan", "Level Artist" },
|
||||
//{ "RED-RUM", "Level Artist" },
|
||||
NAME_PHENIX, TITLE_LEVELART,
|
||||
// NAME_SCOOTER, TITLE_LEVELART, //I think he wanted to be taken off
|
||||
//NAME_WILL, TITLE_LEVELART,
|
||||
{
|
||||
{ "LEVEL DESIGN" },
|
||||
{ { NAME_WILL }, { TITLE_LMAPPER } },
|
||||
{ { NAME_ANT }, { TITLE_LEVELART } },
|
||||
//{ { "Jack Amzadi" }, { "Level Artist" } }, //Seriously... did we see ANYTHING come out of these guys? O_o
|
||||
//{ { "Johan" }, { "Level Artist" } },
|
||||
//{ { "RED-RUM" }, { "Level Artist" } },
|
||||
{ { NAME_PHENIX }, { TITLE_LEVELART } },
|
||||
//{ { NAME_SCOOTER }, { TITLE_LEVELART } }, //I think he wanted to be taken off
|
||||
//{ { NAME_WILL }, { TITLE_LEVELART } },
|
||||
},
|
||||
|
||||
//The d00ds... uh.. soundzor-ing this shizzie. :)
|
||||
{ "AUDIO DESIGN",
|
||||
NAME_SHARKY, TITLE_LAUDIO,
|
||||
NAME_PHENIX, TITLE_ADAUDIO,
|
||||
NAME_TIM, TITLE_ADAUDIO,
|
||||
NAME_SCOOTER, TITLE_ADAUDIO,
|
||||
NAME_TDP, TITLE_ADAUDIO,
|
||||
{
|
||||
{ "AUDIO DESIGN" },
|
||||
{ { NAME_SHARKY }, { TITLE_LAUDIO } },
|
||||
{ { NAME_PHENIX }, { TITLE_ADAUDIO } },
|
||||
{ { NAME_TIM }, { TITLE_ADAUDIO } },
|
||||
{ { NAME_SCOOTER }, { TITLE_ADAUDIO } },
|
||||
{ { NAME_TDP }, { TITLE_ADAUDIO } },
|
||||
},
|
||||
|
||||
{ "ADDITIONAL SUPPORT",
|
||||
NAME_SCOOTER, TITLE_CANON,
|
||||
//{ "Highlander", "Public Relations" }, //He didn't publicly relate anything in this mod, this edition. Plus I want the space at the bottom of this lol
|
||||
NAME_GSIO01, TITLE_DEUTSCH,
|
||||
NAME_JEROEN, TITLE_NEDERLANDS,
|
||||
NAME_MARCIN, TITLE_NEDERLANDS,
|
||||
NAME_LAZ, TITLE_SKINSMODELS,
|
||||
//NAME_PHENIX, TITLE_DOCU,
|
||||
//NAME_SHARKY, TITLE_DOCU,
|
||||
//NAME_RED, TITLE_DOCU,
|
||||
//NAME_DI, TITLE_CIN,
|
||||
NAME_PARKER, TITLE_ACAI,
|
||||
NAME_HOCKING, TITLE_AD2D
|
||||
{
|
||||
{ "ADDITIONAL SUPPORT" },
|
||||
{ { NAME_SCOOTER, { TITLE_CANON } },
|
||||
//{ { "Highlander", { "Public Relations" } }, //He didn't publicly relate anything in this mod, this edition. Plus I want the space at the bottom of this lol
|
||||
{ { NAME_GSIO01, { TITLE_DEUTSCH } },
|
||||
{ { NAME_JEROEN, { TITLE_NEDERLANDS } },
|
||||
{ { NAME_MARCIN, { TITLE_NEDERLANDS } },
|
||||
{ { NAME_LAZ, { TITLE_SKINSMODELS } },
|
||||
//{ { NAME_PHENIX, { TITLE_DOCU } },
|
||||
//{ { NAME_SHARKY, { TITLE_DOCU } },
|
||||
//{ { NAME_RED, { TITLE_DOCU } },
|
||||
//{ { NAME_DI, { TITLE_CIN } },
|
||||
{ { NAME_PARKER, { TITLE_ACAI } },
|
||||
{ { NAME_HOCKING, { TITLE_AD2D } }
|
||||
},
|
||||
|
||||
//The d00ds beta testing this shizzie
|
||||
{ "BETA TESTERS",
|
||||
"Jordan", "",
|
||||
"sharpkiller", "",
|
||||
"Telex Ferra", "",
|
||||
"AdmiralHocking", "",
|
||||
"Lee Wolfgang", "",
|
||||
"Quince", "",
|
||||
/*"Alex L.", "",
|
||||
"Chase Benedict", "",
|
||||
"Jake Conhale", "",
|
||||
"James Young", "",
|
||||
"Kadratis Velevere", "",
|
||||
"Ricksal0224", "",
|
||||
"SimmerALPHA", "",
|
||||
"Slayer", "",
|
||||
NAME_MARCIN, "",
|
||||
"Tuskin"*/ ""
|
||||
/*"Alex L.", "",
|
||||
"Alex Mcpherson", "",
|
||||
"AlphaOmega", "",
|
||||
"Andrew", "",
|
||||
"Crusader", "",
|
||||
"Diaz", "",
|
||||
"Fred", "",
|
||||
"Jake Conhale", "",
|
||||
"Martin", "",
|
||||
"Mr Fibbles", "",
|
||||
"Myntz", "",
|
||||
"Nuttycomputer", "",
|
||||
"Rigs", "",*/
|
||||
//"Pending...", ""
|
||||
{
|
||||
{ "BETA TESTERS" },
|
||||
{ { "Jordan" }, { "" } },
|
||||
{ { "sharpkiller" }, { "" } },
|
||||
{ { "Telex Ferra" }, { "" } },
|
||||
{ { "AdmiralHocking" }, { "" } },
|
||||
{ { "Lee Wolfgang" }, { "" } },
|
||||
{ { "Quince" }, { "" } },
|
||||
/*{ { "Alex L." }, { "" } },
|
||||
{ { "Chase Benedict" }, { "" } },
|
||||
{ { "Jake Conhale" }, { "" } },
|
||||
{ { "James Young" }, { "" } },
|
||||
{ { "Kadratis Velevere" }, { "" } },
|
||||
{ { "Ricksal0224" }, { "" } },
|
||||
{ { "SimmerALPHA" }, { "" } },
|
||||
{ { "Slayer" }, { "" } },
|
||||
{ { NAME_MARCIN }, { "" } },
|
||||
{ { "Tuskin" } { "" } }*/
|
||||
/*{ { "Alex L." }, { "" } },
|
||||
{ { "Alex Mcpherson" }, { "" } },
|
||||
{ { "AlphaOmega" }, { "" } },
|
||||
{ { "Andrew" }, { "" } },
|
||||
{ { "Crusader" }, { "" } },
|
||||
{ { "Diaz" }, { "" } },
|
||||
{ { "Fred" }, { "" } },
|
||||
{ { "Jake Conhale" }, { "" } },
|
||||
{ { "Martin" }, { "" } },
|
||||
{ { "Mr Fibbles" }, { "" } },
|
||||
{ { "Myntz" }, { "" } },
|
||||
{ { "Nuttycomputer" }, { "" } },
|
||||
{ { "Rigs" }, { "" } },*/
|
||||
//{ { "Pending..." }, { "" } }
|
||||
},
|
||||
|
||||
//Totally awesome d00ds whose input contributed greatly to this shizzie. :)
|
||||
{ "SPECIAL THANKS",
|
||||
NAME_GENE, TITLE_TREK,
|
||||
NAME_RAVEN, TITLE_EF,
|
||||
NAME_EFPEEPS, TITLE_TEST,
|
||||
NAME_STEVE, TITLE_PLAGIA,
|
||||
NAME_MONROE, TITLE_RAVENCODER
|
||||
{
|
||||
{ "SPECIAL THANKS" },
|
||||
{ { NAME_GENE }, { TITLE_TREK } },
|
||||
{ { NAME_RAVEN }, { TITLE_EF } },
|
||||
{ { NAME_EFPEEPS }, { TITLE_TEST } },
|
||||
{ { NAME_STEVE }, { TITLE_PLAGIA } },
|
||||
{ { NAME_MONROE }, { TITLE_RAVENCODER } }
|
||||
}
|
||||
|
||||
};
|
||||
|
|
|
|||
|
|
@ -21,12 +21,12 @@ static int currentFont;
|
|||
#define ID_FONT_GRID 304
|
||||
|
||||
static menuframework_s s_fonts_menu;
|
||||
static menubitmap_s s_cdkey_mainmenu;
|
||||
static menubitmap_s s_cdkey_controls;
|
||||
static menubitmap_s s_cdkey_video;
|
||||
static menubitmap_s s_cdkey_sound;
|
||||
static menubitmap_s s_cdkey_game;
|
||||
static menubitmap_s s_cdkey_cdkey;
|
||||
//static menubitmap_s s_cdkey_mainmenu;
|
||||
//static menubitmap_s s_cdkey_controls;
|
||||
//static menubitmap_s s_cdkey_video;
|
||||
//static menubitmap_s s_cdkey_sound;
|
||||
//static menubitmap_s s_cdkey_game;
|
||||
//static menubitmap_s s_cdkey_cdkey;
|
||||
static menubitmap_s s_fonts_small;
|
||||
static menubitmap_s s_fonts_medium;
|
||||
static menubitmap_s s_fonts_large;
|
||||
|
|
|
|||
|
|
@ -97,7 +97,7 @@ typedef struct
|
|||
|
||||
static ingamemenu_t s_ingame;
|
||||
|
||||
static int ingame_buttons[10][2] =
|
||||
/*static int ingame_buttons[10][2] =
|
||||
{
|
||||
{152,220},
|
||||
{152,220 + INGAME_MENU_VERTICAL_SPACING},
|
||||
|
|
@ -110,7 +110,7 @@ static int ingame_buttons[10][2] =
|
|||
{368,220 + (INGAME_MENU_VERTICAL_SPACING *2)},
|
||||
{368,220 + (INGAME_MENU_VERTICAL_SPACING *3)},
|
||||
{368,220 + (INGAME_MENU_VERTICAL_SPACING *4)},
|
||||
};
|
||||
};*/
|
||||
|
||||
|
||||
typedef struct
|
||||
|
|
|
|||
172
ui/ui_menu.c
172
ui/ui_menu.c
|
|
@ -475,88 +475,88 @@ menugraphics_s quitmenu_graphics[QMG_MAX] =
|
|||
{
|
||||
// type timer x y width height file/text graphic, min max target inc style color
|
||||
|
||||
MG_VAR, 0.0, 0, 0, 0, 0, NULL, 0, 0, 0, 0, 0, 0, 0, 0, NULL, // QMG_NUMBERS
|
||||
MG_NUMBER, 0.0, 368, 54, 16, 10, NULL, 0, 0, 0, 9, 0, 0, UI_TINYFONT, CT_DKPURPLE2, NULL, // QMG_COL1_NUM1
|
||||
MG_NUMBER, 0.0, 368, 68, 16, 10, NULL, 0, 0, 0, 9, 0, 0, UI_TINYFONT, CT_DKPURPLE2, NULL, // QMG_COL1_NUM2
|
||||
MG_NUMBER, 0.0, 368, 82, 16, 10, NULL, 0, 0, 0, 9, 0, 0, UI_TINYFONT, CT_DKPURPLE2, NULL, // QMG_COL1_NUM3
|
||||
MG_NUMBER, 0.0, 368, 96, 16, 10, NULL, 0, 0, 0, 9, 0, 0, UI_TINYFONT, CT_DKPURPLE2, NULL, // QMG_COL1_NUM4
|
||||
MG_NUMBER, 0.0, 368, 110, 16, 10, NULL, 0, 0, 0, 9, 0, 0, UI_TINYFONT, CT_DKPURPLE2, NULL, // QMG_COL1_NUM5
|
||||
{ MG_VAR, 0.0, 0, 0, 0, 0, NULL, 0, 0, 0, 0, 0, 0, 0, 0, NULL }, // Q{ MG_NUMBERS
|
||||
{ MG_NUMBER, 0.0, 368, 54, 16, 10, NULL, 0, 0, 0, 9, 0, 0, UI_TINYFONT, CT_DKPURPLE2, NULL }, // Q{ MG_COL1_NUM1
|
||||
{ MG_NUMBER, 0.0, 368, 68, 16, 10, NULL, 0, 0, 0, 9, 0, 0, UI_TINYFONT, CT_DKPURPLE2, NULL }, // Q{ MG_COL1_NUM2
|
||||
{ MG_NUMBER, 0.0, 368, 82, 16, 10, NULL, 0, 0, 0, 9, 0, 0, UI_TINYFONT, CT_DKPURPLE2, NULL }, // Q{ MG_COL1_NUM3
|
||||
{ MG_NUMBER, 0.0, 368, 96, 16, 10, NULL, 0, 0, 0, 9, 0, 0, UI_TINYFONT, CT_DKPURPLE2, NULL }, // Q{ MG_COL1_NUM4
|
||||
{ MG_NUMBER, 0.0, 368, 110, 16, 10, NULL, 0, 0, 0, 9, 0, 0, UI_TINYFONT, CT_DKPURPLE2, NULL }, // Q{ MG_COL1_NUM5
|
||||
|
||||
MG_NUMBER, 0.0, 423, 54, 16, 10, NULL, 0, 0, 0, 6, 0, 0, UI_TINYFONT, CT_DKPURPLE2, NULL, // QMG_COL2_NUM1
|
||||
MG_NUMBER, 0.0, 423, 68, 16, 10, NULL, 0, 0, 0, 6, 0, 0, UI_TINYFONT, CT_DKPURPLE2, NULL, // QMG_COL2_NUM2
|
||||
MG_NUMBER, 0.0, 423, 82, 16, 10, NULL, 0, 0, 0, 6, 0, 0, UI_TINYFONT, CT_DKPURPLE2, NULL, // QMG_COL2_NUM3
|
||||
MG_NUMBER, 0.0, 423, 96, 16, 10, NULL, 0, 0, 0, 6, 0, 0, UI_TINYFONT, CT_DKPURPLE2, NULL, // QMG_COL2_NUM4
|
||||
MG_NUMBER, 0.0, 423, 110, 16, 10, NULL, 0, 0, 0, 6, 0, 0, UI_TINYFONT, CT_DKPURPLE2, NULL, // QMG_COL2_NUM5
|
||||
{ MG_NUMBER, 0.0, 423, 54, 16, 10, NULL, 0, 0, 0, 6, 0, 0, UI_TINYFONT, CT_DKPURPLE2, NULL }, // Q{ MG_COL2_NUM1
|
||||
{ MG_NUMBER, 0.0, 423, 68, 16, 10, NULL, 0, 0, 0, 6, 0, 0, UI_TINYFONT, CT_DKPURPLE2, NULL }, // Q{ MG_COL2_NUM2
|
||||
{ MG_NUMBER, 0.0, 423, 82, 16, 10, NULL, 0, 0, 0, 6, 0, 0, UI_TINYFONT, CT_DKPURPLE2, NULL }, // Q{ MG_COL2_NUM3
|
||||
{ MG_NUMBER, 0.0, 423, 96, 16, 10, NULL, 0, 0, 0, 6, 0, 0, UI_TINYFONT, CT_DKPURPLE2, NULL }, // Q{ MG_COL2_NUM4
|
||||
{ MG_NUMBER, 0.0, 423, 110, 16, 10, NULL, 0, 0, 0, 6, 0, 0, UI_TINYFONT, CT_DKPURPLE2, NULL }, // Q{ MG_COL2_NUM5
|
||||
|
||||
MG_NUMBER, 0.0, 463, 54, 16, 10, NULL, 0, 0, 0, 9, 0, 0, UI_TINYFONT, CT_DKPURPLE2, NULL, // QMG_COL3_NUM1
|
||||
MG_NUMBER, 0.0, 463, 68, 16, 10, NULL, 0, 0, 0, 9, 0, 0, UI_TINYFONT, CT_DKPURPLE2, NULL, // QMG_COL3_NUM2
|
||||
MG_NUMBER, 0.0, 463, 82, 16, 10, NULL, 0, 0, 0, 9, 0, 0, UI_TINYFONT, CT_DKPURPLE2, NULL, // QMG_COL3_NUM3
|
||||
MG_NUMBER, 0.0, 463, 96, 16, 10, NULL, 0, 0, 0, 9, 0, 0, UI_TINYFONT, CT_DKPURPLE2, NULL, // QMG_COL3_NUM4
|
||||
MG_NUMBER, 0.0, 463, 110, 16, 10, NULL, 0, 0, 0, 9, 0, 0, UI_TINYFONT, CT_DKPURPLE2, NULL, // QMG_COL3_NUM5
|
||||
{ MG_NUMBER, 0.0, 463, 54, 16, 10, NULL, 0, 0, 0, 9, 0, 0, UI_TINYFONT, CT_DKPURPLE2, NULL }, // Q{ MG_COL3_NUM1
|
||||
{ MG_NUMBER, 0.0, 463, 68, 16, 10, NULL, 0, 0, 0, 9, 0, 0, UI_TINYFONT, CT_DKPURPLE2, NULL }, // Q{ MG_COL3_NUM2
|
||||
{ MG_NUMBER, 0.0, 463, 82, 16, 10, NULL, 0, 0, 0, 9, 0, 0, UI_TINYFONT, CT_DKPURPLE2, NULL }, // Q{ MG_COL3_NUM3
|
||||
{ MG_NUMBER, 0.0, 463, 96, 16, 10, NULL, 0, 0, 0, 9, 0, 0, UI_TINYFONT, CT_DKPURPLE2, NULL }, // Q{ MG_COL3_NUM4
|
||||
{ MG_NUMBER, 0.0, 463, 110, 16, 10, NULL, 0, 0, 0, 9, 0, 0, UI_TINYFONT, CT_DKPURPLE2, NULL }, // Q{ MG_COL3_NUM5
|
||||
|
||||
MG_NUMBER, 0.0, 526, 54, 16, 10, NULL, 0, 0, 0, 9, 0, 0, UI_TINYFONT, CT_DKPURPLE2, NULL, // QMG_COL4_NUM1
|
||||
MG_NUMBER, 0.0, 526, 68, 16, 10, NULL, 0, 0, 0, 9, 0, 0, UI_TINYFONT, CT_DKPURPLE2, NULL, // QMG_COL4_NUM2
|
||||
MG_NUMBER, 0.0, 526, 82, 16, 10, NULL, 0, 0, 0, 9, 0, 0, UI_TINYFONT, CT_DKPURPLE2, NULL, // QMG_COL4_NUM3
|
||||
MG_NUMBER, 0.0, 526, 96, 16, 10, NULL, 0, 0, 0, 9, 0, 0, UI_TINYFONT, CT_DKPURPLE2, NULL, // QMG_COL4_NUM4
|
||||
MG_NUMBER, 0.0, 526, 110, 16, 10, NULL, 0, 0, 0, 9, 0, 0, UI_TINYFONT, CT_DKPURPLE2, NULL, // QMG_COL4_NUM5
|
||||
{ MG_NUMBER, 0.0, 526, 54, 16, 10, NULL, 0, 0, 0, 9, 0, 0, UI_TINYFONT, CT_DKPURPLE2, NULL }, // Q{ MG_COL4_NUM1
|
||||
{ MG_NUMBER, 0.0, 526, 68, 16, 10, NULL, 0, 0, 0, 9, 0, 0, UI_TINYFONT, CT_DKPURPLE2, NULL }, // Q{ MG_COL4_NUM2
|
||||
{ MG_NUMBER, 0.0, 526, 82, 16, 10, NULL, 0, 0, 0, 9, 0, 0, UI_TINYFONT, CT_DKPURPLE2, NULL }, // Q{ MG_COL4_NUM3
|
||||
{ MG_NUMBER, 0.0, 526, 96, 16, 10, NULL, 0, 0, 0, 9, 0, 0, UI_TINYFONT, CT_DKPURPLE2, NULL }, // Q{ MG_COL4_NUM4
|
||||
{ MG_NUMBER, 0.0, 526, 110, 16, 10, NULL, 0, 0, 0, 9, 0, 0, UI_TINYFONT, CT_DKPURPLE2, NULL }, // Q{ MG_COL4_NUM5
|
||||
|
||||
MG_NUMBER, 0.0, 581, 54, 16, 10, NULL, 0, 0, 0, 2, 0, 0, UI_TINYFONT, CT_DKPURPLE2, NULL, // QMG_COL5_NUM1
|
||||
MG_NUMBER, 0.0, 581, 68, 16, 10, NULL, 0, 0, 0, 2, 0, 0, UI_TINYFONT, CT_DKPURPLE2, NULL, // QMG_COL5_NUM2
|
||||
MG_NUMBER, 0.0, 581, 82, 16, 10, NULL, 0, 0, 0, 2, 0, 0, UI_TINYFONT, CT_DKPURPLE2, NULL, // QMG_COL5_NUM3
|
||||
MG_NUMBER, 0.0, 581, 96, 16, 10, NULL, 0, 0, 0, 2, 0, 0, UI_TINYFONT, CT_DKPURPLE2, NULL, // QMG_COL5_NUM4
|
||||
MG_NUMBER, 0.0, 581, 110, 16, 10, NULL, 0, 0, 0, 2, 0, 0, UI_TINYFONT, CT_DKPURPLE2, NULL, // QMG_COL5_NUM5
|
||||
{ MG_NUMBER, 0.0, 581, 54, 16, 10, NULL, 0, 0, 0, 2, 0, 0, UI_TINYFONT, CT_DKPURPLE2, NULL }, // Q{ MG_COL5_NUM1
|
||||
{ MG_NUMBER, 0.0, 581, 68, 16, 10, NULL, 0, 0, 0, 2, 0, 0, UI_TINYFONT, CT_DKPURPLE2, NULL }, // Q{ MG_COL5_NUM2
|
||||
{ MG_NUMBER, 0.0, 581, 82, 16, 10, NULL, 0, 0, 0, 2, 0, 0, UI_TINYFONT, CT_DKPURPLE2, NULL }, // Q{ MG_COL5_NUM3
|
||||
{ MG_NUMBER, 0.0, 581, 96, 16, 10, NULL, 0, 0, 0, 2, 0, 0, UI_TINYFONT, CT_DKPURPLE2, NULL }, // Q{ MG_COL5_NUM4
|
||||
{ MG_NUMBER, 0.0, 581, 110, 16, 10, NULL, 0, 0, 0, 2, 0, 0, UI_TINYFONT, CT_DKPURPLE2, NULL }, // Q{ MG_COL5_NUM5
|
||||
|
||||
MG_NUMBER, 0.0, 601, 54, 16, 10, NULL, 0, 0, 0, 2, 0, 0, UI_TINYFONT, CT_DKPURPLE2, NULL, // QMG_COL6_NUM1
|
||||
MG_NUMBER, 0.0, 601, 68, 16, 10, NULL, 0, 0, 0, 2, 0, 0, UI_TINYFONT, CT_DKPURPLE2, NULL, // QMG_COL6_NUM2
|
||||
MG_NUMBER, 0.0, 601, 82, 16, 10, NULL, 0, 0, 0, 2, 0, 0, UI_TINYFONT, CT_DKPURPLE2, NULL, // QMG_COL6_NUM3
|
||||
MG_NUMBER, 0.0, 601, 96, 16, 10, NULL, 0, 0, 0, 2, 0, 0, UI_TINYFONT, CT_DKPURPLE2, NULL, // QMG_COL6_NUM4
|
||||
MG_NUMBER, 0.0, 601, 110, 16, 10, NULL, 0, 0, 0, 2, 0, 0, UI_TINYFONT, CT_DKPURPLE2, NULL, // QMG_COL6_NUM5
|
||||
{ MG_NUMBER, 0.0, 601, 54, 16, 10, NULL, 0, 0, 0, 2, 0, 0, UI_TINYFONT, CT_DKPURPLE2, NULL }, // Q{ MG_COL6_NUM1
|
||||
{ MG_NUMBER, 0.0, 601, 68, 16, 10, NULL, 0, 0, 0, 2, 0, 0, UI_TINYFONT, CT_DKPURPLE2, NULL }, // Q{ MG_COL6_NUM2
|
||||
{ MG_NUMBER, 0.0, 601, 82, 16, 10, NULL, 0, 0, 0, 2, 0, 0, UI_TINYFONT, CT_DKPURPLE2, NULL }, // Q{ MG_COL6_NUM3
|
||||
{ MG_NUMBER, 0.0, 601, 96, 16, 10, NULL, 0, 0, 0, 2, 0, 0, UI_TINYFONT, CT_DKPURPLE2, NULL }, // Q{ MG_COL6_NUM4
|
||||
{ MG_NUMBER, 0.0, 601, 110, 16, 10, NULL, 0, 0, 0, 2, 0, 0, UI_TINYFONT, CT_DKPURPLE2, NULL }, // Q{ MG_COL6_NUM5
|
||||
|
||||
|
||||
// type timer x y width height file/text graphic, min max target inc style color
|
||||
MG_VAR, 0.0, 0, 0, 0, 0, NULL, 0, 0, 0, 0, 0, 0, 0, 0, NULL, // QMG_ACTIVE_SYSTEM
|
||||
{ MG_VAR, 0.0, 0, 0, 0, 0, NULL, 0, 0, 0, 0, 0, 0, 0, 0, NULL }, // Q{ MG_ACTIVE_SYSTEM
|
||||
|
||||
// type timer x y width height file/text graphic, min max target inc style color
|
||||
MG_VAR, 0.0, 0, 0, 0, 0, NULL, 0, 0, 0, 0, 0, 0, 0, 0, NULL, // QMG_DESC_START
|
||||
MG_STRING, 0.0, 385, 378, 0, 0, NULL, MNT_BRIDGE_DESC1, 0, 0, 0, 0, 0, UI_TINYFONT, CT_LTGOLD1, NULL, // QMG_BRIDGE_DESC1
|
||||
MG_STRING, 0.0, 385, 378, 0, 0, NULL, MNT_PHASER_STRIP1_DESC1, 0, 0, 0, 0, 0, UI_TINYFONT, CT_LTGOLD1, NULL, // QMG_PHASER_STRIP1_DESC1
|
||||
MG_STRING, 0.0, 385, 378, 0, 0, NULL, MNT_TORPEDOS_DESC1, 0, 0, 0, 0, 0, UI_TINYFONT, CT_LTGOLD1, NULL, // QMG_TORPEDOS_DESC1
|
||||
MG_STRING, 0.0, 385, 378, 0, 0, NULL, MNT_VENTRAL_DESC1, 0, 0, 0, 0, 0, UI_TINYFONT, CT_LTGOLD1, NULL, // QMG_VENTRAL_DESC1
|
||||
MG_STRING, 0.0, 385, 378, 0, 0, NULL, MNT_MIDHULL_DESC1, 0, 0, 0, 0, 0, UI_TINYFONT, CT_LTGOLD1, NULL, // QMG_MIDHULL_DESC1
|
||||
MG_STRING, 0.0, 385, 378, 0, 0, NULL, MNT_BUSSARD_DESC1, 0, 0, 0, 0, 0, UI_TINYFONT, CT_LTGOLD1, NULL, // QMG_BUSSARD_DESC1
|
||||
MG_STRING, 0.0, 385, 378, 0, 0, NULL, MNT_NACELLES_DESC1, 0, 0, 0, 0, 0, UI_TINYFONT, CT_LTGOLD1, NULL, // QMG_NACELLES_DESC1
|
||||
MG_STRING, 0.0, 385, 378, 0, 0, NULL, MNT_THRUSTERS_DESC1, 0, 0, 0, 0, 0, UI_TINYFONT, CT_LTGOLD1, NULL, // QMG_THRUSTERS_DESC1
|
||||
MG_STRING, 0.0, 385, 378, 0, 0, NULL, MNT_VOYAGER_DESC1, 0, 0, 0, 0, 0, UI_TINYFONT, CT_LTGOLD1, NULL, // QMG_VOYAGER_DESC1
|
||||
{ MG_VAR, 0.0, 0, 0, 0, 0, NULL, 0, 0, 0, 0, 0, 0, 0, 0, NULL }, // Q{ MG_DESC_START
|
||||
{ MG_STRING, 0.0, 385, 378, 0, 0, NULL, MNT_BRIDGE_DESC1, 0, 0, 0, 0, 0, UI_TINYFONT, CT_LTGOLD1, NULL }, // Q{ MG_BRIDGE_DESC1
|
||||
{ MG_STRING, 0.0, 385, 378, 0, 0, NULL, MNT_PHASER_STRIP1_DESC1, 0, 0, 0, 0, 0, UI_TINYFONT, CT_LTGOLD1, NULL }, // Q{ MG_PHASER_STRIP1_DESC1
|
||||
{ MG_STRING, 0.0, 385, 378, 0, 0, NULL, MNT_TORPEDOS_DESC1, 0, 0, 0, 0, 0, UI_TINYFONT, CT_LTGOLD1, NULL }, // Q{ MG_TORPEDOS_DESC1
|
||||
{ MG_STRING, 0.0, 385, 378, 0, 0, NULL, MNT_VENTRAL_DESC1, 0, 0, 0, 0, 0, UI_TINYFONT, CT_LTGOLD1, NULL }, // Q{ MG_VENTRAL_DESC1
|
||||
{ MG_STRING, 0.0, 385, 378, 0, 0, NULL, MNT_MIDHULL_DESC1, 0, 0, 0, 0, 0, UI_TINYFONT, CT_LTGOLD1, NULL }, // Q{ MG_MIDHULL_DESC1
|
||||
{ MG_STRING, 0.0, 385, 378, 0, 0, NULL, MNT_BUSSARD_DESC1, 0, 0, 0, 0, 0, UI_TINYFONT, CT_LTGOLD1, NULL }, // Q{ MG_BUSSARD_DESC1
|
||||
{ MG_STRING, 0.0, 385, 378, 0, 0, NULL, MNT_NACELLES_DESC1, 0, 0, 0, 0, 0, UI_TINYFONT, CT_LTGOLD1, NULL }, // Q{ MG_NACELLES_DESC1
|
||||
{ MG_STRING, 0.0, 385, 378, 0, 0, NULL, MNT_THRUSTERS_DESC1, 0, 0, 0, 0, 0, UI_TINYFONT, CT_LTGOLD1, NULL }, // Q{ MG_THRUSTERS_DESC1
|
||||
{ MG_STRING, 0.0, 385, 378, 0, 0, NULL, MNT_VOYAGER_DESC1, 0, 0, 0, 0, 0, UI_TINYFONT, CT_LTGOLD1, NULL }, // Q{ MG_VOYAGER_DESC1
|
||||
|
||||
MG_VAR, 0.0, 0, 0, 0, 0, NULL, 0, 0, 0, 0, 0, 0, 0, 0, NULL, // QMG_DESC_END
|
||||
{ MG_VAR, 0.0, 0, 0, 0, 0, NULL, 0, 0, 0, 0, 0, 0, 0, 0, NULL }, // Q{ MG_DESC_END
|
||||
|
||||
// type timer x y width height file/text graphic, min (desc) max target (swoop) inc style color
|
||||
MG_VAR, 0.0, 0, 0, 0, 0, NULL, 0, 0, 0, 0, 0, 0, 0, 0, NULL, // QMG_LABEL_START
|
||||
// MG_VAR, 0.0, 0, 0, 0, 0, NULL, 0, 0, QMG_BRIDGE_DESC1, 0, QMG_BRIDGE_SWOOP, 0, 0, CT_DKBROWN1, (void *) &s_quit.bridge_pic, // QMG_BRIDGE_LABEL
|
||||
// MG_VAR, 0.0, 0, 0, 0, 0, NULL, 0, 0, QMG_PHASER_STRIP1_DESC1, 0, QMG_PHASER_STRIP1_SWOOP, 0, 0, CT_DKBROWN1, (void *) &s_quit.phaser_pic, // QMG_PHASER_LABEL
|
||||
// MG_VAR, 0.0, 0, 0, 0, 0, NULL, 0, 0, QMG_TORPEDOS_DESC1, 0, QMG_TORPEDO_SWOOP, 0, 0, CT_DKBROWN1, (void *) &s_quit.torpedo_pic, // QMG_TORPEDOS_LABEL
|
||||
// MG_VAR, 0.0, 0, 0, 0, 0, NULL, 0, 0, QMG_VENTRAL_DESC1, 0, QMG_VENTRAL_SWOOP, 0, 0, CT_DKBROWN1, (void *) &s_quit.ventral_pic, // QMG_VENTRAL_LABEL
|
||||
// MG_VAR, 0.0, 0, 0, 0, 0, NULL, 0, 0, QMG_MIDHULL_DESC1, 0, QMG_MIDHULL_SWOOP, 0, 0, CT_DKBROWN1, (void *) &s_quit.midhull_pic, // QMG_MIDHULL_LABEL
|
||||
// MG_VAR, 0.0, 0, 0, 0, 0, NULL, 0, 0, QMG_BUSSARD_DESC1, 0, QMG_BUSSARD_SWOOP, 0, 0, CT_DKBROWN1, (void *) &s_quit.bussard_pic, // QMG_BUSSARD_LABEL
|
||||
// MG_VAR, 0.0, 0, 0, 0, 0, NULL, 0, 0, QMG_NACELLES_DESC1, 0, QMG_NACELLES_SWOOP, 0, 0, CT_DKBROWN1, (void *) &s_quit.nacelles_pic, // QMG_NACELLES_LABEL
|
||||
// MG_VAR, 0.0, 0, 0, 0, 0, NULL, 0, 0, QMG_THRUSTERS_DESC1, 0, QMG_THRUSTERS_SWOOP, 0, 0, CT_DKBROWN1, (void *) &s_quit.thrusters_pic, // QMG_THRUSTERS_LABEL
|
||||
// MG_VAR, 0.0, 0, 0, 0, 0, NULL, 0, 0, QMG_VOYAGER_DESC1, 0, 0, 0, 0, CT_DKBROWN1, (void *) &s_quit.voyager_pic, // QMG_VOYAGER_LABEL
|
||||
MG_VAR, 0.0, 0, 0, 0, 0, NULL, 0, 0, 0, 0, 0, 0, 0, 0, NULL, // QMG_LABEL_END
|
||||
{ MG_VAR, 0.0, 0, 0, 0, 0, NULL, 0, 0, 0, 0, 0, 0, 0, 0, NULL }, // Q{ MG_LABEL_START
|
||||
// { MG_VAR, 0.0, 0, 0, 0, 0, NULL, 0, 0, Q{ MG_BRIDGE_DESC1, 0, Q{ MG_BRIDGE_SWOOP, 0, 0, CT_DKBROWN1, (void *) &s_quit.bridge_pic }, // Q{ MG_BRIDGE_LABEL
|
||||
// { MG_VAR, 0.0, 0, 0, 0, 0, NULL, 0, 0, Q{ MG_PHASER_STRIP1_DESC1, 0, Q{ MG_PHASER_STRIP1_SWOOP, 0, 0, CT_DKBROWN1, (void *) &s_quit.phaser_pic }, // Q{ MG_PHASER_LABEL
|
||||
// { MG_VAR, 0.0, 0, 0, 0, 0, NULL, 0, 0, Q{ MG_TORPEDOS_DESC1, 0, Q{ MG_TORPEDO_SWOOP, 0, 0, CT_DKBROWN1, (void *) &s_quit.torpedo_pic }, // Q{ MG_TORPEDOS_LABEL
|
||||
// { MG_VAR, 0.0, 0, 0, 0, 0, NULL, 0, 0, Q{ MG_VENTRAL_DESC1, 0, Q{ MG_VENTRAL_SWOOP, 0, 0, CT_DKBROWN1, (void *) &s_quit.ventral_pic }, // Q{ MG_VENTRAL_LABEL
|
||||
// { MG_VAR, 0.0, 0, 0, 0, 0, NULL, 0, 0, Q{ MG_MIDHULL_DESC1, 0, Q{ MG_MIDHULL_SWOOP, 0, 0, CT_DKBROWN1, (void *) &s_quit.midhull_pic }, // Q{ MG_MIDHULL_LABEL
|
||||
// { MG_VAR, 0.0, 0, 0, 0, 0, NULL, 0, 0, Q{ MG_BUSSARD_DESC1, 0, Q{ MG_BUSSARD_SWOOP, 0, 0, CT_DKBROWN1, (void *) &s_quit.bussard_pic }, // Q{ MG_BUSSARD_LABEL
|
||||
// { MG_VAR, 0.0, 0, 0, 0, 0, NULL, 0, 0, Q{ MG_NACELLES_DESC1, 0, Q{ MG_NACELLES_SWOOP, 0, 0, CT_DKBROWN1, (void *) &s_quit.nacelles_pic }, // Q{ MG_NACELLES_LABEL
|
||||
// { MG_VAR, 0.0, 0, 0, 0, 0, NULL, 0, 0, Q{ MG_THRUSTERS_DESC1, 0, Q{ MG_THRUSTERS_SWOOP, 0, 0, CT_DKBROWN1, (void *) &s_quit.thrusters_pic }, // Q{ MG_THRUSTERS_LABEL
|
||||
// { MG_VAR, 0.0, 0, 0, 0, 0, NULL, 0, 0, Q{ MG_VOYAGER_DESC1, 0, 0, 0, 0, CT_DKBROWN1, (void *) &s_quit.voyager_pic }, // Q{ MG_VOYAGER_LABEL
|
||||
{ MG_VAR, 0.0, 0, 0, 0, 0, NULL, 0, 0, 0, 0, 0, 0, 0, 0, NULL }, // Q{ MG_LABEL_END
|
||||
|
||||
// MG_VAR, 0.0, 0, 0, 0, 0, NULL, 0, 0, 0, 0, 0, 0, 0, 0, NULL, // QMG_SWOOP_START
|
||||
// MG_GRAPHIC, 0.0, 156, 198, 93, 1, "menu/common/square.tga", 0, 0, 0, 0, QMG_BRIDGE_DESC1, 1, 0, CT_WHITE, NULL, // QMG_BRIDGE_SWOOP
|
||||
// MG_GRAPHIC, 0.0, 155, 229, 16, 64, "menu/voyager/swoop1.tga", 0, 0, 0, 0, QMG_PHASER_STRIP1_DESC1, 2, 0, CT_WHITE, NULL, // QMG_PHASER_STRIP1_SWOOP
|
||||
// MG_GRAPHIC, 0.0, 252, 272, 32, 32, "menu/voyager/swoop2.tga", 0, 0, 0, 0, QMG_TORPEDOS_DESC1, 1, 0, CT_WHITE, NULL, // QMG_TORPEDOS_SWOOP
|
||||
// MG_GRAPHIC, 0.0, 318, 310, 32, 32, "menu/voyager/swoop3.tga", 0, 0, 0, 0, QMG_VENTRAL_DESC1, 1, 0, CT_WHITE, NULL, // QMG_VENTRAL_SWOOP
|
||||
// MG_GRAPHIC, 0.0, 366, 247, 16, 128, "menu/voyager/swoop4.tga", 0, 0, 0, 0, QMG_MIDHULL_DESC1, 1, 0, CT_WHITE, NULL, // QMG_MIDHULL_SWOOP
|
||||
// MG_GRAPHIC, 0.0, 457, 281, 64, 64, "menu/voyager/swoop5.tga", 0, 0, 0, 0, QMG_BUSSARD_DESC1, 3, 0, CT_WHITE, NULL, // QMG_BUSSARD_SWOOP
|
||||
// MG_GRAPHIC, 0.0, 563, 181, 64, 128, "menu/voyager/swoop6.tga", 0, 0, 0, 0, QMG_NACELLES_DESC1, 2, 0, CT_WHITE, NULL, // QMG_NACELLES_SWOOP
|
||||
// MG_GRAPHIC, 0.0, 288, 183, 64, 128, "menu/voyager/swoop7.tga", 0, 0, 0, 0, QMG_THRUSTERS_DESC1, 1, 0, CT_WHITE, NULL, // QMG_THRUSTERS_SWOOP
|
||||
// MG_VAR, 0.0, 0, 0, 0, 0, NULL, 0, 0, 0, 0, 0, 0, 0, 0, NULL, // QMG_SWOOP_END
|
||||
// { MG_VAR, 0.0, 0, 0, 0, 0, NULL, 0, 0, 0, 0, 0, 0, 0, 0, NULL }, // Q{ MG_SWOOP_START
|
||||
// { MG_GRAPHIC, 0.0, 156, 198, 93, 1, "menu/common/square.tga", 0, 0, 0, 0, Q{ MG_BRIDGE_DESC1, 1, 0, CT_WHITE, NULL }, // Q{ MG_BRIDGE_SWOOP
|
||||
// { MG_GRAPHIC, 0.0, 155, 229, 16, 64, "menu/voyager/swoop1.tga", 0, 0, 0, 0, Q{ MG_PHASER_STRIP1_DESC1, 2, 0, CT_WHITE, NULL }, // Q{ MG_PHASER_STRIP1_SWOOP
|
||||
// { MG_GRAPHIC, 0.0, 252, 272, 32, 32, "menu/voyager/swoop2.tga", 0, 0, 0, 0, Q{ MG_TORPEDOS_DESC1, 1, 0, CT_WHITE, NULL }, // Q{ MG_TORPEDOS_SWOOP
|
||||
// { MG_GRAPHIC, 0.0, 318, 310, 32, 32, "menu/voyager/swoop3.tga", 0, 0, 0, 0, Q{ MG_VENTRAL_DESC1, 1, 0, CT_WHITE, NULL }, // Q{ MG_VENTRAL_SWOOP
|
||||
// { MG_GRAPHIC, 0.0, 366, 247, 16, 128, "menu/voyager/swoop4.tga", 0, 0, 0, 0, Q{ MG_MIDHULL_DESC1, 1, 0, CT_WHITE, NULL }, // Q{ MG_MIDHULL_SWOOP
|
||||
// { MG_GRAPHIC, 0.0, 457, 281, 64, 64, "menu/voyager/swoop5.tga", 0, 0, 0, 0, Q{ MG_BUSSARD_DESC1, 3, 0, CT_WHITE, NULL }, // Q{ MG_BUSSARD_SWOOP
|
||||
// { MG_GRAPHIC, 0.0, 563, 181, 64, 128, "menu/voyager/swoop6.tga", 0, 0, 0, 0, Q{ MG_NACELLES_DESC1, 2, 0, CT_WHITE, NULL }, // Q{ MG_NACELLES_SWOOP
|
||||
// { MG_GRAPHIC, 0.0, 288, 183, 64, 128, "menu/voyager/swoop7.tga", 0, 0, 0, 0, Q{ MG_THRUSTERS_DESC1, 1, 0, CT_WHITE, NULL }, // Q{ MG_THRUSTERS_SWOOP
|
||||
// { MG_VAR, 0.0, 0, 0, 0, 0, NULL, 0, 0, 0, 0, 0, 0, 0, 0, NULL }, // Q{ MG_SWOOP_END
|
||||
|
||||
// type timer x y width height file/text graphic, min (desc) max target (swoop) inc style color
|
||||
// MG_GRAPHIC, 0.0, 0, 353, 8, 8, "menu/common/square.tga", 0, 0, 77, 550,0, 12, UI_TINYFONT, CT_LTPURPLE1, NULL, // QMG_BOTTOM_BLIP
|
||||
// MG_GRAPHIC, 0.0, 0, 167, 8, 8, "menu/common/square.tga", 0, 0, 77, 550,0, 12, UI_TINYFONT, CT_LTPURPLE1, NULL, // QMG_BOTTOM_BLIP2
|
||||
// { MG_GRAPHIC, 0.0, 0, 353, 8, 8, "menu/common/square.tga", 0, 0, 77, 550,0, 12, UI_TINYFONT, CT_LTPURPLE1, NULL }, // Q{ MG_BOTTOM_BLIP
|
||||
// { MG_GRAPHIC, 0.0, 0, 167, 8, 8, "menu/common/square.tga", 0, 0, 77, 550,0, 12, UI_TINYFONT, CT_LTPURPLE1, NULL }, // Q{ MG_BOTTOM_BLIP2
|
||||
};
|
||||
|
||||
|
||||
|
|
@ -590,25 +590,25 @@ menugraphics_s attackmenu_graphics1[AMG_MAX] =
|
|||
{
|
||||
//X - 58
|
||||
// type timer x y width height file/text graphic, min max target inc style color
|
||||
MG_GRAPHIC, 0.0, 100, 280, 4, 32, "menu/common/square.tga", 0, 0, 0, 0, 0, 0, 0, CT_VDKPURPLE1, NULL, // AMG_MIDLEFT
|
||||
MG_GRAPHIC, 0.0, 100, 180, 8, 97, "menu/common/square.tga", 0, 0, 0, 0, 0, 0, 0, CT_VDKPURPLE1, NULL, // AMG_UPPERLEFT
|
||||
MG_GRAPHIC, 0.0, 100, 315, 8, 100, "menu/common/square.tga", 0, 0, 0, 0, 0, 0, 0, CT_VDKPURPLE1, NULL, // AMG_LOWERLEFT
|
||||
MG_GRAPHIC, 0.0, 100, 164, 16, 16, "menu/common/corner_lu.tga",0, 0, 0, 0, 0, 0, 0, CT_VDKPURPLE1, NULL, // AMG_UPPERCORNER
|
||||
MG_GRAPHIC, 0.0, 100, 406, 32, 32, "menu/common/newswoosh.tga",0, 0, 0, 0, 0, 0, 0, CT_VDKPURPLE1, NULL, // AMG_LOWERCORNER
|
||||
{ MG_GRAPHIC, 0.0, 100, 280, 4, 32, "menu/common/square.tga", 0, 0, 0, 0, 0, 0, 0, CT_VDKPURPLE1, NULL }, // AMG_MIDLEFT
|
||||
{ MG_GRAPHIC, 0.0, 100, 180, 8, 97, "menu/common/square.tga", 0, 0, 0, 0, 0, 0, 0, CT_VDKPURPLE1, NULL }, // AMG_UPPERLEFT
|
||||
{ MG_GRAPHIC, 0.0, 100, 315, 8, 100, "menu/common/square.tga", 0, 0, 0, 0, 0, 0, 0, CT_VDKPURPLE1, NULL }, // AMG_LOWERLEFT
|
||||
{ MG_GRAPHIC, 0.0, 100, 164, 16, 16, "menu/common/corner_lu.tga",0, 0, 0, 0, 0, 0, 0, CT_VDKPURPLE1, NULL }, // AMG_UPPERCORNER
|
||||
{ MG_GRAPHIC, 0.0, 100, 406, 32, 32, "menu/common/newswoosh.tga",0, 0, 0, 0, 0, 0, 0, CT_VDKPURPLE1, NULL }, // AMG_LOWERCORNER
|
||||
|
||||
MG_GRAPHIC, 0.0, 119, 164, 338, 8, "menu/common/square.tga", 0, 0, 0, 0, 0, 0, 0, CT_VDKPURPLE1, NULL, // AMG_UPPERTOP1ST
|
||||
MG_GRAPHIC, 0.0, 117, 410, 340, 18, "menu/common/square.tga", 0, 0, 0, 0, 0, 0, 0, CT_VDKPURPLE1, NULL, // AMG_LOWERTOP1ST
|
||||
{ MG_GRAPHIC, 0.0, 119, 164, 338, 8, "menu/common/square.tga", 0, 0, 0, 0, 0, 0, 0, CT_VDKPURPLE1, NULL }, // AMG_UPPERTOP1ST
|
||||
{ MG_GRAPHIC, 0.0, 117, 410, 340, 18, "menu/common/square.tga", 0, 0, 0, 0, 0, 0, 0, CT_VDKPURPLE1, NULL }, // AMG_LOWERTOP1ST
|
||||
|
||||
MG_GRAPHIC, 0.0, 457, 164, 34, 8, "menu/common/square.tga", 0, 0, 0, 0, 0, 0, 0, CT_VDKPURPLE1, NULL, // AMG_UPPERTOP2ND
|
||||
MG_GRAPHIC, 0.0, 457, 410, 34, 18, "menu/common/square.tga", 0, 0, 0, 0, 0, 0, 0, CT_VDKPURPLE1, NULL, // AMG_LOWERTOP2ND
|
||||
{ MG_GRAPHIC, 0.0, 457, 164, 34, 8, "menu/common/square.tga", 0, 0, 0, 0, 0, 0, 0, CT_VDKPURPLE1, NULL }, // AMG_UPPERTOP2ND
|
||||
{ MG_GRAPHIC, 0.0, 457, 410, 34, 18, "menu/common/square.tga", 0, 0, 0, 0, 0, 0, 0, CT_VDKPURPLE1, NULL }, // AMG_LOWERTOP2ND
|
||||
|
||||
MG_GRAPHIC, 0.0, 494, 164, 128, 128, "menu/common/swoosh_top.tga",0, 0, 0, 0, 0, 0, 0, CT_VDKPURPLE1, NULL, // AMG_UPPERSWOOP
|
||||
MG_GRAPHIC, 0.0, 483, 403, 128, 32, "menu/common/newswoosh_long.tga",0, 0, 0, 0, 0, 0, 0, CT_VDKPURPLE1, NULL, // AMG_LOWERSWOOP
|
||||
{ MG_GRAPHIC, 0.0, 494, 164, 128, 128, "menu/common/swoosh_top.tga",0, 0, 0, 0, 0, 0, 0, CT_VDKPURPLE1, NULL }, // AMG_UPPERSWOOP
|
||||
{ MG_GRAPHIC, 0.0, 483, 403, 128, 32, "menu/common/newswoosh_long.tga",0, 0, 0, 0, 0, 0, 0, CT_VDKPURPLE1, NULL }, // AMG_LOWERSWOOP
|
||||
|
||||
MG_GRAPHIC, 0.0, 501, 189, 110, 17, "menu/common/square.tga", 0, 0, 0, 0, 0, 0, 0, CT_VDKPURPLE1, NULL, // AMG_TOPRIGHT
|
||||
MG_GRAPHIC, 0.0, 501, 383, 110, 17, "menu/common/square.tga", 0, 0, 0, 0, 0, 0, 0, CT_VDKPURPLE1, NULL, // AMG_BOTTOMRIGHT
|
||||
{ MG_GRAPHIC, 0.0, 501, 189, 110, 17, "menu/common/square.tga", 0, 0, 0, 0, 0, 0, 0, CT_VDKPURPLE1, NULL }, // AMG_TOPRIGHT
|
||||
{ MG_GRAPHIC, 0.0, 501, 383, 110, 17, "menu/common/square.tga", 0, 0, 0, 0, 0, 0, 0, CT_VDKPURPLE1, NULL }, // AMG_BOTTOMRIGHT
|
||||
|
||||
MG_GRAPHIC, 0.0, 501, 206, 110, 177, "menu/common/square.tga", 0, 0, 0, 0, 0, 0, 0, CT_VDKPURPLE1, NULL, // AMG_PLAYERBKGRND
|
||||
{ MG_GRAPHIC, 0.0, 501, 206, 110, 177, "menu/common/square.tga", 0, 0, 0, 0, 0, 0, 0, CT_VDKPURPLE1, NULL }, // AMG_PLAYERBKGRND
|
||||
};
|
||||
/*
|
||||
===================
|
||||
|
|
@ -1906,7 +1906,7 @@ static weapongraphics_s weapon_graphics[UI_NUM_WEAPONS] = //was WP_NUM_WEAPONS,
|
|||
trap_R_AddLightToScene( origin, 500, 1.0, 1.0, 1.0 );
|
||||
|
||||
trap_R_RenderScene( &refdef );
|
||||
}/*
|
||||
}*/
|
||||
|
||||
/*
|
||||
================
|
||||
|
|
@ -1940,7 +1940,7 @@ static void CacheWeaponModel(int i);
|
|||
|
||||
//BOOKMARK - 163
|
||||
UI_DrawProportionalString( 289, 180, bg_itemlist[s_main.currentWeapon + 1].pickup_name,UI_CENTER|UI_SMALLFONT, colorTable[CT_YELLOW]);
|
||||
}/*
|
||||
}*/
|
||||
|
||||
/*
|
||||
=================
|
||||
|
|
@ -1949,7 +1949,7 @@ M_MainMenu_Graphics
|
|||
*/
|
||||
//BOOKMARK
|
||||
|
||||
static qboolean hasSlashed = qfalse;
|
||||
//static qboolean hasSlashed = qfalse;
|
||||
|
||||
static void M_MainMenu_Graphics (void)
|
||||
{
|
||||
|
|
@ -2067,9 +2067,9 @@ static void M_MainMenu_Graphics (void)
|
|||
trap_S_StartLocalSound( uis.menu_choice1_snd, CHAN_LOCAL_SOUND );
|
||||
weaponptr = g_weapons[s_main.currentWeapon];
|
||||
((menubitmap_s*)weaponptr)->textcolor = CT_LTGOLD1;
|
||||
}/*
|
||||
}
|
||||
|
||||
/* ===REMOVED BECAUSE OF TIM's NEW Credits Menu===
|
||||
===REMOVED BECAUSE OF TIM's NEW Credits Menu===
|
||||
switch (s_main.currentWeapon)
|
||||
{
|
||||
|
||||
|
|
@ -2084,7 +2084,7 @@ static void M_MainMenu_Graphics (void)
|
|||
|
||||
case 1 : // Phaser rifle
|
||||
Player_UpdateModel( ANIM_WEAPON2 );
|
||||
/*
|
||||
|
||||
UI_DrawProportionalString( 130, 308, "Project Lead: Phenix",UI_TINYFONT, colorTable[CT_LTGOLD1]);
|
||||
UI_DrawProportionalString( 130, 322, "Lead Coder: Jason2Jason",UI_TINYFONT, colorTable[CT_LTGOLD1]);
|
||||
UI_DrawProportionalString( 130, 336, "Lead Mapper: Sniper",UI_TINYFONT, colorTable[CT_LTGOLD1]);
|
||||
|
|
|
|||
|
|
@ -1703,9 +1703,9 @@ static void PlayerModel_MenuInit(int menuFrom)
|
|||
int x;
|
||||
int y;
|
||||
static char playername[32];
|
||||
static char modelname[32];
|
||||
static char skinname[32];
|
||||
static char skinnameviewed[32];
|
||||
//static char modelname[32];
|
||||
//static char skinname[32];
|
||||
//static char skinnameviewed[32];
|
||||
qboolean races=qfalse;
|
||||
qboolean genders=qfalse;
|
||||
|
||||
|
|
|
|||
|
|
@ -27,10 +27,10 @@ static float jumpHeight;
|
|||
//TiM : Bolton Table
|
||||
stringID_table_t BoltonTable[BOLTON_MAX + 1] =
|
||||
{
|
||||
ENUM2STRING(BOLTON_HEAD),
|
||||
ENUM2STRING(BOLTON_TORSO),
|
||||
ENUM2STRING(BOLTON_LEGS),
|
||||
NULL, -1
|
||||
{ ENUM2STRING(BOLTON_HEAD) },
|
||||
{ ENUM2STRING(BOLTON_TORSO) },
|
||||
{ ENUM2STRING(BOLTON_LEGS) },
|
||||
{ NULL, -1 }
|
||||
};
|
||||
|
||||
/*
|
||||
|
|
|
|||
|
|
@ -126,8 +126,8 @@ typedef struct {
|
|||
|
||||
static playersettings_t s_playersettings;
|
||||
|
||||
static int gamecodetoui[] = {4,2,3,0,5,1,6};
|
||||
static int uitogamecode[] = {4,6,2,3,1,5,7};
|
||||
//static int gamecodetoui[] = {4,2,3,0,5,1,6};
|
||||
//static int uitogamecode[] = {4,6,2,3,1,5,7};
|
||||
|
||||
/*
|
||||
static int handicap_items[] =
|
||||
|
|
@ -508,12 +508,13 @@ static void PlayerSettings_SaveChanges( void )
|
|||
|
||||
//rank
|
||||
if ( s_playersettings.pRank.curvalue == s_playersettings.numRanks ) {
|
||||
if ( s_playersettings.rankTxt.field.buffer[0] )
|
||||
if ( s_playersettings.rankTxt.field.buffer[0] ) {
|
||||
if ( !ingameFlag )
|
||||
trap_Cvar_Set( "ui_playerRank", s_playersettings.rankTxt.field.buffer );
|
||||
else
|
||||
trap_Cmd_ExecuteText( EXEC_APPEND, va( "rank %s\n", s_playersettings.rankTxt.field.buffer ) );
|
||||
}
|
||||
}
|
||||
else {
|
||||
if ( !ingameFlag )
|
||||
trap_Cvar_Set( "ui_playerRank", Q_strlwr( uis.rankSet.rankNames[s_playersettings.pRank.curvalue].consoleName ) );
|
||||
|
|
@ -971,7 +972,7 @@ PlayerSettings_MenuInit
|
|||
static void PlayerSettings_MenuInit(int menuFrom)
|
||||
{
|
||||
int y;
|
||||
static char playername[32];
|
||||
//static char playername[32];
|
||||
int i;
|
||||
|
||||
memset(&s_playersettings,0,sizeof(playersettings_t));
|
||||
|
|
|
|||
|
|
@ -103,14 +103,14 @@ int s_voicelanguage_Names[] =
|
|||
MNT_NONE
|
||||
};
|
||||
|
||||
static int teamoverlay_names[] =
|
||||
/*static int teamoverlay_names[] =
|
||||
{
|
||||
MNT_TO_OFF,
|
||||
MNT_TO_UPPER_RIGHT,
|
||||
MNT_TO_LOWER_RIGHT,
|
||||
MNT_TO_LOWER_LEFT,
|
||||
0
|
||||
};
|
||||
};*/
|
||||
|
||||
static void Preferences_SetMenuItems( void )
|
||||
{
|
||||
|
|
|
|||
|
|
@ -610,7 +610,7 @@ void Bitmap_Draw( menubitmap_s *b )
|
|||
UI_DrawHandlePic( x, y, w, h, b->shader );
|
||||
}
|
||||
|
||||
if ((b->generic.flags & QMF_PULSE) || (b->generic.flags & QMF_PULSEIFFOCUS) && (Menu_ItemAtCursor( b->generic.parent ) == b))
|
||||
if ((b->generic.flags & QMF_PULSE) || ((b->generic.flags & QMF_PULSEIFFOCUS) && (Menu_ItemAtCursor( b->generic.parent ) == b)))
|
||||
{
|
||||
if (b->focuscolor)
|
||||
{
|
||||
|
|
|
|||
|
|
@ -283,8 +283,8 @@ static servernode_t g_localserverlist[MAX_LOCALSERVERS];
|
|||
static int g_numlocalservers;
|
||||
static servernode_t g_favoriteserverlist[MAX_FAVORITESERVERS];
|
||||
static int g_numfavoriteservers;
|
||||
static servernode_t g_mplayerserverlist[MAX_GLOBALSERVERS];
|
||||
static int g_nummplayerservers;
|
||||
//static servernode_t g_mplayerserverlist[MAX_GLOBALSERVERS];
|
||||
//static int g_nummplayerservers;
|
||||
static int g_servertype;
|
||||
static int g_gametype;
|
||||
static int g_sortkey;
|
||||
|
|
|
|||
|
|
@ -193,7 +193,7 @@ static int gametype_items[] =
|
|||
};
|
||||
|
||||
static int gametype_remap[] = {GT_FFA, GT_TEAM, GT_TOURNAMENT, GT_CTF};
|
||||
static int gametype_remap2[] = {0, 2, 0, 1, 3};
|
||||
//static int gametype_remap2[] = {0, 2, 0, 1, 3};
|
||||
|
||||
static void UI_ServerOptionsMenu( qboolean multiplayer );
|
||||
static int UI_SearchGroupTable(char *current_race);
|
||||
|
|
|
|||
|
|
@ -41,9 +41,9 @@ extern void AdminGeneric_InitLists( void );
|
|||
void UI_TransporterMenu_Cache (void);
|
||||
|
||||
|
||||
static void TransCreateMaplist(void) {
|
||||
/*static void TransCreateMaplist(void) {
|
||||
|
||||
}
|
||||
}*/
|
||||
|
||||
/*
|
||||
=================
|
||||
|
|
|
|||
|
|
@ -71,12 +71,12 @@ static int s_graphics_options_Names[] =
|
|||
MNT_NONE
|
||||
};
|
||||
|
||||
static int s_driver_Names[] =
|
||||
/*static int s_driver_Names[] =
|
||||
{
|
||||
MNT_VIDEO_DRIVER_DEFAULT,
|
||||
MNT_VIDEO_DRIVER_VOODOO,
|
||||
MNT_NONE
|
||||
};
|
||||
};*/
|
||||
|
||||
extern int s_OffOnNone_Names[];
|
||||
|
||||
|
|
@ -115,9 +115,9 @@ static char *s_wideResolutions16x9[] =
|
|||
|
||||
static videoResolutions_t videoResolutions16x9[] =
|
||||
{
|
||||
854, 480,
|
||||
1280, 720,
|
||||
1920, 1080
|
||||
{ 854, 480 },
|
||||
{ 1280, 720 },
|
||||
{ 1920, 1080 }
|
||||
};
|
||||
|
||||
static char *s_wideResolutions16x10[] =
|
||||
|
|
@ -132,11 +132,11 @@ static char *s_wideResolutions16x10[] =
|
|||
|
||||
static videoResolutions_t videoResolutions16x10[] =
|
||||
{
|
||||
1280, 800,
|
||||
1440, 900,
|
||||
1680, 1050,
|
||||
1920, 1200,
|
||||
2560, 1600
|
||||
{ 1280, 800 },
|
||||
{ 1440, 900 },
|
||||
{ 1680, 1050 },
|
||||
{ 1920, 1200 },
|
||||
{ 2560, 1600 }
|
||||
};
|
||||
|
||||
static void *s_widescreenResolutions[] =
|
||||
|
|
@ -177,12 +177,12 @@ static int s_colordepth_Names[] =
|
|||
MNT_NONE
|
||||
};
|
||||
|
||||
static int s_lighting_Names[] =
|
||||
/*static int s_lighting_Names[] =
|
||||
{
|
||||
MNT_LIGHTMAP,
|
||||
MNT_VERTEX,
|
||||
MNT_NONE
|
||||
};
|
||||
};*/
|
||||
|
||||
static int s_quality_Names[] =
|
||||
{
|
||||
|
|
@ -313,9 +313,9 @@ static void* g_videolines[] =
|
|||
|
||||
int video_sidebuttons[3][2] =
|
||||
{
|
||||
30, 250, // Video Data Button
|
||||
30, 250 + 6 + (MENU_BUTTON_MED_HEIGHT * 1.5), // Video Drivers Button
|
||||
30, 250 + (2 * (6 + (MENU_BUTTON_MED_HEIGHT * 1.5))), // Video Drivers Button
|
||||
{ 30, 250 }, // Video Data Button
|
||||
{ 30, 250 + 6 + (MENU_BUTTON_MED_HEIGHT * 1.5) }, // Video Drivers Button
|
||||
{ 30, 250 + (2 * (6 + (MENU_BUTTON_MED_HEIGHT * 1.5))) }, // Video Drivers Button
|
||||
};
|
||||
|
||||
|
||||
|
|
@ -488,12 +488,12 @@ GRAPHICS OPTIONS MENU
|
|||
*/
|
||||
|
||||
|
||||
static const char *s_drivers[] =
|
||||
/*static const char *s_drivers[] =
|
||||
{
|
||||
OPENGL_DRIVER_NAME,
|
||||
_3DFX_DRIVER_NAME,
|
||||
0
|
||||
};
|
||||
};*/
|
||||
|
||||
#define ID_BACK2 101
|
||||
#define ID_FULLSCREEN 102
|
||||
|
|
|
|||
Loading…
Reference in a new issue