Updating Game Menu and Options gumps to use

wench · wench · commit d55a8a7f9ded · 2024-07-03T20:15:21.000+10:00
procedural background drawing. Removing unneeded shapes from exult.flx Also updating Gumps so they call paint on their direct parent class and do not directly call Gump::Paint
diff --git a/Makefile.common b/Makefile.common
@@ -298,11 +298,6 @@ EXULT_FLX_OBJECTS := \
 	data/sav_upup.shp \
 	data/sav_slider.shp \
 	data/sav_selected.shp \
-	data/gameplayoptions.shp \
-	data/gamemenu.shp \
-	data/audiooptions.shp \
-	data/videooptions.shp \
-	data/miscoptions.shp \
 	data/hp_bar.shp \
 	data/sfx_icon.shp \
 	data/mtgm.mid \
@@ -322,7 +317,8 @@ EXULT_FLX_OBJECTS := \
 	data/exultmsg_es.txt \
 	data/exultmsg_fr.txt \
 	data/endfont.shp \
-	data/transparentmenu.shp
+	data/transparentmenu.shp \
+	data\checkmark_background.shp
 
 EXULT_BG_FLX := data/exult_bg.flx data/exult_bg_flx.h
 EXULT_BG_FLX_OBJECTS := \
diff --git a/data/Makefile.am b/data/Makefile.am
@@ -20,11 +20,6 @@ EXULT_FLX_OBJECTS = \
 	sav_upup.shp		\
 	sav_slider.shp		\
 	sav_selected.shp	\
-	gameplayoptions.shp	\
-	gamemenu.shp		\
-	audiooptions.shp	\
-	videooptions.shp	\
-	miscoptions.shp		\
 	hp_bar.shp		\
 	sfx_icon.shp		\
 	mtgm.mid			\
@@ -47,6 +42,7 @@ EXULT_FLX_OBJECTS = \
 	endfont.shp \
 	scroll_left.shp \
 	scroll_right.shp \
+	checkmark_background.shp \
 	mixer.shp
 
 EXULT_BG_FLX_OBJECTS = \
diff --git a/data/audiooptions.shp b/data/audiooptions.shp
diff --git a/data/flx.in b/data/flx.in
@@ -17,10 +17,6 @@ sav_up.shp
 sav_upup.shp
 sav_slider.shp
 sav_selected.shp
-gameplayoptions.shp
-gamemenu.shp
-audiooptions.shp
-videooptions.shp
 hp_bar.shp
 sfx_icon.shp
 notebook.shp
@@ -38,7 +34,6 @@ sb_maps.shp
 sb_notebook.shp
 sb_backpack.shp
 transparentmenu.shp
-miscoptions.shp
 exultmsg.txt
 exultmsg_de.txt
 exultmsg_es.txt
diff --git a/data/gamemenu.shp b/data/gamemenu.shp
diff --git a/data/gameplayoptions.shp b/data/gameplayoptions.shp
diff --git a/data/miscoptions.shp b/data/miscoptions.shp
diff --git a/data/videooptions.shp b/data/videooptions.shp
diff --git a/gumps/AudioOptions_gump.cc b/gumps/AudioOptions_gump.cc
@@ -454,8 +454,9 @@ void AudioOptions_gump::load_settings() {
 }
 
 AudioOptions_gump::AudioOptions_gump()
-		: Modal_gump(nullptr, EXULT_FLX_AUDIOOPTIONS_SHP, SF_EXULT_FLX) {
-	set_object_area(TileRect(0, 0, 0, 0), 8, 187);    //++++++ ???
+		: Modal_gump(nullptr, -1) {
+	SetProceduralBackground(TileRect(29, 2, 166, 186), -1);
+
 	const Exult_Game  game  = Game::get_game_type();
 	const std::string title = Game::get_gametitle();
 	have_config_pack        = Audio::have_config_sfx(title, &configpack);
diff --git a/gumps/File_gump.cc b/gumps/File_gump.cc
@@ -488,7 +488,7 @@ int File_gump::toggle_option(Gump_button* btn    // Button that was clicked.
  */
 
 void File_gump::paint() {
-	Gump::paint();    // Paint background
+	Modal_gump::paint();    // Paint background
 	// Paint text objects.
 	for (auto& name : names) {
 		if (name) {
diff --git a/gumps/GameDisplayOptions_gump.cc b/gumps/GameDisplayOptions_gump.cc
@@ -172,8 +172,8 @@ void GameDisplayOptions_gump::load_settings() {
 }
 
 GameDisplayOptions_gump::GameDisplayOptions_gump()
-		: Modal_gump(nullptr, EXULT_FLX_GAMEPLAYOPTIONS_SHP, SF_EXULT_FLX) {
-	set_object_area(TileRect(0, 0, 0, 0), 8, 162);    //++++++ ???
+		: Modal_gump(nullptr, -1) {
+	SetProceduralBackground(TileRect(29, 2, 226, 156), -1);
 
 	for (auto& btn : buttons) {
 		btn.reset();
@@ -252,7 +252,7 @@ void GameDisplayOptions_gump::save_settings() {
 }
 
 void GameDisplayOptions_gump::paint() {
-	Gump::paint();
+	Modal_gump::paint();
 	for (auto& btn : buttons) {
 		if (btn) {
 			btn->paint();
diff --git a/gumps/GameEngineOptions_gump.cc b/gumps/GameEngineOptions_gump.cc
@@ -179,8 +179,9 @@ void GameEngineOptions_gump::load_settings() {
 }
 
 GameEngineOptions_gump::GameEngineOptions_gump()
-		: Modal_gump(nullptr, EXULT_FLX_GAMEPLAYOPTIONS_SHP, SF_EXULT_FLX) {
-	set_object_area(TileRect(0, 0, 0, 0), 8, 162);    //++++++ ???
+		: Modal_gump(nullptr, -1) {
+	SetProceduralBackground(TileRect(29, 2, 224, 156), -1);
+
 
 	load_settings();
 	build_buttons();
@@ -234,7 +235,7 @@ void GameEngineOptions_gump::save_settings() {
 }
 
 void GameEngineOptions_gump::paint() {
-	Gump::paint();
+	Modal_gump::paint();
 	for (auto& btn : buttons) {
 		if (btn) {
 			btn->paint();
diff --git a/gumps/Gamemenu_gump.cc b/gumps/Gamemenu_gump.cc
@@ -61,8 +61,8 @@ static const char*                  quittext     = "Quit";
 using Gamemenu_button = CallbackTextButton<Gamemenu_gump>;
 
 Gamemenu_gump::Gamemenu_gump()
-		: Modal_gump(nullptr, EXULT_FLX_GAMEMENU_SHP, SF_EXULT_FLX) {
-	set_object_area(TileRect(0, 0, 0, 0), 8, 95);
+		: Modal_gump(nullptr, -1) {
+	SetProceduralBackground(TileRect(29, 2, 112, 91), -1);
 
 	int y = 0;
 	if (!gwin->is_in_exult_menu()) {
@@ -152,7 +152,7 @@ void Gamemenu_gump::input_options() {
 }
 
 void Gamemenu_gump::paint() {
-	Gump::paint();
+	Modal_gump::paint();
 	for (auto& btn : buttons) {
 		if (btn) {
 			btn->paint();
diff --git a/gumps/InputOptions_gump.cc b/gumps/InputOptions_gump.cc
@@ -141,9 +141,8 @@ void InputOptions_gump::load_settings() {
 	touch_pathfind   = gwin->get_touch_pathfind();
 }
 
-InputOptions_gump::InputOptions_gump()
-		: Modal_gump(nullptr, EXULT_FLX_GAMEPLAYOPTIONS_SHP, SF_EXULT_FLX) {
-	set_object_area(TileRect(0, 0, 0, 0), 8, 162);    //++++++ ???
+InputOptions_gump::InputOptions_gump() : Modal_gump(nullptr, -1) {
+	SetProceduralBackground(TileRect(29, 2, 224, 156), -1);
 
 	load_settings();
 	build_buttons();
@@ -206,7 +205,7 @@ void InputOptions_gump::save_settings() {
 }
 
 void InputOptions_gump::paint() {
-	Gump::paint();
+	Modal_gump::paint();
 	for (auto& btn : buttons) {
 		if (btn) {
 			btn->paint();
diff --git a/gumps/ItemMenu_gump.cc b/gumps/ItemMenu_gump.cc
@@ -156,7 +156,7 @@ void Itemmenu_gump::paint() {
 	if (objectSelected) {
 		objectSelected->paint_outline(PROTECT_PIXEL);
 	}
-	Gump::paint();
+	Modal_gump::paint();
 	for (auto& btn : buttons) {
 		btn->paint();
 	}
diff --git a/gumps/Modal_gump.cc b/gumps/Modal_gump.cc
@@ -153,7 +153,7 @@ void Modal_gump::SetDragType(DragType newtype) {
 }
 
 void Modal_gump::SetProceduralBackground(
-		TileRect backsize, int Checkbg_paletteramp) {
+		TileRect backsize, int Checkbg_paletteramp, bool centre_gump_on_screen) {
 	checkmark_background
 			= ShapeID(EXULT_FLX_CHECKMARK_BACKGROUND_SHP, 0, SF_EXULT_FLX);
 
@@ -213,6 +213,10 @@ void Modal_gump::SetProceduralBackground(
 	}
 	// Set colours
 	procedural_colours = ProceduralColours();
+
+	if (centre_gump_on_screen) {
+		set_pos();
+	}
 }
 
 void Modal_gump::paint() {
diff --git a/gumps/Modal_gump.h b/gumps/Modal_gump.h
@@ -121,7 +121,8 @@ class Modal_gump : public Gump {
 	//! Set ths gump to have a procedurally drawn background
 	//! \param backrect The inner rectangle for the gumps background
 	//! \param Checkbg_paletteramp Colour ramp to use for the checkmark
-	//!  button background. if -1 use default green
+	//!  button background. if -1 use default green that is the same as 11
+	//! \param centre_gump_on_screen automatically centre the gump on screen when done
 	//! \remarks This will reset procedural_colours to default 
 	//! and create the checkmark button if it doesn't aready exist
 	//! This will not supress rendeing of a background shape. 
@@ -132,7 +133,8 @@ class Modal_gump : public Gump {
 	void SetProceduralBackground(
 			TileRect backrect,
 			int    Checkbg_paletteramp
-			= -1);
+			= -1,
+		bool centre_gump_on_screen = true);
 
 public:
 	void paint() override;
diff --git a/gumps/Newfile_gump.cc b/gumps/Newfile_gump.cc
@@ -373,7 +373,7 @@ void Newfile_gump::paint() {
 	if (!games) {
 		return;    // No list, so skip out.
 	}
-	Gump::paint();
+	Modal_gump::paint();
 
 	// Paint text objects.
 	int i;
diff --git a/gumps/Spellbook_gump.cc b/gumps/Spellbook_gump.cc
@@ -459,7 +459,7 @@ void Spellbook_gump::paint() {
 	const int numx = 1;
 	const int numy = -4;    // Where to draw numbers on spells,
 	//   with numx being the right edge.
-	Gump::paint();     // Paint outside & checkmark.
+	Spelltype_gump::paint();     // Paint outside & checkmark.
 	if (page > 0) {    // Not the first?
 		paint_button(leftpage);
 	}
@@ -685,7 +685,7 @@ void Spellscroll_gump::paint_button(Gump_button* btn) {
  */
 
 void Spellscroll_gump::paint() {
-	Gump::paint();    // Paint outside & checkmark.
+	Spelltype_gump::paint();    // Paint outside & checkmark.
 	if (spell) {
 		paint_button(spell);
 	}
diff --git a/gumps/VideoOptions_gump.cc b/gumps/VideoOptions_gump.cc
@@ -330,11 +330,10 @@ void VideoOptions_gump::load_settings(bool Fullscreen) {
 	o_highdpi         = highdpi;
 }
 
-VideoOptions_gump::VideoOptions_gump()
-		: Modal_gump(nullptr, EXULT_FLX_VIDEOOPTIONS_SHP, SF_EXULT_FLX),
+VideoOptions_gump::VideoOptions_gump() : Modal_gump(nullptr, -1), 
 		  startup_fill_mode(static_cast<Image_window::FillMode>(0)) {
+	SetProceduralBackground(TileRect(29, 2, 166, 166), -1);
 	video_options_gump = this;
-	set_object_area(TileRect(0, 0, 0, 0), 8, 170);
 
 	const std::vector<std::string> enabledtext = {"Disabled", "Enabled"};
 
