popux/perfect_dark
1
0 Fork 0
forked from Ports/perfect_dark
Code Pull Requests Activity

fix: grabbable

Browse Source
This commit is contained in:
Catherine Reprobate committed 2023-08-26 17:16:41 -07:00
1 parent df8c1139a1
commit 8ec0feb49b
4 files changed
+15 -28
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/game/bondbike.c
+1 -1
View File
@@ -192,7 +192,7 @@ void bbikeHandleActivate(void)
bmoveSetMode(MOVEMODE_WALK);
}
// g_Vars.currentplayer->bondactivateorreload = 0;
g_Vars.currentplayer->bondactivateorreload = 0;
}
}
src/game/bondgrab.c
+2 -2
View File
@@ -891,9 +891,9 @@ void bgrabUpdateVertical(void)
void bgrabHandleActivate(void)
{
if (currentPlayerTryMountHoverbike(g_Vars.currentplayer->grabbedprop)) {
// g_Vars.currentplayer->bondactivateorreload = 0;
g_Vars.currentplayer->bondactivateorreload = 0;
} else {
// g_Vars.currentplayer->bondactivateorreload = 0;
g_Vars.currentplayer->bondactivateorreload = 0;
bmoveSetMode(MOVEMODE_WALK);
}
}
src/game/bondmove.c
+11 -24
View File
@@ -1328,21 +1328,21 @@ void bmoveProcessInput(bool allowc1x, bool allowc1y, bool allowc1buttons, bool i
}
}
#ifdef PLATFORM_N64
// Handle B button
if (allowc1buttons) {
for (i = 0; i < numsamples; i++) {
if (joyGetButtonsOnSample(i, contpad1, c1allowedbuttons & B_BUTTON)) {
if (joyGetButtonsOnSample(i, contpad1, c1allowedbuttons & (B_BUTTON | BUTTON_CANCEL_USE | BUTTON_ACCEPT_USE))) {
if (g_Vars.currentplayer->usedowntime >= -1) {
if (joyGetButtonsPressedOnSample(i, contpad1, shootbuttons & c1allowedbuttons)
&& g_Vars.currentplayer->usedowntime >= 0
&& bgunConsiderToggleGunFunction(g_Vars.currentplayer->usedowntime, true, false, 0) != USETIMER_CONTINUE) {
g_Vars.currentplayer->usedowntime = -3;
}
// if (joyGetButtonsPressedOnSample(i, contpad1, shootbuttons & c1allowedbuttons)
// && g_Vars.currentplayer->usedowntime >= 0
// && bgunConsiderToggleGunFunction(g_Vars.currentplayer->usedowntime, true, false, 0) != USETIMER_CONTINUE) {
// g_Vars.currentplayer->usedowntime = -3;
// }
if (g_Vars.currentplayer->usedowntime >= 0) {
if (g_Vars.currentplayer->usedowntime > TICKS(25)) {
s32 result = bgunConsiderToggleGunFunction(g_Vars.currentplayer->usedowntime, false, false, 0);
// s32 result = bgunConsiderToggleGunFunction(g_Vars.currentplayer->usedowntime, false, false, 0);
s32 result = USETIMER_CONTINUE;
if (result == USETIMER_STOP) {
g_Vars.currentplayer->usedowntime = -1;
@@ -1356,9 +1356,9 @@ void bmoveProcessInput(bool allowc1x, bool allowc1y, bool allowc1buttons, bool i
}
}
} else {
if (g_Vars.currentplayer->usedowntime >= -2) {
bgunConsiderToggleGunFunction(g_Vars.currentplayer->usedowntime, false, false, 0);
}
// if (g_Vars.currentplayer->usedowntime >= -2) {
// bgunConsiderToggleGunFunction(g_Vars.currentplayer->usedowntime, false, false, 0);
// }
}
} else {
// Released B
@@ -1371,23 +1371,10 @@ void bmoveProcessInput(bool allowc1x, bool allowc1y, bool allowc1buttons, bool i
}
}
}
#endif
#ifndef PLATFORM_N64
if (allowc1buttons) {
// handle B / A: cancel_use
for (i = 0; i < numsamples; i++) {
if (joyGetButtonsOnSample(i, contpad1, c1allowedbuttons & (BUTTON_CANCEL_USE | BUTTON_ACCEPT_USE))) {
g_Vars.currentplayer->usedowntime++;
} else {
if (g_Vars.currentplayer->usedowntime > 0) {
movedata.btapcount++;
g_Vars.currentplayer->usedowntime = 0;
}
}
}
// handle L button : alt switching
for (i = 0; i< numsamples; i++) {
if (joyGetButtonsOnSample(i, contpad1, c1allowedbuttons & BUTTON_ALTMODE)) {
src/game/bondwalk.c
+1 -1
View File
@@ -1280,7 +1280,7 @@ void bwalkUpdatePrevPos(void)
void bwalkHandleActivate(void)
{
if (g_Vars.currentplayer->walkinitmove) {
// g_Vars.currentplayer->bondactivateorreload = 0;
g_Vars.currentplayer->bondactivateorreload = 0;
}
}