Skip to content

Commit b8e8f46

Browse files
committed
Remove joker lap-related itempolicy stuff
1 parent 31a436f commit b8e8f46

3 files changed

Lines changed: 1 addition & 23 deletions

File tree

data/gui/dialogs/online/item_policy_dialog.stkgui

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -208,17 +208,6 @@
208208
<label word_wrap="true" id="forbid-nitro-label" proportion="3" text="Forbid nitro?" text_align="left" />
209209
<checkbox id="forbid-nitro-checkbox" proportion="1" />
210210
</div>
211-
212-
<div width="100%" height="fit" layout="horizontal-row">
213-
<label word_wrap="true" id="joker-laps-override-label" proportion="9" text="Joker laps override" text_align="left" />
214-
<checkbox id="joker-laps-override-checkbox" proportion="1" />
215-
</div>
216-
217-
<div width="100%" height="fit" layout="horizontal-row">
218-
<label word_wrap="true" id="joker-laps-min-max-label" proportion="3" text="Joker laps min/max (WIP USELESS)" text_align="left" />
219-
<spinner id="joker-laps-min-spinner" proportion="3" wrap_around="false" />
220-
<spinner id="joker-laps-max-spinner" proportion="3" wrap_around="false" />
221-
</div>
222211
</div>
223212

224213

src/race/item_policy.hpp

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -78,8 +78,7 @@ enum ItemPolicyRules {
7878
// The "virtual pace car" procedure will let all karts fully unlap.
7979
IPT_UNLAPPING = 1 << 11,
8080

81-
// Joker laps (min and mass passes of all volumes) will be overridden from default lap-multiplied integer.
82-
IPT_JOKER_OVERRIDE = 1 << 12,
81+
IPT_UNUSED = 1 << 12,
8382

8483
// Bonus boxes will instead have their powerup pool draw from the item policy section's current one, rather than the one in powerup.xml.
8584
IPT_BONUS_BOX_OVERRIDE = 1 << 13,

src/states_screens/dialogs/item_policy_dialog.cpp

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -328,7 +328,6 @@ void ItemPolicyDialog::computePolicyFromGUI() {
328328
SETRULE(CHECKBOX("forbid-bananas")->getState(), IPT_FORBID_BANANA);
329329
SETRULE(CHECKBOX("forbid-gifts")->getState(), IPT_FORBID_BONUSBOX);
330330
SETRULE(CHECKBOX("forbid-nitro")->getState(), IPT_FORBID_NITRO);
331-
SETRULE(CHECKBOX("joker-laps-override")->getState(), IPT_JOKER_OVERRIDE);
332331

333332
READ_TEXTBOX_FLOAT(cs->m_virtual_pace_gaps, "pace-car-intervals");
334333

@@ -438,8 +437,6 @@ void ItemPolicyDialog::setGUIFromPolicy(){
438437
SET_CHECKBOX_RULE("forbid-bananas", IPT_FORBID_BANANA);
439438
SET_CHECKBOX_RULE("forbid-gifts", IPT_FORBID_BONUSBOX);
440439
SET_CHECKBOX_RULE("forbid-nitro", IPT_FORBID_NITRO);
441-
SET_CHECKBOX_RULE("joker-laps-override", IPT_JOKER_OVERRIDE);
442-
//TODO: joker laps override min and max spinners are useless rn
443440

444441
SET_TEXTBOX_FLOAT(cs->m_virtual_pace_gaps, "pace-car-intervals");
445442

@@ -545,13 +542,6 @@ void ItemPolicyDialog::setVisibilityOfRulesTab(bool visible) {
545542

546543
LABEL("forbid-nitro")->setVisible(visible);
547544
CHECKBOX("forbid-nitro")->setVisible(visible);
548-
549-
LABEL("joker-laps-override")->setVisible(visible);
550-
CHECKBOX("joker-laps-override")->setVisible(visible);
551-
552-
LABEL("joker-laps-min-max")->setVisible(visible);
553-
SPINNER("joker-laps-min")->setVisible(visible);
554-
SPINNER("joker-laps-max")->setVisible(visible);
555545
}
556546

557547
void ItemPolicyDialog::setVisibilityOfFuelAndTyresTab(bool visible) {

0 commit comments

Comments
 (0)