mirror of
				https://github.com/KartKrewDev/RingRacers.git
				synced 2025-10-30 08:01:28 +00:00 
			
		
		
		
	Merge branch 'prison-tutorial-bump' into 'master'
Prison Egg tutorial bump exception See merge request KartKrew/Kart!2237
This commit is contained in:
		
						commit
						14f4983088
					
				
					 1 changed files with 19 additions and 8 deletions
				
			
		
							
								
								
									
										11
									
								
								src/k_kart.c
									
										
									
									
									
								
							
							
						
						
									
										11
									
								
								src/k_kart.c
									
										
									
									
									
								
							| 
						 | 
				
			
			@ -853,6 +853,17 @@ static boolean K_JustBumpedException(mobj_t *mobj)
 | 
			
		|||
			return Obj_SA2CrateIsMetal(mobj);
 | 
			
		||||
		case MT_WALLSPIKE:
 | 
			
		||||
			return true;
 | 
			
		||||
		case MT_BATTLECAPSULE:
 | 
			
		||||
		{
 | 
			
		||||
			if (gametype == GT_TUTORIAL // Remove gametype check whenever it's safe to break compatibility with ghosts in a post-release patch
 | 
			
		||||
			&& mobj->momx == 0
 | 
			
		||||
			&& mobj->momy == 0
 | 
			
		||||
			&& mobj->momz == 0)
 | 
			
		||||
			{
 | 
			
		||||
				return true;
 | 
			
		||||
			}
 | 
			
		||||
			break;
 | 
			
		||||
		}
 | 
			
		||||
		default:
 | 
			
		||||
			break;
 | 
			
		||||
	}
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Loading…
	
	Add table
		
		Reference in a new issue