Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Take team_pooled_research into account when looping over research #1636

Merged
merged 1 commit into from
Dec 27, 2022
Merged

Take team_pooled_research into account when looping over research #1636

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 14 additions & 2 deletions common/research.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,6 +119,18 @@ struct research *research_get(const struct player *pplayer)
}
}

/**
* Checks whether the research object is valid in the current game.
*/
bool research_is_valid(const struct research &presearch)
{
if (game.info.team_pooled_research) {
return research_is_valid(presearch);
} else {
return player_by_number(research_number(&presearch)) != nullptr;
}
}

/**
Returns the name of the research owner: a player name or a team name.
*/
Expand Down Expand Up @@ -653,7 +665,7 @@ bool research_invention_reachable(const struct research *presearch,
return presearch->inventions[tech].reachable;
} else {
for (const auto &research_iter : research_array) {
if (team_by_number(research_number(&research_iter)) != nullptr) {
if (research_is_valid(research_iter)) {
if (research_iter.inventions[tech].reachable) {
return true;
}
Expand Down Expand Up @@ -682,7 +694,7 @@ bool research_invention_gettable(const struct research *presearch,
: presearch->inventions[tech].state == TECH_PREREQS_KNOWN);
} else {
for (const auto &research_iter : research_array) {
if (team_by_number(research_number(&research_iter)) != nullptr) {
if (research_is_valid(research_iter)) {
if (allow_holes ? research_iter.inventions[tech].root_reqs_known
: research_iter.inventions[tech].state
== TECH_PREREQS_KNOWN) {
Expand Down
1 change: 1 addition & 0 deletions common/research.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,6 +107,7 @@ int research_pretty_name(const struct research *presearch, char *buf,

struct research *research_by_number(int number);
struct research *research_get(const struct player *pplayer);
bool research_is_valid(const struct research &presearch);

QString research_advance_rule_name(const struct research *presearch,
Tech_type_id tech);
Expand Down
2 changes: 1 addition & 1 deletion server/sanitycheck.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -673,7 +673,7 @@ static void check_researches(const char *file, const char *function,
int line)
{
for (const auto &presearch : research_array) {
if (team_by_number(research_number(&presearch)) != nullptr) {
if (research_is_valid(presearch)) {
SANITY_CHECK(S_S_RUNNING != server_state()
|| A_UNSET == presearch.researching
|| is_future_tech(presearch.researching)
Expand Down
6 changes: 3 additions & 3 deletions server/savegame/savegame2.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4782,7 +4782,7 @@ static void sg_load_researches(struct loaddata *loading)

// Initialize all researches.
for (auto &pinitres : research_array) {
if (team_by_number(research_number(&pinitres)) != nullptr) {
if (research_is_valid(pinitres)) {
init_tech(&pinitres, false);
}
};
Expand Down Expand Up @@ -4849,7 +4849,7 @@ static void sg_load_researches(struct loaddata *loading)
/* In case of tech_leakage, we can update research only after all the
* researches have been loaded */
for (auto &pupres : research_array) {
if (team_by_number(research_number(&pupres)) != nullptr) {
if (research_is_valid(pupres)) {
research_update(&pupres);
}
};
Expand Down Expand Up @@ -5125,7 +5125,7 @@ static void sg_load_sanitycheck(struct loaddata *loading)

// Check researching technologies and goals.
for (auto &presearch : research_array) {
if (team_by_number(research_number(&presearch)) != nullptr) {
if (research_is_valid(presearch)) {
if (presearch.researching != A_UNSET
&& !is_future_tech(presearch.researching)
&& (valid_advance_by_number(presearch.researching) == nullptr
Expand Down
8 changes: 4 additions & 4 deletions server/savegame/savegame3.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7045,7 +7045,7 @@ static void sg_load_researches(struct loaddata *loading)

// Initialize all researches.
for (auto &pinitres : research_array) {
if (team_by_number(research_number(&pinitres)) != nullptr) {
if (research_is_valid(pinitres)) {
init_tech(&pinitres, false);
}
};
Expand Down Expand Up @@ -7125,7 +7125,7 @@ static void sg_load_researches(struct loaddata *loading)
/* In case of tech_leakage, we can update research only after all the
* researches have been loaded */
for (auto &pupres : research_array) {
if (team_by_number(research_number(&pupres)) != nullptr) {
if (research_is_valid(pupres)) {
research_update(&pupres);
}
};
Expand All @@ -7146,7 +7146,7 @@ static void sg_save_researches(struct savedata *saving)

if (saving->save_players) {
for (const auto &presearch : research_array) {
if (team_by_number(research_number(&presearch)) != nullptr) {
if (research_is_valid(presearch)) {
secfile_insert_int(saving->file, research_number(&presearch),
"research.r%d.number", i);
technology_save(saving->file, "research.r%d.goal", i,
Expand Down Expand Up @@ -7559,7 +7559,7 @@ static void sg_load_sanitycheck(struct loaddata *loading)

// Check researching technologies and goals.
for (auto &presearch : research_array) {
if (team_by_number(research_number(&presearch)) != nullptr) {
if (research_is_valid(presearch)) {
if (presearch.researching != A_UNSET
&& !is_future_tech(presearch.researching)
&& (valid_advance_by_number(presearch.researching) == nullptr
Expand Down
6 changes: 3 additions & 3 deletions server/srv_main.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -619,7 +619,7 @@ void send_all_info(struct conn_list *dest)
// Resend player info because it could have more infos (e.g. embassy).
send_player_all_c(nullptr, dest);
for (const auto &presearch : research_array) {
if (team_by_number(research_number(&presearch)) != nullptr) {
if (research_is_valid(presearch)) {
send_research_info(&presearch, dest);
}
};
Expand Down Expand Up @@ -1752,7 +1752,7 @@ void end_turn()

log_debug("Sendresearchinfo");
for (const auto &presearch : research_array) {
if (team_by_number(research_number(&presearch)) != nullptr) {
if (research_is_valid(presearch)) {
send_research_info(&presearch, nullptr);
}
};
Expand Down Expand Up @@ -3048,7 +3048,7 @@ void srv_ready()
/* Give initial technologies, as specified in the ruleset and the
* settings. */
for (auto &presearch : research_array) {
if (team_by_number(research_number(&presearch)) != nullptr) {
if (research_is_valid(presearch)) {
init_tech(&presearch, true);
give_initial_techs(&presearch, game.info.tech);
}
Expand Down
2 changes: 1 addition & 1 deletion server/techtools.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -170,7 +170,7 @@ void do_tech_parasite_effect(struct player *pplayer)

num_teams = 0;
for (const auto &other_research : research_array) {
if (team_by_number(research_number(&other_research)) != nullptr) {
if (research_is_valid(other_research)) {
if (TECH_KNOWN == research_invention_state(&other_research, i)) {
if (mod <= ++num_teams) {
if (0 == fc_rand(++num_techs)) {
Expand Down