fixup: quick detonate

fgsfdsfgs · Oct 22, 2023 · 2edf7b8 · 2edf7b8
1 parent 6957c15
commit 2edf7b8
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 15 deletions.
diff --git a/src/game/bondmove.c b/src/game/bondmove.c
@@ -694,6 +694,7 @@ void bmoveProcessInput(bool allowc1x, bool allowc1y, bool allowc1buttons, bool i
 	u32 stack;
 	f32 increment2;
 	f32 newverta;
+	cancycleweapons = true;
 #ifndef PLATFORM_N64
 	const bool allowmlook = (g_Vars.currentplayernum == 0) && (allowc1x || allowc1y);
 	bool allowmcross = false;
@@ -1734,8 +1735,8 @@ void bmoveProcessInput(bool allowc1x, bool allowc1y, bool allowc1buttons, bool i
 						g_Vars.currentplayer->usedowntime = -2;
 					}
 #else
-					if ((((c1buttons & BUTTON_RADIAL) && (c1buttonsthisframe & BUTTON_CANCEL_USE))
-							|| ((c1buttons & BUTTON_CANCEL_USE) && (c1buttonsthisframe & BUTTON_RADIAL)))
+					if ((((c1buttons & (BUTTON_CANCEL_USE | BUTTON_ACCEPT_USE)) && (c1buttonsthisframe & (BUTTON_WPNBACK | BUTTON_RADIAL)))
+							|| ((c1buttons & (BUTTON_WPNBACK | BUTTON_RADIAL)) && (c1buttonsthisframe & (BUTTON_CANCEL_USE | BUTTON_ACCEPT_USE))))
 							&& weaponnum == WEAPON_REMOTEMINE) {
 						movedata.detonating = true;
 						movedata.weaponbackoffset = 0;
@@ -1744,17 +1745,6 @@ void bmoveProcessInput(bool allowc1x, bool allowc1y, bool allowc1buttons, bool i
 						amClose();
 						g_Vars.currentplayer->invdowntime = -2;
 						g_Vars.currentplayer->usedowntime = -2;
-						g_Vars.currentplayer->amdowntime = 0;
-					}
-					if ((((c1buttons & BUTTON_WPNBACK) && (c1buttonsthisframe & BUTTON_CANCEL_USE))
-							|| ((c1buttons & BUTTON_CANCEL_USE) && (c1buttonsthisframe & BUTTON_WPNBACK)))
-							&& weaponnum == WEAPON_REMOTEMINE) {
-						movedata.detonating = true;
-						movedata.weaponbackoffset = 0;
-						movedata.weaponforwardoffset = 0;
-						movedata.btapcount = 0;
-						g_Vars.currentplayer->invdowntime = -2;
-						g_Vars.currentplayer->usedowntime = -2;
 					}
 #endif
 				}
@@ -2099,8 +2089,6 @@ void bmoveProcessInput(bool allowc1x, bool allowc1y, bool allowc1buttons, bool i
 		playerActivateRemoteMineDetonator(g_Vars.currentplayernum);
 	}
 
-	cancycleweapons = true;
-
 	if (g_Vars.tickmode == TICKMODE_CUTSCENE) {
 		cancycleweapons = false;
 	}

diff --git a/src/include/game/bondmove.h b/src/include/game/bondmove.h
@@ -21,6 +21,7 @@ void bmoveGrabProp(struct prop *prop);
 void bmoveSetMode(u32 movemode);
 void bmoveSetModeForAllPlayers(u32 movemode);
 void bmoveHandleActivate(void);
+static void bgunProcessInputAltButton(struct movedata *data, s8 contpad, s32 i);
 void bmoveApplyMoveData(struct movedata *data);
 void bmoveUpdateSpeedTheta(void);
 f32 bmoveGetSpeedVertaLimit(f32 value);