Skip to content

Fix macOS clang build errors #349

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
DCurrent merged 1 commit into from
Jun 23, 2026
Merged

Fix macOS clang build errors #349

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
18 changes: 8 additions & 10 deletions engine/openbor.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31662,7 +31662,7 @@ e_animations do_grab_attack_finish(entity *ent, int which)
}

// Could not find a valid finisher. Return none.
return ATK_NONE;
return ANI_NONE;
}

void common_grab_check()
Expand Down Expand Up @@ -49066,8 +49066,6 @@ void safe_set(int *arr, int index, int newkey, int oldkey)

void keyboard_setup(int player)
{
const int btnnum = MAX_BTN_NUM;

int quit = 0;
int sdid = 0;
int selector = 0;
Expand All @@ -49086,13 +49084,13 @@ void keyboard_setup(int player)
char* command;
char* filename = "translation/menu.txt";

char buttonnames[btnnum][32];
char buttonnames[MAX_BTN_NUM][32];

size_t size;
ArgList arglist;

char argbuf[MAX_ARG_LEN + 1] = "";
int OPTIONS_NUM = btnnum + 3;
int OPTIONS_NUM = MAX_BTN_NUM + 3;

screen_status |= IN_SCREEN_BUTTON_CONFIG_MENU;

Expand Down Expand Up @@ -49186,13 +49184,13 @@ void keyboard_setup(int player)

finish:

while(disabledkey[selector]) if(++selector > btnnum - 1) break;
while(disabledkey[selector]) if(++selector > MAX_BTN_NUM - 1) break;

while(!quit)
{
voffset = -6;
_menutextm(2, -8, 0, Tr("Player %i"), player + 1);
for(i = 0; i < btnnum; i++)
for(i = 0; i < MAX_BTN_NUM; i++)
{
if(!disabledkey[i])
{
Expand Down Expand Up @@ -49253,14 +49251,14 @@ void keyboard_setup(int player)
break;
}
}
while(selector < btnnum && disabledkey[selector]);
while(selector < MAX_BTN_NUM && disabledkey[selector]);
sound_play_sample(global_sample_list.beep, 0, savedata.effectvol, savedata.effectvol, 100);
}
if(bothnewkeys & FLAG_MOVEDOWN)
{
do
{
if(++selector > btnnum - 1) break;
if(++selector > MAX_BTN_NUM - 1) break;
}
while(disabledkey[selector]);
sound_play_sample(global_sample_list.beep, 0, savedata.effectvol, savedata.effectvol, 100);
Expand All @@ -49272,7 +49270,7 @@ void keyboard_setup(int player)
if(selector > OPTIONS_NUM)
{
selector = 0;
while(disabledkey[selector]) if(++selector > btnnum - 1) break;
while(disabledkey[selector]) if(++selector > MAX_BTN_NUM - 1) break;
}

if(bothnewkeys & (FLAG_MOVELEFT | FLAG_MOVERIGHT | FLAG_ANYBUTTON))
Expand Down
20 changes: 20 additions & 0 deletions engine/version.tmp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
/*
* OpenBOR - http://www.ChronoCrash.com
* -----------------------------------------------------------------------
* All rights reserved, see LICENSE in OpenBOR root for details.
*
* Copyright (c) OpenBOR Team
*/

#ifndef VERSION_H
#define VERSION_H

#define VERSION_NAME "OpenBOR"
#define VERSION_MAJOR "4"
#define VERSION_MINOR "0"
#define VERSION_BUILD "7810"
#define VERSION_BUILD_INT 7810
#define VERSION_COMMIT "37ff20b"
#define VERSION "v"VERSION_MAJOR"."VERSION_MINOR" Build "VERSION_BUILD" (commit hash: "VERSION_COMMIT")"

#endif
Loading