Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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: 8 additions & 0 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,14 @@ jobs:
- name: Prepare
run: cp -R /orig .

# Build and link non-matching files to verify lack of errors
- name: Build non-matching
run: |
python configure.py --non-matching \
--version ${{ matrix.version }} \
--binutils /binutils --compilers /compilers
ninja

# Build the project
- name: Build
run: |
Expand Down
1 change: 1 addition & 0 deletions configure.py
Original file line number Diff line number Diff line change
Expand Up @@ -187,6 +187,7 @@
"-enum int",
"-fp hardware",
"-Cpp_exceptions off",
"-W err",
# "-W all",
"-O4,p",
"-inline auto",
Expand Down
11 changes: 11 additions & 0 deletions src/SB/Core/gc/iTRC.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,17 @@
namespace ResetButton
{
bool mResetEnabled = 1;
void (*mSndKill)();
}

namespace iTRCDisk
{
void (*mSndSuspend)();
void (*mSndResume)();
void (*mPadStopRumbling)();
void (*mSndKill)();
void (*mMovieSuspendFunction)();
void (*mMovieResumeFunction)();
}

bool ROMFont::Init()
Expand Down
14 changes: 7 additions & 7 deletions src/SB/Core/gc/iTRC.h
Original file line number Diff line number Diff line change
Expand Up @@ -29,12 +29,12 @@ namespace ROMFont
namespace iTRCDisk
{
char mMessage[];
void (*mPadStopRumbling)();
void (*mSndSuspend)();
void (*mSndResume)();
void (*mSndKill)();
void (*mMovieSuspendFunction)();
void (*mMovieResumeFunction)();
extern void (*mSndSuspend)();
extern void (*mSndResume)();
extern void (*mPadStopRumbling)();
extern void (*mSndKill)();
extern void (*mMovieSuspendFunction)();
extern void (*mMovieResumeFunction)();

void SetPadStopRumblingFunction(void (*)(void));
void SetSndSuspendFunction(void (*)(void));
Expand All @@ -53,7 +53,7 @@ namespace iTRCDisk

namespace ResetButton
{
void (*mSndKill)();
extern void (*mSndKill)();

void EnableReset();
void DisableReset();
Expand Down
13 changes: 8 additions & 5 deletions src/SB/Core/x/xBehaveMgr.h
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,14 @@ struct xBehaveMgr : RyzMemData
xPsyche* psypool;
st_XORDEREDARRAY psylist;

xBehaveMgr();
~xBehaveMgr();
xBehaveMgr()
{
}

~xBehaveMgr()
{
}

void Startup(S32, S32);
void RegBuiltIn();
xPsyche* Subscribe(xBase* owner, S32 i);
Expand All @@ -22,9 +28,6 @@ struct xBehaveMgr : RyzMemData
void SceneFinish();
void SceneReset();
xFactory* GetFactory();

void* operator new(size_t amt, U32, RyzMemGrow*);
void operator delete(void*, U16);
};

void xBehaveMgr_ScenePrepare();
Expand Down
1 change: 1 addition & 0 deletions src/SB/Game/zPlatform.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -467,6 +467,7 @@ U32 zMechIsStartingBack(zPlatform* ent, U16 param_2)

static F32 SolvePaddleMotion(zPlatform* plat, F32* time, F32 tmr)
{
return 0.0f;
}

void zPlatform_PaddleStartRotate(xEnt* entplat, S32 direction, S32 stutter)
Expand Down