feat: setting for subscreen widgets to hide during message strings

Author: EmilyV99

scripts/changelog_overrides/generic_changes.md

@@ -10,3 +10,4 @@ subject dabe7c091b89fa2e09217dfb63c652184b78f65e feat(vscode): create VS Code ex
 subject 6ecf0775afeac108bb4f806b76f9c1835c0a98d1 feat(vscode): update vscode extension keywords
 subject d82a0d8458b3029283385db04f1d935fd0dbce48 misc: add 'std_zh' scope to changelog generation
 subject f7228536ad55c2fb4bb20d00bba8b8c06d7e67c2 feat(std_zh): add 'GetLevelSwitchState()'/'SetLevelSwitchState()' helper functions
+drop 165b42156443f963f41ce0f5a68638010ff7c137

src/dialog/subscr_props.cpp

@@ -383,6 +383,15 @@ std::shared_ptr<GUI::Widget> SubscrPropDialog::view()
 							{
 								SETFLAG(local_subref->posflags,sspSCROLLING,state);
 							}
+						),
+						INFOBTN("Hide if a message string is showing."),
+						Checkbox(
+							text = "Hide for String", hAlign = 0.0,
+							checked = local_subref->posflags & sspNOMSGSTR,
+							onToggleFunc = [=](bool state)
+							{
+								SETFLAG(local_subref->posflags,sspNOMSGSTR,state);
+							}
 						)
 					),
 					g1 = Rows<2>()

src/dialog/subscr_settings.cpp

@@ -111,17 +111,7 @@ std::shared_ptr<GUI::Widget> SubscrSettingsDialog::view()
 		}
 		case sstOVERLAY:
 		{
-			tabs["Basic"] = Rows<2>(
-				INFOBTN("Hides the overlay while a message string is being displayed"),
-				Checkbox(
-					text = "Hide for Message String",
-					checked = local_subref.flags & SUBFLAG_OVR_HIDEFORSTR,
-					onToggleFunc = [&](bool state)
-					{
-						SETFLAG(local_subref.flags,SUBFLAG_OVR_HIDEFORSTR,state);
-					}
-				)
-			);
+			tabs["Basic"] = Label(text = "No settings for overlay subscreens yet!");
 			break;
 		}
 	}

src/new_subscr.cpp

@@ -20,6 +20,7 @@
 #ifdef IS_PLAYER
 extern int32_t directItem;
 extern sprite_list Lwpns;
+extern bool msg_onscreen;
 void verifyBothWeapons();
 bool zq_ignore_item_ownership = true, zq_view_fullctr = false, zq_view_maxctr = false,
 	zq_view_noinf = false, zq_view_allinf = false;
@@ -838,7 +839,7 @@ SubscrWidget::SubscrWidget(subscreen_object const& old) : SubscrWidget()
 bool SubscrWidget::load_old(subscreen_object const& old)
 {
 	type = old.type;
-	posflags = old.pos;
+	posflags = old.pos&0x7;
 	x = old.x;
 	y = old.y;
 	w = old.w;
@@ -889,6 +890,10 @@ void SubscrWidget::draw(BITMAP* dest, int32_t xofs, int32_t yofs, SubscrPage& pa
 }
 bool SubscrWidget::visible(byte pos, bool showtime) const
 {
+	#ifdef IS_PLAYER
+	if(msg_onscreen && (posflags&sspNOMSGSTR))
+		return false;
+	#endif
 	return posflags&pos;
 }
 SubscrWidget* SubscrWidget::clone() const
@@ -901,11 +906,9 @@ bool SubscrWidget::copy_prop(SubscrWidget const* src, bool all)
 		return false;
 	flags = src->flags;
 	genflags = src->genflags;
-	posflags &= ~(sspUP|sspDOWN|sspSCROLLING);
-	posflags |= src->posflags&(sspUP|sspDOWN|sspSCROLLING);
+	posflags = src->posflags;
 	if(all)
 	{
-		posflags = src->posflags;
 		x = src->x;
 		y = src->y;
 		w = src->w;

src/new_subscr.h

@@ -210,6 +210,12 @@ enum //PGGOTO modes
 	PGGOTO_TRG
 };
 
+//when to display an element
+#define sspUP                         0x01
+#define sspDOWN                       0x02
+#define sspSCROLLING                  0x04
+#define sspNOMSGSTR                   0x08
+
 #define SUBSCRFLAG_SELECTABLE         0x00000001
 #define SUBSCRFLAG_PGGOTO_NOWRAP      0x00000002
 
@@ -950,8 +956,6 @@ struct SubscrPage
 	friend struct ZCSubscreen;
 };
 #define SUBFLAG_ACT_NOPAGEWRAP   0x00000001
-
-#define SUBFLAG_OVR_HIDEFORSTR   0x00000001
 struct ZCSubscreen
 {
 	std::vector<SubscrPage> pages;

src/subscr.h

@@ -45,11 +45,6 @@ enum { ssdtOLD, ssdtNEWSUBSCR, ssdtREV2, ssdtBSZELDA, ssdtBSZELDAMODIFIED, ssdtB
 
 enum { sssFULLPUSH, sssFULLSLIDEDOWN, sssMAX };
 
-//when to display an element
-#define sspUP 1
-#define sspDOWN 2
-#define sspSCROLLING 4
-
 struct sso_struct
 {
     char *s;

src/zc/zc_subscr.cpp

@@ -550,12 +550,9 @@ void put_passive_subscr(BITMAP *dest,int32_t x,int32_t y,bool showtime,int32_t p
 	destroy_bitmap(subscr);
 	if(new_subscreen_overlay)
 	{
-		if(!(msg_onscreen && (new_subscreen_overlay->flags&SUBFLAG_OVR_HIDEFORSTR)))
-		{
-			subscr = create_sub_bitmap(dest,x,0,256,224);
-			show_custom_subscreen(subscr, new_subscreen_overlay, 0, 0, showtime, pos2);
-			destroy_bitmap(subscr);
-		}
+		subscr = create_sub_bitmap(dest,x,0,256,224);
+		show_custom_subscreen(subscr, new_subscreen_overlay, 0, 0, showtime, pos2);
+		destroy_bitmap(subscr);
 	}
 }