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

Jump to bottom

Fix GCC 13 compiler errors #316

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Fix GCC 13 compiler errors #316

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e3bdff0
Fix comparison always evaluate as true error
j8r May 13, 2024
7a09aac
Fix conflicting types due to enum/integer mismatch error
j8r May 13, 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
8 changes: 4 additions & 4 deletions engine/openbor.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29376,9 +29376,9 @@ void display_ents()
{
s_anim *anim = e->animation;

if ( anim->platform[e->animpos] )
if ( anim->platform[e->animpos][PLATFORM_HEIGHT] )
{
if ( anim->platform[e->animpos][PLATFORM_HEIGHT] ) eplatheight += anim->platform[e->animpos][PLATFORM_HEIGHT];
eplatheight += anim->platform[e->animpos][PLATFORM_HEIGHT];
}
}
if ( e->modeldata.size.y && eplatheight <= 0 ) eheight += e->modeldata.size.y;
Expand Down Expand Up @@ -29982,7 +29982,7 @@ int player_test_touch(entity *ent, entity *item)
return test_item(ent, item);
}

entity *find_ent_here(entity *exclude, float x, float z, e_entity_type types, int (*test)(entity *, entity *))
entity *find_ent_here(entity *exclude, float x, float z, int types, int (*test)(entity *, entity *))
{
int i;
for(i = 0; i < ent_max; i++)
Expand Down Expand Up @@ -30265,7 +30265,7 @@ int set_riseattack(entity *iRiseattack, int type, int reset)
return 1;
}

int set_blockpain(entity *ent, e_attack_types attack_type, int reset)
int set_blockpain(entity *ent, int attack_type, int reset)
{
e_animations animation;

Expand Down