Ports/perfect_dark
1
0 Fork 1
mirror of https://github.com/perfect-dark-pc-port/perfect_dark.git synced 2026-10-23 15:52:41 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix some typoed function names

Browse Source
This commit is contained in:
Ryan Dwyer committed 2022-12-02 07:58:14 +10:00
1 parent 901028d5a3
commit b39c317812
4 files changed
+9 -9
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/game/bg.c
+5 -5
View File
@@ -2733,7 +2733,7 @@ bool func0f15d08c(struct coord *a, struct coord *b)
return true;
}
bool g_PortalGetScreenBbox(s32 portalnum, struct screenbox *box)
bool portalGetScreenBbox(s32 portalnum, struct screenbox *box)
{
s32 i;
s32 j;
@@ -6562,7 +6562,7 @@ struct bgcmd *bgExecuteCommandsBranch(struct bgcmd *cmd, bool execute)
case BGCMD_SETRESULT_IFPORTALINFOV:
if (execute) {
if (!PORTAL_IS_CLOSED(cmd[1].param)) {
if (g_PortalGetScreenBbox(cmd[1].param, &g_PortalScreenBbox) == 0) {
if (portalGetScreenBbox(cmd[1].param, &g_PortalScreenBbox) == 0) {
g_BgCmdResult = BGRESULT_FALSE;
} else if (boxGetIntersection(&var800a65c0, &g_PortalScreenBbox) == 0) {
g_BgCmdResult = BGRESULT_FALSE;
@@ -6578,7 +6578,7 @@ struct bgcmd *bgExecuteCommandsBranch(struct bgcmd *cmd, bool execute)
struct screenbox portalbox;
if (!PORTAL_IS_CLOSED(cmd[1].param)) {
if (g_PortalGetScreenBbox(cmd[1].param, &portalbox) && boxGetIntersection(&var800a65c0, &portalbox)) {
if (portalGetScreenBbox(cmd[1].param, &portalbox) && boxGetIntersection(&var800a65c0, &portalbox)) {
if (g_BgCmdResult != BGRESULT_TRUE) {
boxCopy(&var800a65c0, &portalbox);
g_BgCmdResult = BGRESULT_TRUE;
@@ -6597,7 +6597,7 @@ struct bgcmd *bgExecuteCommandsBranch(struct bgcmd *cmd, bool execute)
if (PORTAL_IS_CLOSED(cmd[1].param)) {
g_BgCmdResult = BGRESULT_FALSE;
} else if (g_PortalGetScreenBbox(cmd[1].param, &portalbox) == 0) {
} else if (portalGetScreenBbox(cmd[1].param, &portalbox) == 0) {
g_BgCmdResult = BGRESULT_FALSE;
} else if (boxGetIntersection(&portalbox, (struct screenbox *)&g_Vars.currentplayer->screenxminf) == 0) {
g_BgCmdResult = BGRESULT_FALSE;
@@ -7042,7 +7042,7 @@ void func0f163528(struct var800a4d00 *arg0)
box2.ymax = arg0->screenbox.ymax;
unk02 = true;
} else {
unk02 = g_PortalGetScreenBbox(portalnum, &box2);
unk02 = portalGetScreenBbox(portalnum, &box2);
}
if (unk02) {
src/game/challenge.c
+2 -2
View File
@@ -64,7 +64,7 @@ bool challengeIsAvailable(s32 challengeindex)
return (g_MpChallenges[challengeindex].availability & 1) != 0;
}
bool ChallengeIsAvailableToPlayer(s32 chrnum, s32 challengeindex)
bool challengeIsAvailableToPlayer(s32 chrnum, s32 challengeindex)
{
if ((g_MpSetup.chrslots & (1 << chrnum)) == 0) {
return 0;
@@ -198,7 +198,7 @@ void challengeDetermineUnlockedFeatures(void)
for (challengeindex = 0; challengeindex < 30; challengeindex++) {
for (prev = 0; prev < 4; prev++) {
if (ChallengeIsAvailableToPlayer(prev, challengeindex)) {
if (challengeIsAvailableToPlayer(prev, challengeindex)) {
for (i = 0; i < 16; i++) {
if (g_MpChallenges[challengeindex].unlockfeatures[i] == j) {
flag |= 2 << prev;
src/include/game/bg.h
+1 -1
View File
@@ -40,7 +40,7 @@ Gfx *currentPlayerScissorWithinViewport(Gfx *gdl, s32 viewleft, s32 viewtop, s32
void func0f15cd28(void);
bool func0f15cd90(u32 room, struct screenbox *arg1);
bool func0f15d08c(struct coord *a, struct coord *b);
bool g_PortalGetScreenBbox(s32 portal, struct screenbox *arg1);
bool portalGetScreenBbox(s32 portal, struct screenbox *arg1);
Gfx *boxRenderBorder(Gfx *gdl, s32 x1, s32 y1, s32 x2, s32 y2);
bool boxGetIntersection(struct screenbox *a, struct screenbox *b);
void boxExpand(struct screenbox *a, struct screenbox *b);
src/include/game/challenge.h
+1 -1
View File
@@ -25,7 +25,7 @@ char *challengeGetConfigDescription(struct mpconfigfull *mpconfig);
bool challengeIsCompleteForEndscreen(void);
bool aiMpInitSimulants(void);
void vmPrintStatsIfEnabled(void);
bool ChallengeIsAvailableToPlayer(s32 chrnum, s32 challengeindex);
bool challengeIsAvailableToPlayer(s32 chrnum, s32 challengeindex);
bool challengeIsAvailableToAnyPlayer(s32 challengeindex);
s32 challengeGetNumAvailable(void);
char *challengeGetName(s32 challengeindex);