mirror of
				https://github.com/coop-deluxe/sm64coopdx.git
				synced 2025-10-30 08:01:01 +00:00 
			
		
		
		
	fixed interaction flags when a mod doesn't specify an interaction type
This commit is contained in:
		
							parent
							
								
									34e20e763d
								
							
						
					
					
						commit
						c7df4eb071
					
				
					 1 changed files with 1 additions and 2 deletions
				
			
		| 
						 | 
				
			
			@ -166,8 +166,7 @@ u32 determine_interaction(struct MarioState *m, struct Object *o) {
 | 
			
		|||
 | 
			
		||||
    if ((interaction == 0 || interaction & INT_LUA) && action & ACT_FLAG_ATTACKING) {
 | 
			
		||||
        u32 flags = (MARIO_PUNCHING | MARIO_KICKING | MARIO_TRIPPING);
 | 
			
		||||
        if ((action == ACT_PUNCHING || action == ACT_MOVE_PUNCHING || action == ACT_JUMP_KICK) ||
 | 
			
		||||
            ((m->flags & flags) && (interaction & INT_LUA))) {
 | 
			
		||||
        if (m->flags & flags) {
 | 
			
		||||
            s16 dYawToObject = mario_obj_angle_to_object(m, o) - m->faceAngle[1];
 | 
			
		||||
 | 
			
		||||
            if (m->flags & MARIO_PUNCHING) {
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Loading…
	
	Add table
		
		Reference in a new issue