mirror of
				https://github.com/KartKrewDev/RingRacers.git
				synced 2025-10-30 08:01:28 +00:00 
			
		
		
		
	Merge branch 'fix-eggmark-burst' into 'master'
Fix eggmark bail occuring when last roulette was eggmark Closes ring-racers#379 and ring-racers#384 See merge request kart-krew-dev/ring-racers-internal!2968
This commit is contained in:
		
						commit
						121ac80b43
					
				
					 1 changed files with 1 additions and 1 deletions
				
			
		|  | @ -11043,7 +11043,7 @@ void K_KartPlayerThink(player_t *player, ticcmd_t *cmd) | ||||||
| 		mobj_t *bail = P_SpawnMobj(player->mo->x, player->mo->y, player->mo->z + player->mo->height/2, MT_BAIL); | 		mobj_t *bail = P_SpawnMobj(player->mo->x, player->mo->y, player->mo->z + player->mo->height/2, MT_BAIL); | ||||||
| 		P_SetTarget(&bail->target, player->mo); | 		P_SetTarget(&bail->target, player->mo); | ||||||
| 
 | 
 | ||||||
| 		if (player->itemRoulette.eggman || player->eggmanexplode) | 		if ((player->itemRoulette.active && player->itemRoulette.eggman) || player->eggmanexplode > 0) | ||||||
| 		{ | 		{ | ||||||
| 			player->markedfordeath = true; | 			player->markedfordeath = true; | ||||||
| 			player->eggmanexplode = 1; | 			player->eggmanexplode = 1; | ||||||
|  |  | ||||||
		Loading…
	
	Add table
		
		Reference in a new issue
	
	 Oni VelocitOni
						Oni VelocitOni