Skip to content

fix infinite loop when moto part hits level from the bottom #30

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

Open
emgfc wants to merge 3 commits into
base: main
Choose a base branch
from
Open

fix infinite loop when moto part hits level from the bottom #30

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
89a21ae
fix infinite loop when moto part hits level from the bottom
emgfc Mar 22, 2024
aa428c2
fix identation
emgfc Mar 22, 2024
a4c9916
fix bad ground collision detection
emgfc Mar 26, 2024
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
88 changes: 44 additions & 44 deletions src/GamePhysics.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -508,63 +508,63 @@ int GamePhysics::method_39(int var1)
int var3 = 0;
int var4 = var1;

label77:
do {
while (var3 < var1) {
int var5;
while (var3 < var1) {
method_45(var4 - var3);
if (!var2 && method_38()) {
var5 = 3;
} else {
var5 = method_46(index10);
}

if (!var2 && field_68) {
if (var5 != 3) {
return 2;
}
method_45(var4 - var3);
if (!var2 && method_38()) {
var5 = 3;
} else {
var5 = method_46(index10);
}

return 1;
if (!var2 && field_68) {
if (var5 != 3) {
return 2;
}

if (var5 == 0) {
var4 = (var3 + var4) >> 1;
goto label77;
}
return 1;
}

if (var5 == 3) {
field_68 = true;
var4 = (var3 + var4) >> 1;
} else {
int var6;
if (var5 == 1) {
do {
method_47(index10);
if ((var6 = method_46(index10)) == 0) {
return 5;
}
} while (var6 != 2);
}
if (var5 == 0) {
var4 = (var3 + var4) >> 1;

var3 = var4;
var4 = var1;
index01 = index01 == 1 ? 0 : 1;
index10 = index10 == 1 ? 0 : 1;
if ((var4 - var3 < 0 ? -(var4 - var3) : var4 - var3) < 65) {
return 5;
}
}

if ((var5 = (int)((int64_t)(field_29[1]->motoComponents[index01]->xF16 - field_29[2]->motoComponents[index01]->xF16) * (int64_t)(field_29[1]->motoComponents[index01]->xF16 - field_29[2]->motoComponents[index01]->xF16) >> 16) + (int)((int64_t)(field_29[1]->motoComponents[index01]->yF16 - field_29[2]->motoComponents[index01]->yF16) * (int64_t)(field_29[1]->motoComponents[index01]->yF16 - field_29[2]->motoComponents[index01]->yF16) >> 16)) < 983040) {
field_35 = true;
continue;
}

if (var5 > 4587520) {
field_35 = true;
if (var5 == 3) {
field_68 = true;
var4 = (var3 + var4) >> 1;
} else {
int var6;
if (var5 == 1) {
do {
method_47(index10);
if ((var6 = method_46(index10)) == 0) {
return 5;
}
} while (var6 != 2);
}

var3 = var4;
var4 = var1;
index01 = index01 == 1 ? 0 : 1;
index10 = index10 == 1 ? 0 : 1;
}
}

return 0;
} while (((var4 = (var3 + var4) >> 1) - var3 < 0 ? -(var4 - var3) : var4 - var3) >= 65);
int wheelDist = (int)((int64_t)(field_29[1]->motoComponents[index01]->xF16 - field_29[2]->motoComponents[index01]->xF16) * (int64_t)(field_29[1]->motoComponents[index01]->xF16 - field_29[2]->motoComponents[index01]->xF16) >> 16) + (int)((int64_t)(field_29[1]->motoComponents[index01]->yF16 - field_29[2]->motoComponents[index01]->yF16) * (int64_t)(field_29[1]->motoComponents[index01]->yF16 - field_29[2]->motoComponents[index01]->yF16) >> 16);
if (wheelDist < 983040) {
field_35 = true;
}
if (wheelDist > 4587520) {
field_35 = true;
}

return 5;
return 0;
}

void GamePhysics::method_40(int var1)
Expand Down