From a912bdeeef9d1e889a47fba1a87a86e151f1fb1d Mon Sep 17 00:00:00 2001 From: past-due <30942300+past-due@users.noreply.github.com> Date: Tue, 23 Jul 2024 15:16:33 -0400 Subject: [PATCH] startResearch: Always use the queues --- src/hci/research.cpp | 24 +++--------------------- 1 file changed, 3 insertions(+), 21 deletions(-) diff --git a/src/hci/research.cpp b/src/hci/research.cpp index b7954cc6873..783c2266e42 100644 --- a/src/hci/research.cpp +++ b/src/hci/research.cpp @@ -159,27 +159,9 @@ void ResearchController::startResearch(RESEARCH &research) cancelResearch(psLab); //Clear it out of this lab as we are now researching it in another. } - if (bMultiMessages) - { - // Say that we want to do research [sic]. - sendResearchStatus(facility, research.ref - STAT_RESEARCH, selectedPlayer, true); - setStatusPendingStart(*psResFacilty, &research); // Tell UI that we are going to research. - } - else - { - //set up the player_research - auto count = research.ref - STAT_RESEARCH; - //meant to still be in the list but greyed out - auto pPlayerRes = &asPlayerResList[selectedPlayer][count]; - - //set the subject up - psResFacilty->psSubject = &research; - - sendResearchStatus(facility, count, selectedPlayer, true); // inform others, I'm researching this. - - MakeResearchStarted(pPlayerRes); - psResFacilty->timeStartHold = 0; - } + // Say that we want to do research [sic]. + sendResearchStatus(facility, research.ref - STAT_RESEARCH, selectedPlayer, true); + setStatusPendingStart(*psResFacilty, &research); // Tell UI that we are going to research. //stop the button from flashing once a topic has been chosen stopReticuleButtonFlash(IDRET_RESEARCH);