Skip to content

Commit

Permalink
startResearch: Always use the queues
Browse files Browse the repository at this point in the history
  • Loading branch information
past-due committed Jul 28, 2024
1 parent f877e88 commit bd1a68e
Showing 1 changed file with 3 additions and 21 deletions.
24 changes: 3 additions & 21 deletions src/hci/research.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down

0 comments on commit bd1a68e

Please sign in to comment.