X-Git-Url: https://de.git.xonotic.org/?a=blobdiff_plain;ds=sidebyside;f=qcsrc%2Fmenu%2Fxonotic%2Fdialog_multiplayer_playersetup_hud.c;h=8d969fd7a3ef35fce3a0ba58cdc2bd3208d3e008;hb=e0ac5f9f14e169a1e19d0e36b85cab061a74ed93;hp=1d766d4771c53e920b2916552183078700ae9ec7;hpb=7a91f3996d6efff260a66013d9b4681f0d481874;p=xonotic%2Fxonotic-data.pk3dir.git diff --git a/qcsrc/menu/xonotic/dialog_multiplayer_playersetup_hud.c b/qcsrc/menu/xonotic/dialog_multiplayer_playersetup_hud.c index 1d766d477..8d969fd7a 100644 --- a/qcsrc/menu/xonotic/dialog_multiplayer_playersetup_hud.c +++ b/qcsrc/menu/xonotic/dialog_multiplayer_playersetup_hud.c @@ -15,7 +15,7 @@ void HUDSetup_Start(entity me, entity btn); #ifdef IMPLEMENTATION void HUDSetup_Check_Gamestatus(entity me, entity btn) { - if not(gamestatus & (GAME_CONNECTED | GAME_ISSERVER)) // we're not in a match, ask the player if they want to start one anyway + if(!(gamestatus & (GAME_CONNECTED | GAME_ISSERVER))) // we're not in a match, ask the player if they want to start one anyway { DialogOpenButton_Click(me, main.hudconfirmDialog); } @@ -30,12 +30,12 @@ void XonoticHUDDialog_showNotify(entity me) } string XonoticHUDDialog_toString(entity me) { - return "hi"; // TODO: show hud config name with text here + return "hi"; // TODO: show hud config name with text here } void XonoticHUDDialog_fill(entity me) { entity e; - + me.TR(me); me.TD(me, 1, 3, e = makeXonoticTextLabel(0, _("Damage:"))); me.TR(me); @@ -45,37 +45,40 @@ void XonoticHUDDialog_fill(entity me) me.TR(me); me.TDempty(me, 0.2); me.TD(me, 1, 0.8, e = makeXonoticTextLabel(0, _("Factor:"))); - me.TD(me, 1, 2, e = makeXonoticSlider(0.005, 0.1, 0.005, "hud_damage_factor")); + setDependent(e, "hud_damage", 0.001, 100); + me.TD(me, 1, 2, e = makeXonoticSlider(0.025, 0.1, 0.025, "hud_damage_factor")); setDependent(e, "hud_damage", 0.001, 100); me.TR(me); me.TDempty(me, 0.2); me.TD(me, 1, 0.8, e = makeXonoticTextLabel(0, _("Fade rate:"))); + setDependent(e, "hud_damage", 0.001, 100); me.TD(me, 1, 2, e = makeXonoticSlider(0.25, 1, 0.05, "hud_damage_fade_rate")); setDependent(e, "hud_damage", 0.001, 100); me.TR(me); - + me.TR(me); me.TD(me, 1, 3, e = makeXonoticCheckBox(1, "cl_hidewaypoints", _("Waypoints"))); me.TR(me); me.TDempty(me, 0.2); me.TD(me, 1, 0.8, e = makeXonoticTextLabel(0, _("Scale:"))); + setDependent(e, "cl_hidewaypoints", 0, 0); me.TD(me, 1, 2, e = makeXonoticSlider(0.5, 1.5, 0.05, "g_waypointsprite_scale")); setDependent(e, "cl_hidewaypoints", 0, 0); me.TR(me); me.TDempty(me, 0.2); me.TD(me, 1, 0.8, e = makeXonoticTextLabel(0, _("Alpha:"))); + setDependent(e, "cl_hidewaypoints", 0, 0); me.TD(me, 1, 2, e = makeXonoticSlider(0.1, 1, 0.05, "g_waypointsprite_alpha")); setDependent(e, "cl_hidewaypoints", 0, 0); me.TR(me); me.TDempty(me, 0.2); me.TD(me, 1, 0.8, e = makeXonoticTextLabel(0, _("Edge offset:"))); + setDependent(e, "cl_hidewaypoints", 0, 0); me.TD(me, 1, 2, e = makeXonoticSlider(0, 0.3, 0.01, "g_waypointsprite_edgeoffset_bottom")); - makeMulti(e, "g_waypointsprite_edgeoffset_top"); - makeMulti(e, "g_waypointsprite_edgeoffset_left"); - makeMulti(e, "g_waypointsprite_edgeoffset_right"); + makeMulti(e, "g_waypointsprite_edgeoffset_top g_waypointsprite_edgeoffset_left g_waypointsprite_edgeoffset_right"); setDependent(e, "cl_hidewaypoints", 0, 0); me.TR(me); - + me.TR(me); me.TD(me, 1, 3, e = makeXonoticCheckBox(0, "hud_shownames", _("Show names above players"))); me.TR(me); @@ -90,11 +93,11 @@ void XonoticHUDDialog_fill(entity me) me.TD(me, 1, 2, e = makeXonoticButton(_("Enter HUD editor"), '0 0 0')); e.onClick = HUDSetup_Check_Gamestatus; e.onClickEntity = me; - // TODO: show hud config name with text here - + // TODO: show hud config name with text here + me.gotoRC(me, me.rows - 1, 0); me.TD(me, 1, me.columns, e = makeXonoticButton(_("OK"), '0 0 0')); e.onClick = Dialog_Close; e.onClickEntity = me; } -#endif \ No newline at end of file +#endif