mirror of
				https://github.com/KartKrewDev/RingRacers.git
				synced 2025-10-30 08:01:28 +00:00 
			
		
		
		
	Merge branch 'nospinmovecut' into 'next'
Don't cut momentum if landing in a roll See merge request STJr/SRB2!972
This commit is contained in:
		
						commit
						31bdf38f89
					
				
					 1 changed files with 2 additions and 2 deletions
				
			
		| 
						 | 
				
			
			@ -2981,6 +2981,8 @@ static void P_PlayerZMovement(mobj_t *mo)
 | 
			
		|||
 | 
			
		||||
			mo->eflags |= MFE_JUSTHITFLOOR; // Spin Attack
 | 
			
		||||
 | 
			
		||||
			clipmomz = P_PlayerHitFloor(mo->player, true);
 | 
			
		||||
 | 
			
		||||
			if (!P_PlayerPolyObjectZMovement(mo))
 | 
			
		||||
			{
 | 
			
		||||
				// Cut momentum in half when you hit the ground and
 | 
			
		||||
| 
						 | 
				
			
			@ -2992,8 +2994,6 @@ static void P_PlayerZMovement(mobj_t *mo)
 | 
			
		|||
				}
 | 
			
		||||
			}
 | 
			
		||||
 | 
			
		||||
			clipmomz = P_PlayerHitFloor(mo->player, true);
 | 
			
		||||
 | 
			
		||||
			if (!(mo->player->pflags & PF_SPINNING) && mo->player->powers[pw_carry] != CR_NIGHTSMODE)
 | 
			
		||||
				mo->player->pflags &= ~PF_STARTDASH;
 | 
			
		||||
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Loading…
	
	Add table
		
		Reference in a new issue