GitLab

Fix compile fail from math with conflicting types

This commit includes math that calls std::min but can pass two different parameter types (in my case, double and int). 
https://github.com/6alileo/reicast-emulator/commit/500393a02d3ecad934065cf0a8219ed9e7016bca

The std::min function does not support comparing variables of different types. Since the author of this commit already cast one of the parameters, this PR just adds the matching cast on the other parameter. There's a few different ways to resolve but this seemed like the best option.

For reference, this fixes the following compile error: 
In file included from /usr/include/c++/6/vector:60:0,
                 from ./core/types.h:342,
                 from core/libretro/libretro.cpp:4:
/usr/include/c++/6/bits/stl_algobase.h:243:5: note: candidate: template<class _Tp, class _Compare> const _Tp& std::min(const _Tp&, const _Tp&, _Compare)
     min(const _Tp& __a, const _Tp& __b, _Compare __comp)
     ^~~
/usr/include/c++/6/bits/stl_algobase.h:243:5: note:   template argument deduction/substitution failed:
core/libretro/libretro.cpp:2415:123: note:   deduced conflicting types for parameter 'const _Tp' ('double' and 'int')
    vib_stop_time[port] = get_time_ms() + min(1000 * (INC ? abs(INC) * max(POW_POS, POW_NEG) : 1) / FREQ, (int)max_duration);
                                                                                                                           ^
Makefile:751: recipe for target 'core/libretro/libretro.o' failed

Naomi: fixes for vathlete, csmash, hotd2 and more

Load default eeprom from mame rom if present
Fix controls for hotd2 and alpilot
Fix vathlete graphical gltches due to huge negative z values
GD-rom games now have proper game id
Fix csmash crash entering game test mode

Restrict regions for naomi games

Add All GD Roms - Flyinghead FTW

Naomi: GD-ROM support

Naomi: improved JVS configuration. Ninja Assault

Fix for some M2 carts game id
DSP crash fix
Support for Ninja Assault

Mushiking and Derby Additions/Fixes

Fixes for wldkicks and wldkicksu

Naomi/AW: input descriptors framework

Makes Namco games boot: Mazan, Ninja Assault, World Kicks

Leverage libretro input descriptors to list and name each game's inputs
Half/full analog axes. Per-player axes count.
AW light gun and rotary encoders fix
Load bios from naomi.zip if present for .bin/.dat games

Child and clone roms support for M1, M2/M3 and AW

Naomi: allow bios selection with region core option

Skip RAM test at AW startup
Dolphin Blue freeze workaround
naomi_boot.bin is now optional

Various fixes

Shoutout Pool Medal
Extreme Hunting
Block Pong
WaiWai Drive