From 0b192b1938684fd3d2a4fea24747aa3be0cb4369 Mon Sep 17 00:00:00 2001 From: terencehill Date: Tue, 7 Feb 2012 01:03:56 +0100 Subject: [PATCH] Add + and - buttons near the player model selector --- .../xonotic/dialog_multiplayer_playersetup.c | 10 ++++++++++ qcsrc/menu/xonotic/playermodel.c | 20 +++++++++++++++---- 2 files changed, 26 insertions(+), 4 deletions(-) diff --git a/qcsrc/menu/xonotic/dialog_multiplayer_playersetup.c b/qcsrc/menu/xonotic/dialog_multiplayer_playersetup.c index b187c007a..aa554d5a2 100644 --- a/qcsrc/menu/xonotic/dialog_multiplayer_playersetup.c +++ b/qcsrc/menu/xonotic/dialog_multiplayer_playersetup.c @@ -80,6 +80,16 @@ void XonoticPlayerSettingsTab_fill(entity me) me.gotoRC(me, r + i * m, 0.4); me.TDNoMargin(me, m, 0.2, e = makeXonoticColorButton(2, 1, i), '0 1 0'); } + me.gotoRC(me, me.rows - 4, 0); + me.TDempty(me, 2.7); + me.TD(me, 1, 0.3, e = makeXonoticButton("+", '0 0 0')); + e.onClick = PlayerModelSelector_ZoomIn_Click; + e.onClickEntity = pms; + me.TR(me); + me.TDempty(me, 2.7); + me.TD(me, 1, 0.3, e = makeXonoticButton("-", '0 0 0')); + e.onClick = PlayerModelSelector_ZoomOut_Click; + e.onClickEntity = pms; // crosshair_enabled: 0 = no crosshair options, 1 = no crosshair selection, but everything else enabled, 2 = all crosshair options enabled diff --git a/qcsrc/menu/xonotic/playermodel.c b/qcsrc/menu/xonotic/playermodel.c index 8534945e4..34f7c73ca 100644 --- a/qcsrc/menu/xonotic/playermodel.c +++ b/qcsrc/menu/xonotic/playermodel.c @@ -30,6 +30,8 @@ ENDCLASS(XonoticPlayerModelSelector) entity makeXonoticPlayerModelSelector(); void PlayerModelSelector_Next_Click(entity btn, entity me); void PlayerModelSelector_Prev_Click(entity btn, entity me); +void PlayerModelSelector_ZoomIn_Click(entity btn, entity me); +void PlayerModelSelector_ZoomOut_Click(entity btn, entity me); #endif #ifdef IMPLEMENTATION @@ -170,6 +172,18 @@ void PlayerModelSelector_Prev_Click(entity btn, entity me) me.saveCvars(me); } +void PlayerModelSelector_ZoomIn_Click(entity btn, entity me) +{ + me.drag_setStartPos(me, '0.5 0.25 0'); + me.setZoom(me, -2, TRUE); +} + +void PlayerModelSelector_ZoomOut_Click(entity btn, entity me) +{ + me.drag_setStartPos(me, '0.5 0.25 0'); + me.setZoom(me, -1/2, TRUE); +} + void XonoticPlayerModelSelector_saveCvars(entity me) { // we can't immediately apply here because of flood control @@ -197,14 +211,12 @@ float XonoticPlayerModelSelector_keyDown(entity me, float key, float ascii, floa default: if (key == K_MWHEELUP || ascii == '+') { - me.drag_setStartPos(me, '0.5 0.25 0'); - me.setZoom(me, -2, TRUE); + PlayerModelSelector_ZoomIn_Click(world, me); return 1; } else if (key == K_MWHEELDOWN || ascii == '-') { - me.drag_setStartPos(me, '0.5 0.25 0'); - me.setZoom(me, -1/2, TRUE); + PlayerModelSelector_ZoomOut_Click(world, me); return 1; } return SUPER(XonoticScreenshotViewerDialog).keyDown(me, key, ascii, shift); -- 2.39.2