Menu-FN: further work to make the Multiplayer > Customize menu more accurate
This commit is contained in:
parent
943897e5ba
commit
7518e743b9
|
@ -341,7 +341,7 @@ menu_customize_init(void)
|
||||||
g_ePreviewModel.colormod = [cz_sldTopcolor.m_value, cz_sldBottomcolor.m_value, 2.0];
|
g_ePreviewModel.colormod = [cz_sldTopcolor.m_value, cz_sldBottomcolor.m_value, 2.0];
|
||||||
}
|
}
|
||||||
static void ModelPreview_Input ( float type, float x, float y, float flDevID ) {
|
static void ModelPreview_Input ( float type, float x, float y, float flDevID ) {
|
||||||
if (type == IE_KEYUP && x == K_MOUSE1 && Util_CheckMouse(414, 340, 64, 24) == TRUE) {
|
if (type == IE_KEYUP && x == K_MOUSE1 && Util_CheckMouse(414, 360, 64, 24) == TRUE) {
|
||||||
g_iModel--;
|
g_iModel--;
|
||||||
if (g_iModel < 0)
|
if (g_iModel < 0)
|
||||||
g_iModel = g_modelcount - 1;
|
g_iModel = g_modelcount - 1;
|
||||||
|
@ -349,7 +349,7 @@ menu_customize_init(void)
|
||||||
cz_cbModelChanged();
|
cz_cbModelChanged();
|
||||||
ModelPreview_SetModel(sprintf("%s.mdl", g_models[g_iModel]));
|
ModelPreview_SetModel(sprintf("%s.mdl", g_models[g_iModel]));
|
||||||
}
|
}
|
||||||
if (type == IE_KEYUP && x == K_MOUSE1 && Util_CheckMouse(510, 340, 64, 24) == TRUE) {
|
if (type == IE_KEYUP && x == K_MOUSE1 && Util_CheckMouse(510, 360, 64, 24) == TRUE) {
|
||||||
g_iModel++;
|
g_iModel++;
|
||||||
if (g_iModel >= g_modelcount)
|
if (g_iModel >= g_modelcount)
|
||||||
g_iModel = 0;
|
g_iModel = 0;
|
||||||
|
@ -406,8 +406,8 @@ menu_customize_init(void)
|
||||||
}
|
}
|
||||||
|
|
||||||
cz_3dModel = spawn(CUI3DView);
|
cz_3dModel = spawn(CUI3DView);
|
||||||
cz_3dModel.SetPos(410,160);
|
cz_3dModel.SetPos(413,163);
|
||||||
cz_3dModel.SetSize([170,221]);
|
cz_3dModel.SetSize([164,190]);
|
||||||
cz_3dModel.SetDrawFunc(ModelPreview_Draw);
|
cz_3dModel.SetDrawFunc(ModelPreview_Draw);
|
||||||
cz_3dModel.SetInputFunc(ModelPreview_Input);
|
cz_3dModel.SetInputFunc(ModelPreview_Input);
|
||||||
Widget_Add(fn_customize, cz_3dModel);
|
Widget_Add(fn_customize, cz_3dModel);
|
||||||
|
@ -424,13 +424,15 @@ menu_customize_init(void)
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
cz_sldTopcolor = spawn(CSlider);
|
cz_sldTopcolor = spawn(CSlider);
|
||||||
cz_sldTopcolor.SetPos(420,400);
|
cz_sldTopcolor.SetPos(410,410);
|
||||||
|
cz_sldTopcolor.SetLength(170);
|
||||||
cz_sldTopcolor.SetValue(cvar("_cl_topcolor"));
|
cz_sldTopcolor.SetValue(cvar("_cl_topcolor"));
|
||||||
cz_sldTopcolor.SetCallback(cz_sldTopcolorChanged);
|
cz_sldTopcolor.SetCallback(cz_sldTopcolorChanged);
|
||||||
Widget_Add(fn_customize, cz_sldTopcolor);
|
Widget_Add(fn_customize, cz_sldTopcolor);
|
||||||
|
|
||||||
cz_sldBottomcolor = spawn(CSlider);
|
cz_sldBottomcolor = spawn(CSlider);
|
||||||
cz_sldBottomcolor.SetPos(420,420);
|
cz_sldBottomcolor.SetPos(410,430);
|
||||||
|
cz_sldBottomcolor.SetLength(170);
|
||||||
cz_sldBottomcolor.SetValue(cvar("_cl_bottomcolor"));
|
cz_sldBottomcolor.SetValue(cvar("_cl_bottomcolor"));
|
||||||
cz_sldBottomcolor.SetCallback(cz_sldBottomcolorChanged);
|
cz_sldBottomcolor.SetCallback(cz_sldBottomcolorChanged);
|
||||||
Widget_Add(fn_customize, cz_sldBottomcolor);
|
Widget_Add(fn_customize, cz_sldBottomcolor);
|
||||||
|
@ -451,9 +453,15 @@ menu_customize_init(void)
|
||||||
cz_sldReceiveVol.SetPos(213,428);
|
cz_sldReceiveVol.SetPos(213,428);
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
#define TEXTBTN_COLOR [1.0, 0.74, 0.22]
|
||||||
|
#define FRAME_COLOR [0.224, 0.224, 0.224]
|
||||||
void
|
void
|
||||||
menu_customize_draw(void)
|
menu_customize_draw(void)
|
||||||
{
|
{
|
||||||
|
|
||||||
|
drawfill([g_menuofs[0] + 410,g_menuofs[1] + 160], [170, 221], FRAME_COLOR, 1.0f);
|
||||||
|
drawfill([g_menuofs[0] + 413,g_menuofs[1] + 163], [164,190], [0,0,0], 1.0f);
|
||||||
|
|
||||||
Widget_Draw(fn_customize);
|
Widget_Draw(fn_customize);
|
||||||
Header_Draw(HEAD_CUSTOMIZE);
|
Header_Draw(HEAD_CUSTOMIZE);
|
||||||
WLabel_Static(212, 140, m_reslbl[IDS_PLAYERINFO_NAME], 14, 14, [1,1,1],
|
WLabel_Static(212, 140, m_reslbl[IDS_PLAYERINFO_NAME], 14, 14, [1,1,1],
|
||||||
|
@ -478,17 +486,21 @@ menu_customize_draw(void)
|
||||||
WLabel_Static(213, 428 - 16, "Voice Receive Volume *", 14, 14, [1,1,1],
|
WLabel_Static(213, 428 - 16, "Voice Receive Volume *", 14, 14, [1,1,1],
|
||||||
1.0f, 0, font_label);
|
1.0f, 0, font_label);
|
||||||
|
|
||||||
|
|
||||||
|
WLabel_Static(410, 390, "Colors", 14, 14, [1,1,1],
|
||||||
|
1.0f, 0, font_label);
|
||||||
|
|
||||||
if (games[gameinfo_current].nomodels == 0) {
|
if (games[gameinfo_current].nomodels == 0) {
|
||||||
WLabel_Static(410, 140, sprintf(m_reslbl[IDS_MODEL_NAME], cvar_string("_cl_playermodel")), 14, 14, [1,1,1],
|
WLabel_Static(410, 140, sprintf(m_reslbl[IDS_MODEL_NAME], cvar_string("_cl_playermodel")), 14, 14, [1,1,1],
|
||||||
1.0f, 0, font_arial);
|
1.0f, 0, font_arial);
|
||||||
#ifdef MODEL_PREVIEW
|
#ifdef MODEL_PREVIEW
|
||||||
drawfill([g_menuofs[0] + 414,g_menuofs[1] + 370], [64,12], g_vecTopcolor, 0.75f);
|
//drawfill([g_menuofs[0] + 414,g_menuofs[1] + 166], [64,12], g_vecTopcolor, 0.75f);
|
||||||
drawfill([g_menuofs[0] + 510,g_menuofs[1] + 370], [64,12], g_vecBottomcolor, 0.75f);
|
//drawfill([g_menuofs[0] + 510,g_menuofs[1] + 166], [64,12], g_vecBottomcolor, 0.75f);
|
||||||
|
|
||||||
/* fake buttons */
|
/* fake buttons */
|
||||||
WLabel_Static(414, 340, "Previous", 14, 14, [1,1,1],
|
WLabel_Static(414, 360, m_reslbl[IDS_PREVIOUS], 14, 14, col_prompt_text,
|
||||||
1.0f, 0, font_arial);
|
1.0f, 0, font_arial);
|
||||||
WLabel_StaticR(575, 340, "Next", 14, 14, [1,1,1],
|
WLabel_StaticR(575, 360, m_reslbl[IDS_NEXT], 14, 14, col_prompt_text,
|
||||||
1.0f, 0, font_arial);
|
1.0f, 0, font_arial);
|
||||||
#else
|
#else
|
||||||
drawfill([g_menuofs[0] + 414,g_menuofs[1] + 346], [64,12], g_vecTopcolor, 0.75f);
|
drawfill([g_menuofs[0] + 414,g_menuofs[1] + 346], [64,12], g_vecTopcolor, 0.75f);
|
||||||
|
|
|
@ -59,11 +59,11 @@ CPictureSwitch::Draw(void)
|
||||||
drawpic([m_picofs[0]+g_menuofs[0]+m_x+3,m_picofs[1]+g_menuofs[1]+m_y+3], m_pics[m_value],
|
drawpic([m_picofs[0]+g_menuofs[0]+m_x+3,m_picofs[1]+g_menuofs[1]+m_y+3], m_pics[m_value],
|
||||||
[m_picsize[0],m_picsize[1]], [1,1,1], 1.0f);
|
[m_picsize[0],m_picsize[1]], [1,1,1], 1.0f);
|
||||||
|
|
||||||
WLabel_Static(m_x+3, m_y+m_size[1]-16, m_reslbl[IDS_PREVIOUS], 12, 12, [1,1,1],
|
WLabel_Static(m_x+3, m_y+m_size[1]-16, m_reslbl[IDS_PREVIOUS], 12, 12, col_prompt_text,
|
||||||
1.0f, 0, font_arial);
|
1.0f, 0, font_arial);
|
||||||
WLabel_StaticR(m_x+m_size[0]-4,
|
WLabel_StaticR(m_x+m_size[0]-4,
|
||||||
m_y+m_size[1]-16, m_reslbl[IDS_NEXT], 12, 12,
|
m_y+m_size[1]-16, m_reslbl[IDS_NEXT], 12, 12,
|
||||||
[1,1,1],1.0f, 0, font_arial);
|
col_prompt_text,1.0f, 0, font_arial);
|
||||||
}
|
}
|
||||||
|
|
||||||
void
|
void
|
||||||
|
|
|
@ -21,14 +21,16 @@ class CSlider:CWidget
|
||||||
int m_hover;
|
int m_hover;
|
||||||
int m_hold;
|
int m_hold;
|
||||||
float m_value;
|
float m_value;
|
||||||
virtual void(float) m_changed = 0;
|
virtual void m_changed(float) = 0;
|
||||||
|
|
||||||
void(void) CSlider;
|
void CSlider(void);
|
||||||
virtual void(void) Draw;
|
virtual void Draw(void);
|
||||||
virtual void(float, float, float, float) Input;
|
virtual void Input(float, float, float, float);
|
||||||
|
|
||||||
virtual void(float) SetValue;
|
virtual void SetValue(float);
|
||||||
virtual void(void(float)) SetCallback;
|
virtual void SetLength(float);
|
||||||
|
virtual void SetCallback(void(float));
|
||||||
|
|
||||||
};
|
};
|
||||||
|
|
||||||
void
|
void
|
||||||
|
@ -87,6 +89,13 @@ CSlider::Input(float type, float x, float y, float devid)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void
|
||||||
|
CSlider::SetLength(float val)
|
||||||
|
{
|
||||||
|
m_length = val;
|
||||||
|
m_tlength = m_length - 27;
|
||||||
|
}
|
||||||
|
|
||||||
void
|
void
|
||||||
CSlider::SetValue(float val)
|
CSlider::SetValue(float val)
|
||||||
{
|
{
|
||||||
|
|
Loading…
Reference in New Issue