Vectorize MsgItems by Kestrellius · Pull Request #7687 · scp-fs2open/fs2open.github.com

Kestrellius · 2026-08-06T11:35:35Z

Convert MsgItems from an array to a vector, and remove the associated limit value and counter.

MsgItems is dynamically rewritten at runtime, and previously used a counter value of -1 to indicate that the array was in a state suitable for rewriting in some circumstances. To replicate this behavior, MsgItems is now actually an std::optional<SCP_vector<mmode_item>>, and its nullopt state corresponds to -1.

Goober5000

This will need some rework. I sent a message on Discord

Kestrellius · 2026-08-07T01:56:33Z

There is an existing behavior where if you input a "comms menu move up" command in the same frame as opening the comms menu, you end up with a Selected_menu_item of -2, and the selection pointer isn't visible. You have to hit "move down" twice in order to get it to appear at the first entry, or "move up" once and it'll wrap around. At present this behavior is replicated faithfully in this branch, but alternatively I could fix this bug(?) by just early-returning out of the selection-movement commands if Rebuild_MsgItems is true. (Or if MsgItems.size() is 0?)

wookieejedi · 2026-08-07T01:58:52Z

I vote fixing the bug would be good, though you may also want to look at #7688. Possibly they could all be combined into one PR here?

Goober5000 · 2026-08-07T04:12:01Z

I'd recommend, instead, fixing the bug in #7688 and keeping this PR focused on the vectorization. Then this PR can be rebased on 7688, after merge, and inherit or accommodate the fix.

wookieejedi · 2026-08-07T11:48:27Z

Ah yeah good point! Though I think merging this one first might work better, and then I can fully test all the cleanup and fixes in 7688 once this is merged :)

wookieejedi · 2026-08-08T14:25:59Z

@Goober5000 is this one good to merge now or is more review needed? Note, once this is merged I'll address various other fixes in 7688

Goober5000 · 2026-08-08T17:38:30Z

@Goober5000 is this one good to merge now or is more review needed? Note, once this is merged I'll address various other fixes in 7688

No, there are several things that need to be addressed, but I haven't had time to respond. Will try to follow up ASAP.

wookieejedi · 2026-08-10T18:54:54Z

Thanks, sounds good!

Goober5000

It will be necessary to handle config mode, because MsgItems is only valid during a mission. So, in hudsquadmsg.cpp:

Remove the active = -1 assignment, and enclosing if(), in HudGaugeSquadMessage::render
Then, 22 lines later, add this before the if() and change the if() to use item_visible:

bool item_visible = config
    ? !(Hide_main_rearm_items_in_comms_gauge && (i == TYPE_REPAIR_REARM_ITEM || i == TYPE_REPAIR_REARM_ABORT_ITEM))
    : (MsgItems[First_menu_item + i].active >= 0);

Goober5000

Additional comments. With these changes, every ternary MsgItems ? sz2i(MsgItems.size()) : -1 can become just sz2i(MsgItems.size()).

Goober5000 · 2026-08-14T00:39:01Z

 		renderString(x + Header_offsets[0], y + fl2i(Header_offsets[1] * scale), title, scale, config);
 	}

+	int msg_items_size = !Rebuild_MsgItems ? sz2i(MsgItems.size()) : -1;


This is still a ternary; it can directly use the size now

Goober5000 · 2026-08-14T00:40:05Z

 void hud_squadmsg_page_down()
 {
-	if ( (First_menu_item + MAX_MENU_DISPLAY) < Num_menu_items ) {
+	if ( !Rebuild_MsgItems && (First_menu_item + MAX_MENU_DISPLAY) < sz2i(MsgItems.size()) ) {


The Rebuild_MsgItems check is no longer needed here

Goober5000 · 2026-08-14T00:40:42Z

 	"Number of comm orders in the mission. 0 if comm menu is closed")
 {
-	return ade_set_args(L, "i", Num_menu_items);
+	return ade_set_args(L, "i", (!Rebuild_MsgItems ? sz2i(MsgItems.size()) : -1));


This still uses the ternary

Goober5000 · 2026-08-14T00:41:47Z

-
-	return ade_set_args(L, "s", MsgItems[current].text.c_str());
+	SCP_string message = "Invalid comm item!";
+	if (!Rebuild_MsgItems && sz2i(MsgItems.size()) > current) {


Rebuild_MsgItems is no longer needed, and you can use in_bounds here

Goober5000 · 2026-08-14T00:42:23Z

 	}

-	if (MsgItems[current].active > 0) {
+	if (!Rebuild_MsgItems && sz2i(MsgItems.size()) > current && MsgItems[current].active > 0) {


Goober5000 · 2026-08-14T00:44:39Z

 	idx--;

-	if ((idx < 0) || idx >= MAX_MENU_ITEMS)
+	if ((idx < 0))


double parentheses here

Goober5000 · 2026-08-14T00:45:24Z

+	SCP_string message = "Invalid comm item!";
+	if (!Rebuild_MsgItems && sz2i(MsgItems.size()) > current) {
+		message = MsgItems[current].text;
+	};


stray semicolon

Goober5000 · 2026-08-14T00:46:32Z

-
-		Num_menu_items++;
-
+		}	


this has a trailing tab

Goober5000 · 2026-08-14T00:56:23Z

-		}
-		MsgItems[i].active = 1;						// assume active
+			MsgItems.push_back({0, 1, lua_cat_list[i - NUM_COMM_ORDER_TYPES]}); // assume active
+		}				


extra whitespace here

Goober5000 · 2026-08-14T01:31:35Z


 //Fuctions that allow selection of specific comms menu items with simple up/down/select buttons
-void hud_squadmsg_selection_move_down() {
+void hud_squadmsg_selection_move( bool up ) {


This function has a bug and a few infelicities, but it turns out you can replace the whole thing with this:

void hud_squadmsg_selection_move( bool up ) { if (Rebuild_MsgItems || MsgItems.empty()) return; //Check if comms menu is up if (Player->flags & PLAYER_FLAGS_MSG_MODE) { Display_selector = true; //play scrolling sound and reset the comms window timeout timer, so the window doesn't disappear while we select our item gamesnd_play_iface(InterfaceSounds::SCROLL); Msg_mode_timestamp = _timestamp(DEFAULT_MSG_TIMEOUT); //The selection moves +/-1 through the whole menu, wrapping around at either end. //First_menu_item and Selected_menu_item are just the page and the offset within the page. int num_items = sz2i(MsgItems.size()); int selected_index = First_menu_item + Selected_menu_item; selected_index = (selected_index + (up ? -1 : 1) + num_items) % num_items; First_menu_item = (selected_index / MAX_MENU_DISPLAY) * MAX_MENU_DISPLAY; Selected_menu_item = selected_index % MAX_MENU_DISPLAY; } }

Kestrellius added 3 commits August 6, 2026 04:30

vectorize msgitems

d9f028a

appeasement

0d2db6b

leave me alone clang

9d38ac2

wookieejedi added cleanup A modification or rewrite of code to make it more understandable or easier to maintain. fix A fix for bugs, not-a-bugs, and/or regressions. HUD A feature or issue related to the HUD labels Aug 6, 2026

wookieejedi added this to the Release 26.0.1 milestone Aug 6, 2026

Goober5000 requested changes Aug 6, 2026

View reviewed changes

Kestrellius added 2 commits August 6, 2026 18:52

remove optional

a1086d4

cleanup

75ec4e0

Goober5000 requested changes Aug 13, 2026

View reviewed changes

Comment thread code/hud/hudsquadmsg.cpp

Comment thread code/hud/hudsquadmsg.cpp

Comment thread code/hud/hudsquadmsg.h Outdated

Comment thread code/hud/hudsquadmsg.cpp Outdated

Kestrellius added 3 commits August 12, 2026 22:50

changes requested

b4c8f6b

clang

65f078b

clang what is WRONG with you

4275492

Goober5000 requested changes Aug 14, 2026

View reviewed changes

Uh oh!

Conversation

Kestrellius commented Aug 6, 2026

Uh oh!

Goober5000 left a comment • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Kestrellius commented Aug 7, 2026

Uh oh!

wookieejedi commented Aug 7, 2026

Uh oh!

Goober5000 commented Aug 7, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

wookieejedi commented Aug 7, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

wookieejedi commented Aug 8, 2026

Uh oh!

Goober5000 commented Aug 8, 2026

Uh oh!

wookieejedi commented Aug 10, 2026

Uh oh!

Goober5000 left a comment

Choose a reason for hiding this comment

Uh oh!

Goober5000 left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

Goober5000 left a comment •

edited

Loading

Goober5000 commented Aug 7, 2026 •

edited

Loading

wookieejedi commented Aug 7, 2026 •

edited

Loading