Skip to content

Fix AI glitches #825

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

Merged
merged 1 commit into from
Dec 21, 2023
Merged

Fix AI glitches #825

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
4 changes: 4 additions & 0 deletions src/game/aimis.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1351,6 +1351,10 @@ void AIFuture(char plr, char mis, char pad, char *prog)
prog = fake_prog;
}

if (prog[1] < 0 || prog[1] > 5) {
prog[1] = prog[0];
}

const struct mStr plan = GetMissionPlan(mis);

for (i = 0; i < (plan.Jt + 1); i++) {
Expand Down
3 changes: 2 additions & 1 deletion src/game/aipur.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -618,7 +618,8 @@ void DumpAstro(char plr, int inx)

for (int i = 0; i < ASTRONAUT_CREW_MAX; i++) {
for (int j = 0; j < ASTRONAUT_FLT_CREW_MAX; j++) {
if (pData->Pool[pData->Crew[inx][i][j] - 1].Prime < 1) {
if (pData->Crew[inx][i][j] > 0
&& pData->Pool[pData->Crew[inx][i][j] - 1].Prime < 1) {
pData->Crew[inx][i][j] = 0;
pData->CrewCount[inx][i] = 0;
}
Expand Down
9 changes: 5 additions & 4 deletions src/game/start.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -585,10 +585,11 @@ AstroTurn(void)
if (prog > 0) {
temp = 0;

for (k = 0; k < Data->P[j].CrewCount[prog][crew]; k++) {
if (Data->P[j].Pool[
Data->P[j].Crew[prog][crew][k] - 1].Hero == 1) {
temp++;
if (crew > -1) {
for (k = 0; k < Data->P[j].CrewCount[prog][crew]; k++) {
if (Data->P[j].Pool[Data->P[j].Crew[prog][crew][k] - 1].Hero == 1) {
temp++;
}
}
}

Expand Down
10 changes: 6 additions & 4 deletions src/game/state_utils.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -284,8 +284,9 @@ void RemoveCrew(const char plr, struct MissionType &mission,
char prime = mission.PCrew - 1;

for (int i = 0; i < men; i++) {
Data->P[plr].Pool[
Data->P[plr].Crew[prog][prime][i] - 1].Prime = 0;
if (Data->P[plr].Crew[prog][prime][i] > 0) {
Data->P[plr].Pool[Data->P[plr].Crew[prog][prime][i] - 1].Prime = 0;
}
}

mission.PCrew = 0;
Expand All @@ -296,8 +297,9 @@ void RemoveCrew(const char plr, struct MissionType &mission,
char backup = mission.BCrew - 1;

for (int i = 0; i < men; i++) {
Data->P[plr].Pool[
Data->P[plr].Crew[prog][backup][i] - 1].Prime = 0;
if (Data->P[plr].Crew[prog][backup][i] > 0) {
Data->P[plr].Pool[Data->P[plr].Crew[prog][backup][i] - 1].Prime = 0;
}
}

mission.BCrew = 0;
Expand Down