trunk/src/mame/drivers/raiden2.c
| r32254 | r32255 | |
|---|
| 478 | 478 | for(int i=0; i<3; i++) { |
| 479 | 479 | int min[2], max[2]; |
| 480 | 480 | for(int j=0; j<2; j++) { |
| 481 | | min[j] = cop_collision_info[j].pos[i]; |
| 482 | | if(cop_collision_info[j].allow_swap && (cop_collision_info[j].flags_swap & (1 << i))) |
| 483 | | min[j] -= cop_collision_info[j].dx[i]; |
| 484 | | else |
| 485 | | min[j] += cop_collision_info[j].dx[i]; |
| 486 | | max[j] = min[j] + cop_collision_info[j].size[i]; |
| 481 | if(cop_collision_info[j].allow_swap && (cop_collision_info[j].flags_swap & (1 << i))) { |
| 482 | max[j] = cop_collision_info[j].pos[i] - cop_collision_info[j].dx[i]; |
| 483 | min[j] = max[j] - cop_collision_info[j].size[i]; |
| 484 | } else { |
| 485 | min[j] = cop_collision_info[j].pos[i] + cop_collision_info[j].dx[i]; |
| 486 | max[j] = min[j] + cop_collision_info[j].size[i]; |
| 487 | } |
| 487 | 488 | } |
| 488 | | if(max[0] >= min[1] && min[0] <= max[1]) |
| 489 | if(max[0] > min[1] && min[0] < max[1]) |
| 489 | 490 | cop_hit_status &= ~(1 << i); |
| 490 | 491 | cop_hit_val[i] = cop_collision_info[0].pos[i] - cop_collision_info[1].pos[i]; |
| 491 | 492 | } |