Skip to content

Commit

Permalink
Added "droprune" to the Controls menu, under "Misc". (#223)
Browse files Browse the repository at this point in the history
  • Loading branch information
NeonKnightOA authored Mar 17, 2024
1 parent 0d3ec24 commit 957d320
Show file tree
Hide file tree
Showing 2 changed files with 15 additions and 4 deletions.
8 changes: 4 additions & 4 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
* `cg_bob`: If set to 0, it will disable cg_bobUp/cg_bobRoll/cg_bobPitch. **Default: 1.**
* `cg_kickScale`: Controls how much the screen shakes when receiving damage. **Default: 1.0.**
* `cg_muzzleflashStyle`: Alternative muzzleflash styles for player preference, or "aesthetic," or maybe just less flashing (flashes can also be disabled). **Default: 1.**
* `g_runes 2`: Enables the `tossrune` command (see below) in the server.
* `g_runes 2`: Enables the `droprune` command (see below) in the server.
* `dmflags &4096`: Allows players to move significantly faster underwater. Mostly for demonstration. Could be fun in class based gametypes.
* `g_grapple`: Gives Grappling Hook to all players. Replaces `elimination_grapple`. **Default: 0.**
* `g_harvesterFromBodies`: In Harvester matches, skulls now spawn from dead bodies (a la [UT3!Greed](https://antifandom.com/unreal/wiki/Greed)) rather than a skull receptacle in the middle of the arena. Allows Harvester matches to take place in maps that don't feature a skull receptacle. **Default: 0.**
Expand All @@ -28,7 +28,7 @@
* Shuffle has been reworked by implementing the solution from Aftershock.
* New commands:
* `weapbest`: Selects the best weapon.
* `tossrune`: Tosses the rune that's been carried on. (Akin to TWCTF/TWCTF II) Needs `g_runes 2` in order to work.
* `droprune`: Tosses the rune that's been carried on. (Akin to TWCTF/TWCTF II) Needs `g_runes 2` in order to work.
* `ui_writemappools`: If the arena files are loaded, this command dumps the gamelists so they can be used by g_autonextmap (should be used to generate new gamelists for new versions).
* Classic UI:
* Slightly reorganized the Skirmish/Create Server menus in order to accomodate the newer gametype options.
Expand Down Expand Up @@ -96,8 +96,8 @@
* Missionpack/UI3 backend refactors.
* "You Have Been Mined" message outright displays the counter instead of delaying it.
* Team status bar fix and cg_drawTeamOverlay fix by EddieBrrrock.
* New command: tossrune. Drops the currently held rune.
* New cvar value: g_runes &2: Enables the "tossrune" command in the server. (By default, g_runes 1, the command is disabled).
* New command: droprune. Drops the currently held rune.
* New cvar value: g_runes &2: Enables the "droprune" command in the server. (By default, g_runes 1, the command is disabled).
* Reimplementation of shuffle, ported from Aftershock.
* Unified score limits across all modules. The default limits are now as follows:
* Free For All: 20 frags, 0 minutes.
Expand Down
11 changes: 11 additions & 0 deletions code/q3_ui/ui_controls2.c
Original file line number Diff line number Diff line change
Expand Up @@ -118,6 +118,7 @@ typedef struct
#define ID_VOIP_TALK 38
#define ID_ACCURACY 39
#define ID_WEAPBEST 40
#define ID_DROPRUNE 41

// all others
#define ID_FREELOOK 41
Expand Down Expand Up @@ -222,6 +223,7 @@ typedef struct
menuaction_s showacc;
menulist_s autoswitch;
menuaction_s useitem;
menuaction_s droprune;
playerInfo_t playerinfo;
qboolean changesmade;
menuaction_s chat;
Expand Down Expand Up @@ -306,6 +308,7 @@ static bind_t g_bindings[] =
{"+voiprecord", "voice chat", ID_VOIP_TALK, ANIM_CHAT, 'q', -1, -1, -1},
{"+acc", "show accuracy", ID_ACCURACY, ANIM_IDLE, -1, -1, -1, -1},
{"weapbest", "best weapon", ID_WEAPBEST, ANIM_IDLE, -1, -1, -1, -1},
{"droprune", "toss rune", ID_WEAPBEST, ANIM_IDLE, -1, -1, -1, -1},
{(char*)NULL, (char*)NULL, 0, 0, -1, -1, -1, -1},
};

Expand Down Expand Up @@ -380,6 +383,7 @@ static menucommon_s *g_misc_controls[] = {
(menucommon_s *)&s_controls.showscores,
(menucommon_s *)&s_controls.showacc,
(menucommon_s *)&s_controls.useitem,
(menucommon_s *)&s_controls.droprune,
(menucommon_s *)&s_controls.gesture,
(menucommon_s *)&s_controls.chat,
(menucommon_s *)&s_controls.chat2,
Expand Down Expand Up @@ -1528,6 +1532,12 @@ static void Controls_MenuInit( void )
s_controls.useitem.generic.ownerdraw = Controls_DrawKeyBinding;
s_controls.useitem.generic.id = ID_USEITEM;

s_controls.droprune.generic.type = MTYPE_ACTION;
s_controls.droprune.generic.flags = QMF_LEFT_JUSTIFY|QMF_PULSEIFFOCUS|QMF_GRAYED|QMF_HIDDEN;
s_controls.droprune.generic.callback = Controls_ActionEvent;
s_controls.droprune.generic.ownerdraw = Controls_DrawKeyBinding;
s_controls.droprune.generic.id = ID_DROPRUNE;

s_controls.showscores.generic.type = MTYPE_ACTION;
s_controls.showscores.generic.flags = QMF_LEFT_JUSTIFY|QMF_PULSEIFFOCUS|QMF_GRAYED|QMF_HIDDEN;
s_controls.showscores.generic.callback = Controls_ActionEvent;
Expand Down Expand Up @@ -1711,6 +1721,7 @@ static void Controls_MenuInit( void )
Menu_AddItem( &s_controls.menu, &s_controls.showscores );
Menu_AddItem( &s_controls.menu, &s_controls.showacc );
Menu_AddItem( &s_controls.menu, &s_controls.useitem );
Menu_AddItem( &s_controls.menu, &s_controls.droprune );
Menu_AddItem( &s_controls.menu, &s_controls.gesture );
Menu_AddItem( &s_controls.menu, &s_controls.chat );
Menu_AddItem( &s_controls.menu, &s_controls.chat2 );
Expand Down

0 comments on commit 957d320

Please sign in to comment.