yquake2/yquake2remaster
0
0
Fork 0
mirror of https://github.com/yquake2/yquake2remaster.git synced 2025-02-20 10:53:22 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix alignment in the Multiplayer -> Player Setup menu.

Browse source 
Relates to issue #87.
This commit is contained in:
David Reid 2015-10-22 21:41:58 +10:00
parent 585e7dbfda
commit dc53635f46
1 changed files with 13 additions and 43 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

56
src/client/menu/menu.c
View file

@ -4109,24 +4109,18 @@ PlayerConfig_MenuInit(void)
s_player_name_field.generic.callback = 0;
s_player_name_field.generic.x = 0;
s_player_name_field.generic.y = 0;
s_player_name_field.length = 20 * scale;
s_player_name_field.visible_length = 20 * scale;
s_player_name_field.length = 20;
s_player_name_field.visible_length = 20;
strcpy(s_player_name_field.buffer, name->string);
s_player_name_field.cursor = strlen(name->string);
s_player_model_title.generic.type = MTYPE_SEPARATOR;
s_player_model_title.generic.name = "model";
if (scale > 1)
s_player_model_title.generic.x = -8 * scale + (8 * scale);
else
s_player_model_title.generic.x = -8;
s_player_model_title.generic.x = -8 * scale;
s_player_model_title.generic.y = 60;
s_player_model_box.generic.type = MTYPE_SPINCONTROL;
if (scale > 1)
s_player_model_box.generic.x = -56 * scale + ((15 + scale) * scale);
else
s_player_model_box.generic.x = -56;
s_player_model_box.generic.x = -56 * scale;
s_player_model_box.generic.y = 70;
s_player_model_box.generic.callback = ModelCallback;
s_player_model_box.generic.cursor_offset = -48;
@ -4135,17 +4129,11 @@ PlayerConfig_MenuInit(void)
s_player_skin_title.generic.type = MTYPE_SEPARATOR;
s_player_skin_title.generic.name = "skin";
if (scale > 1)
s_player_skin_title.generic.x = -16 * scale + (8 * scale);
else
s_player_skin_title.generic.x = -16;
s_player_skin_title.generic.x = -16 * scale;
s_player_skin_title.generic.y = 84;
s_player_skin_box.generic.type = MTYPE_SPINCONTROL;
if (scale > 1)
s_player_skin_box.generic.x = -56 * scale + ((15 + scale) * scale);
else
s_player_skin_box.generic.x = -56;
s_player_skin_box.generic.x = -56 * scale;
s_player_skin_box.generic.y = 94;
s_player_skin_box.generic.name = 0;
s_player_skin_box.generic.callback = 0;
@ -4156,17 +4144,11 @@ PlayerConfig_MenuInit(void)
s_player_hand_title.generic.type = MTYPE_SEPARATOR;
s_player_hand_title.generic.name = "handedness";
if (scale > 1)
s_player_hand_title.generic.x = 32 * scale + (8 * scale);
else
s_player_hand_title.generic.x = 32;
s_player_hand_title.generic.x = 32 * scale;
s_player_hand_title.generic.y = 108;
s_player_handedness_box.generic.type = MTYPE_SPINCONTROL;
if (scale > 1)
s_player_handedness_box.generic.x = -56 * scale + ((15 + scale) * scale);
else
s_player_handedness_box.generic.x = -56;
s_player_handedness_box.generic.x = -56 * scale;
s_player_handedness_box.generic.y = 118;
s_player_handedness_box.generic.name = 0;
s_player_handedness_box.generic.cursor_offset = -48;
@ -4184,17 +4166,11 @@ PlayerConfig_MenuInit(void)
s_player_rate_title.generic.type = MTYPE_SEPARATOR;
s_player_rate_title.generic.name = "connect speed";
if (scale > 1)
s_player_rate_title.generic.x = 56 * scale + (8 * scale);
else
s_player_rate_title.generic.x = 56;
s_player_rate_title.generic.x = 56 * scale;
s_player_rate_title.generic.y = 156;
s_player_rate_box.generic.type = MTYPE_SPINCONTROL;
if (scale > 1)
s_player_rate_box.generic.x = -56 * scale + ((15 + scale) * scale);
else
s_player_rate_box.generic.x = -56;
s_player_rate_box.generic.x = -56 * scale;
s_player_rate_box.generic.y = 166;
s_player_rate_box.generic.name = 0;
s_player_rate_box.generic.cursor_offset = -48;
@ -4205,13 +4181,7 @@ PlayerConfig_MenuInit(void)
s_player_download_action.generic.type = MTYPE_ACTION;
s_player_download_action.generic.name = "download options";
s_player_download_action.generic.flags = QMF_LEFT_JUSTIFY;
if (scale > 1)
{
s_player_download_action.generic.x = -24 * scale;
s_player_download_action.generic.cursor_offset = 16 * scale;
}
else
s_player_download_action.generic.x = -24;
s_player_download_action.generic.x = -24 * scale;
s_player_download_action.generic.y = 186;
s_player_download_action.generic.statusbar = NULL;
s_player_download_action.generic.callback = DownloadOptionsFunc;
@ -4295,7 +4265,7 @@ PlayerConfig_MenuDraw(void)
M_DrawTextBox(((int)(refdef.x) * (320.0F / viddef.width) - 8),
(int)((viddef.height / 2) * (240.0F / viddef.height) - 77),
refdef.width / (8 * scale), refdef.height / (8 * scale));
refdef.height += 4;
refdef.height += 4 * scale;
R_RenderFrame(&refdef);
@ -4303,7 +4273,7 @@ PlayerConfig_MenuDraw(void)
s_pmi[s_player_model_box.curvalue].directory,
s_pmi[s_player_model_box.curvalue].skindisplaynames[
s_player_skin_box.curvalue]);
Draw_PicScaled(s_player_config_menu.x - 40, refdef.y, scratch, scale);
Draw_PicScaled(s_player_config_menu.x - 40*scale, refdef.y, scratch, scale);
}
}