Skip to content

Commit

Permalink
UI Update - Disabled "No Intro" in specific games
Browse files Browse the repository at this point in the history
Disabled in Doom Engines and Doom64EX because it is not used
  • Loading branch information
Doommarine23 committed Jan 14, 2020
1 parent 91de750 commit 194f32c
Show file tree
Hide file tree
Showing 2 changed files with 18 additions and 5 deletions.
14 changes: 10 additions & 4 deletions rocketlauncher2.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -482,7 +482,7 @@ void RocketLauncher2::on_engine_check()
default:
ui->pushButton_3->setText("Play Doom!");

//Enable IWAD and Patch Wad Boxes
//Enable IWAD and Patch Wad Boxes, and Map File Name
ui->IWAD_label->setHidden(false);
ui->listbox_IWADs->setHidden(false);
ui->button_mapfilename->setDisabled(false);
Expand All @@ -498,18 +498,21 @@ void RocketLauncher2::on_engine_check()
ui->combo_skill->setDisabled(false);
ui->label_skill->setDisabled(false);
ui->input_map->setDisabled(false);
ui->check_nointro->setDisabled(true);
break;

case Engine_Doom64EX:
ui->pushButton_3->setText("Play Doom64 EX!");

// Disable IWAD and Patch Wad Boxes
// Disable IWADs, Map File Name, and No Intro
ui->IWAD_label->setHidden(true);
ui->listbox_IWADs->setHidden(true);
ui->button_addiwad->setHidden(true);
ui->button_deliwad->setHidden(true);

ui->button_mapfilename->setDisabled(false);
ui->button_mapfilename->setDisabled(true);
ui->check_nointro->setDisabled(true);


//Enable Skill, Patch Wad, Monsters, and Demo Recording Buttons, also enable map selection
ui->combo_skill->setDisabled(false);
Expand All @@ -520,12 +523,14 @@ void RocketLauncher2::on_engine_check()
ui->combo_skill->setDisabled(false);
ui->label_skill->setDisabled(false);
ui->input_map->setDisabled(false);

break;

case Engine_Turok1:
ui->pushButton_3->setText("Play Turok: Dinosaur Hunter!");

ui->input_map->setDisabled(false);
ui->check_nointro->setDisabled(false);
ui->button_mapfilename->setDisabled(false);
//Hide IWAD and Patch Wad Boxes
ui->IWAD_label->setHidden(true);
Expand Down Expand Up @@ -553,6 +558,7 @@ void RocketLauncher2::on_engine_check()

//Hide IWAD and Patch Wad Boxes
ui->IWAD_label->setHidden(true);
ui->check_nointro->setDisabled(false);
ui->listbox_IWADs->setHidden(true);

ui->button_addiwad->setHidden(true);
Expand Down Expand Up @@ -791,7 +797,7 @@ void RocketLauncher2::on_button_helpmap_clicked()
QMessageBox::information(this, "Map/Warp", "Turok 2 does NOT support launching with a map, thus this is disabled.");
break;
case Engine_Doom64EX:
QMessageBox::information(this, "Map/Warp", "Use map numbers like oldschool Doom engines, e.g. '1'. Nonexistant maps will cause a game crash.");
QMessageBox::information(this, "Map/Warp", "Use map numbers e.g. '1'. Nonexistant maps will cause a game crash.");

}

Expand Down
9 changes: 8 additions & 1 deletion rocketlauncher2.ui
Original file line number Diff line number Diff line change
Expand Up @@ -991,7 +991,14 @@ background-color:#7b7b7c;
<item row="7" column="0">
<widget class="QCheckBox" name="check_nointro">
<property name="styleSheet">
<string notr="true">color:#c6c6cc;</string>
<string notr="true">QCheckBox{
color:#c6c6cc;
}

QCheckBox::indicator:disabled
{
background-color:#7b7b7c;
}</string>
</property>
<property name="text">
<string>Skip Intro Movies</string>
Expand Down

0 comments on commit 194f32c

Please sign in to comment.