ShuriZma
/
flycast
mirror of https://github.com/flyinghead/flycast.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into dev

This commit is contained in:
Flyinghead 2023-12-04 11:58:12 +01:00
parent 4aecdbbb25 5fde889d7c
commit e9beea484d
5 changed files with 68 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
core/cheats.cpp
View File

@ -493,7 +493,18 @@ void CheatManager::reset(const std::string& gameId)
cheats.emplace_back(Cheat::Type::setValue, "fix main loop time", true, 32, 0x003011cc, 0x42200000); // 40.0 ms
cheats.back().builtIn = true;
}
else if (gameId == "MK-0100") // F355 US
{
setActive(true);
cheats.emplace_back(Cheat::Type::setValue, "increase datapump timeout", true, 16, 0x00131668, 1000);
cheats.back().builtIn = true;
}
else if (gameId == "T8118D 50") // F355 EU
{
setActive(true);
cheats.emplace_back(Cheat::Type::setValue, "increase datapump timeout", true, 16, 0x00135588, 1000);
cheats.back().builtIn = true;
}
}
if (config::WidescreenGameHacks)
{
@ -579,11 +590,13 @@ void CheatManager::apply()
writeRam(address, widescreen_cheat->values[i], 32);
}
}
if (active && !settings.network.online)
if (active)
{
bool skipCheat = false;
for (const Cheat& cheat : cheats)
{
if (!cheat.builtIn && settings.network.online)
continue;
if (skipCheat) {
skipCheat = false;
continue;

9
core/emulator.cpp
View File

@ -266,6 +266,12 @@ static void loadSpecialSettings()
NOTICE_LOG(BOOT, "Forcing real BIOS");
config::UseReios.override(false);
}
else if (prod_id == "T17708N" // Stupid Invaders (US)
|| prod_id == "T17711D") // Stupid Invaders (EU)
{
NOTICE_LOG(BOOT, "Forcing HLE BIOS");
config::UseReios.override(true);
}
if (prod_id == "T-9707N" // San Francisco Rush 2049 (US)
|| prod_id == "MK-51146" // Sega Smash Pack - Volume 1
|| prod_id == "T-9702D-50" // Hydro Thunder (PAL)
@ -610,7 +616,8 @@ void Emulator::unloadGame()
} catch (...) { }
if (state == Loaded || state == Error)
{
if (state == Loaded && config::AutoSaveState && !settings.content.path.empty() && !settings.naomi.multiboard)
if (state == Loaded && config::AutoSaveState && !settings.content.path.empty()
&& !settings.naomi.multiboard && !config::GGPOEnable && !NaomiNetworkSupported())
dc_savestate(config::SavestateSlot);
try {
dc_reset(true);

7
core/hw/maple/maple_devs.cpp
View File

@ -1510,9 +1510,7 @@ struct maple_racing_controller: maple_sega_controller
// byte 2: R2 L2 D2 U2 D X Y Z
// byte 3: R L D U St A B C
return 0xfe003700; // Steering + accelerator/brake unit: Ra,La,Da,Ua,A,B,Start,A1,A2,A3,A5,A6
// (A5 & A6 only valid when the accelerator/brake unit is connected.)
//return 0xfe000700; // Steering only
return 0xfe000700; // Steering only: Ra,La,Da,Ua,A,B,Start,A1,A2,A3
}
u16 getButtonState(const PlainJoystickState &pjs) override
@ -1539,9 +1537,6 @@ struct maple_racing_controller: maple_sega_controller
case 0: return pjs.trigger[PJTI_R]; // A1: lever, 0 at rest
case 1: return pjs.trigger[PJTI_L]; // A2: lever, 0 at rest
case 2: return pjs.joy[PJAI_X1]; // A3: 0-0xff, 0x80 at rest
// (A5 and A6 are only valid when the accelerator/brake unit is connected)
case 4: return pjs.trigger[PJTI_R2]; // A5: lever, 0 at rest
case 5: return pjs.trigger[PJTI_L2]; // A6: lever, 0 at rest
default: return 0x80; // unused
}
}

6
core/hw/naomi/touchscreen.cpp
View File

@ -20,6 +20,7 @@
#include "hw/sh4/sh4_sched.h"
#include "hw/sh4/modules/modules.h"
#include "hw/maple/maple_cfg.h"
#include "hw/maple/maple_devs.h"
#include "input/gamepad.h"
#include "serialize.h"
@ -121,8 +122,13 @@ private:
{
int x = std::clamp(mapleInputState[i].absPos.x, 0, 1023);
int y = std::clamp(mapleInputState[i].absPos.y, 0, 1023);
#ifdef LIBRETRO
int hit = (mapleInputState[i].kcode & NAOMI_BTN0_KEY) == 0;
int charge = (mapleInputState[i].kcode & NAOMI_BTN1_KEY) == 0;
#else
int hit = (mapleInputState[i].kcode & DC_BTN_A) == 0;
int charge = (mapleInputState[i].kcode & DC_BTN_B) == 0;
#endif
// touches require bits 20, 21 and 22
// drag needs bit 22 off
// bit 23 is charge

76
shell/libretro/libretro_core_options_intl.h
View File

@ -4005,7 +4005,7 @@ struct retro_core_options_v2 options_ast = {
#define CORE_OPTION_NAME_NETWORK_OUTPUT_INFO_0_BE NULL
#define CORE_OPTION_NAME_SHOW_LIGHTGUN_SETTINGS_LABEL_BE NULL
#define CORE_OPTION_NAME_SHOW_LIGHTGUN_SETTINGS_INFO_0_BE NULL
#define CORE_OPTION_NAME_LIGHTGUN_CROSSHAIR_SIZE_SCALING_LABEL_BE NULL
#define CORE_OPTION_NAME_LIGHTGUN_CROSSHAIR_SIZE_SCALING_LABEL_BE "Маштабаванне прыцэлу пісталета"
#define OPTION_VAL_50_BE NULL
#define OPTION_VAL_60_BE NULL
#define OPTION_VAL_70_BE NULL
@ -11381,7 +11381,7 @@ struct retro_core_options_v2 options_cht = {
#define OPTION_VAL_PAL_CS "PAL (Svět)"
#define OPTION_VAL_PAL_N_CS NULL
#define OPTION_VAL_PAL_M_CS "PAL-M (Brazílie)"
#define CORE_OPTION_NAME_SCREEN_ROTATION_LABEL_CS "Orientace Obrazovky"
#define CORE_OPTION_NAME_SCREEN_ROTATION_LABEL_CS "Orientace obrazovky"
#define OPTION_VAL_HORIZONTAL_CS "Horizontální"
#define OPTION_VAL_VERTICAL_CS "Vertikální"
#define CORE_OPTION_NAME_ALPHA_SORTING_LABEL_CS "Třídění Alpha"
@ -63884,7 +63884,7 @@ struct retro_core_options_v2 options_sr = {
#define OPTION_VAL_2_SV "Tvinga Linjär"
#define CORE_OPTION_NAME_DELAY_FRAME_SWAPPING_LABEL_SV "Fördröj bildrutebyte"
#define CORE_OPTION_NAME_DELAY_FRAME_SWAPPING_INFO_0_SV "Användbart för att undvika blinkande skärmar eller glitchiga videor. Rekommenderas inte på långsamma plattformar."
#define CORE_OPTION_NAME_DETECT_VSYNC_SWAP_INTERVAL_LABEL_SV "Upptäck förändringar i bildfrekvensen"
#define CORE_OPTION_NAME_DETECT_VSYNC_SWAP_INTERVAL_LABEL_SV "Upptäck ändringar i bildhastighet"
#define CORE_OPTION_NAME_DETECT_VSYNC_SWAP_INTERVAL_INFO_0_SV "Meddela gränssnittet när den interna bildrutefrekvensen ändras (till exempel från 60 fps till 30 fps). Förbättrar taktningen av bildfrekvensen i spel som körs med en låst hastighet på 30 fps eller 20 fps, men bör vara inaktiverad för spel med upplåsta (ostadiga) bildrutefrekvenser (till exempel Ecco the Dolphin, Unreal Tournament). Observera!: Ej tillgänglig när \"Auto Skip Frame\" är aktiverad."
#define CORE_OPTION_NAME_PVR2_FILTERING_LABEL_SV "PowerVR2 Efterbehandlingsfilter"
#define CORE_OPTION_NAME_PVR2_FILTERING_INFO_0_SV "Efterbehandla den renderade bilden för att simulera effekter som är specifika för PowerVR2 GPU:n och analoga videosignaler."
@ -63907,7 +63907,7 @@ struct retro_core_options_v2 options_sr = {
#define CORE_OPTION_NAME_WIDESCREEN_CHEATS_LABEL_SV "Bredbildsfusk (Omstart krävs)"
#define CORE_OPTION_NAME_WIDESCREEN_CHEATS_INFO_0_SV "Aktiverar fusk som gör det möjligt för vissa spel att visas i bredbildsformat."
#define CORE_OPTION_NAME_WIDESCREEN_HACK_LABEL_SV "Bredbildshackning"
#define CORE_OPTION_NAME_WIDESCREEN_HACK_INFO_0_SV "Ritar geometrin utanför den normala 4:3 bildförhållandet. Kan leda till grafiska fel i de avslöjade områdena."
#define CORE_OPTION_NAME_WIDESCREEN_HACK_INFO_0_SV "Ritar geometrin utanför den normala 4:3 bildformatet. Kan leda till grafiska fel i de avslöjade områdena."
#define CORE_OPTION_NAME_GDROM_FAST_LOADING_LABEL_SV "GD-ROM Snabbladdning (felaktig)"
#define CORE_OPTION_NAME_GDROM_FAST_LOADING_INFO_0_SV "Ökar hastigheten på GD-ROM laddningen."
#define CORE_OPTION_NAME_DC_32MB_MOD_LABEL_SV "\"Dreamcast 32MB RAM-modifikation\""
@ -63958,13 +63958,13 @@ struct retro_core_options_v2 options_sr = {
#define CORE_OPTION_NAME_CUSTOM_TEXTURES_LABEL_SV "Ladda in anpassade texturer"
#define CORE_OPTION_NAME_DUMP_TEXTURES_LABEL_SV "Dumpa texturer"
#define CORE_OPTION_NAME_ANALOG_STICK_DEADZONE_LABEL_SV "Analoga spakens dödzon"
#define OPTION_VAL_0_SV "0 %"
#define OPTION_VAL_5_SV "5 %"
#define OPTION_VAL_10_SV "10 %"
#define OPTION_VAL_15_SV "15 %"
#define OPTION_VAL_20_SV "20 %"
#define OPTION_VAL_25_SV "25 %"
#define OPTION_VAL_30_SV "30 %"
#define OPTION_VAL_0_SV NULL
#define OPTION_VAL_5_SV NULL
#define OPTION_VAL_10_SV NULL
#define OPTION_VAL_15_SV NULL
#define OPTION_VAL_20_SV NULL
#define OPTION_VAL_25_SV NULL
#define OPTION_VAL_30_SV NULL
#define CORE_OPTION_NAME_TRIGGER_DEADZONE_LABEL_SV "Utlös dödzonen"
#define CORE_OPTION_NAME_DIGITAL_TRIGGERS_LABEL_SV "Digitala utlösare"
#define CORE_OPTION_NAME_ENABLE_PURUPURU_LABEL_SV "Purupuru Paketet/Vibrations Paketet"
@ -63974,32 +63974,32 @@ struct retro_core_options_v2 options_sr = {
#define CORE_OPTION_NAME_SHOW_LIGHTGUN_SETTINGS_LABEL_SV "Visa ljuspistolinställningar"
#define CORE_OPTION_NAME_SHOW_LIGHTGUN_SETTINGS_INFO_0_SV "Aktivera konfiguration av alternativ för ljuspistolens hårkors. OBS!: Snabbmenyn kan behöva aktiveras och avaktiveras för att denna inställning ska träda i kraft."
#define CORE_OPTION_NAME_LIGHTGUN_CROSSHAIR_SIZE_SCALING_LABEL_SV NULL
#define OPTION_VAL_50_SV "50 %"
#define OPTION_VAL_60_SV "60 %"
#define OPTION_VAL_70_SV "70 %"
#define OPTION_VAL_80_SV "80 %"
#define OPTION_VAL_90_SV "90 %"
#define OPTION_VAL_100_O46_SV "100 %"
#define OPTION_VAL_110_O46_SV "110 %"
#define OPTION_VAL_120_O46_SV "120 %"
#define OPTION_VAL_130_O46_SV "130 %"
#define OPTION_VAL_140_O46_SV "140 %"
#define OPTION_VAL_150_O46_SV "150 %"
#define OPTION_VAL_160_O46_SV "160 %"
#define OPTION_VAL_170_O46_SV "170 %"
#define OPTION_VAL_180_O46_SV "180 %"
#define OPTION_VAL_190_O46_SV "190 %"
#define OPTION_VAL_200_O46_SV "200 %"
#define OPTION_VAL_210_O46_SV "210 %"
#define OPTION_VAL_220_O46_SV "220 %"
#define OPTION_VAL_230_O46_SV "230 %"
#define OPTION_VAL_240_O46_SV "240 %"
#define OPTION_VAL_250_O46_SV "250 %"
#define OPTION_VAL_260_O46_SV "260 %"
#define OPTION_VAL_270_O46_SV "270 %"
#define OPTION_VAL_280_O46_SV "280 %"
#define OPTION_VAL_290_O46_SV "290 %"
#define OPTION_VAL_300_O46_SV "300 %"
#define OPTION_VAL_50_SV NULL
#define OPTION_VAL_60_SV NULL
#define OPTION_VAL_70_SV NULL
#define OPTION_VAL_80_SV NULL
#define OPTION_VAL_90_SV NULL
#define OPTION_VAL_100_O46_SV NULL
#define OPTION_VAL_110_O46_SV NULL
#define OPTION_VAL_120_O46_SV NULL
#define OPTION_VAL_130_O46_SV NULL
#define OPTION_VAL_140_O46_SV NULL
#define OPTION_VAL_150_O46_SV NULL
#define OPTION_VAL_160_O46_SV NULL
#define OPTION_VAL_170_O46_SV NULL
#define OPTION_VAL_180_O46_SV NULL
#define OPTION_VAL_190_O46_SV NULL
#define OPTION_VAL_200_O46_SV NULL
#define OPTION_VAL_210_O46_SV NULL
#define OPTION_VAL_220_O46_SV NULL
#define OPTION_VAL_230_O46_SV NULL
#define OPTION_VAL_240_O46_SV NULL
#define OPTION_VAL_250_O46_SV NULL
#define OPTION_VAL_260_O46_SV NULL
#define OPTION_VAL_270_O46_SV NULL
#define OPTION_VAL_280_O46_SV NULL
#define OPTION_VAL_290_O46_SV NULL
#define OPTION_VAL_300_O46_SV NULL
#define CORE_OPTION_NAME_LIGHTGUN1_CROSSHAIR_LABEL_SV "Visa pistol hårkorset 1"
#define OPTION_VAL_WHITE_SV "Vit"
#define OPTION_VAL_RED_SV "Röd"
@ -64057,7 +64057,7 @@ struct retro_core_options_v2 options_sr = {
#define OPTION_VAL_LIGHT_YELLOW_2_27_SV "Ljusgul (2)"
#define CORE_OPTION_NAME_VMU1_PIXEL_OFF_COLOR_LABEL_SV "Avaktivera pixelfärg på VMU skärm 1"
#define CORE_OPTION_NAME_VMU1_SCREEN_OPACITY_LABEL_SV "Opaciteten för VMU Skärm 1"
#define OPTION_VAL_40_SV "40 %"
#define OPTION_VAL_40_SV NULL
#define CORE_OPTION_NAME_VMU2_SCREEN_DISPLAY_LABEL_SV "Visa VMU Skärm 2"
#define CORE_OPTION_NAME_VMU2_SCREEN_POSITION_LABEL_SV "Positionen för VMU skärm 1"
#define CORE_OPTION_NAME_VMU2_SCREEN_SIZE_MULT_LABEL_SV "Storleken för VMU skärm 2"