This commit is contained in:
twinaphex 2020-09-18 21:45:06 +02:00
parent f03ee06094
commit d2559ca27a
4 changed files with 2 additions and 107 deletions

View File

@ -19,7 +19,6 @@
#include "mednafen/pce_fast/huc.h"
#include "mednafen/pce_fast/pcecd.h"
#include "mednafen/pce_fast/pcecd_drive.h"
#include "mednafen/settings-common.h"
#include "mednafen/hw_misc/arcade_card/arcade_card.h"
#include "mednafen/mempatcher.h"
#include "mednafen/cdrom/cdromif.h"
@ -455,27 +454,6 @@ static void DoSimpleCommand(int cmd)
}
}
static MDFNSetting PCESettings[] =
{
{ "pce_fast.slstart", MDFNSF_NOFLAGS, "First rendered scanline.", NULL, MDFNST_UINT, "4", "0", "239" },
{ "pce_fast.slend", MDFNSF_NOFLAGS, "Last rendered scanline.", NULL, MDFNST_UINT, "235", "0", "239" },
{ "pce_fast.mouse_sensitivity", MDFNSF_NOFLAGS, "Mouse sensitivity.", NULL, MDFNST_FLOAT, "0.50", NULL, NULL, NULL, PCEINPUT_SettingChanged },
{ "pce_fast.disable_softreset", MDFNSF_NOFLAGS, "If set, when RUN+SEL are pressed simultaneously, disable both buttons temporarily.", NULL, MDFNST_BOOL, "0", NULL, NULL, NULL, PCEINPUT_SettingChanged },
{ "pce_fast.arcadecard", MDFNSF_EMU_STATE | MDFNSF_UNTRUSTED_SAFE, "Enable Arcade Card emulation.", NULL, MDFNST_BOOL, "1" },
{ "pce_fast.ocmultiplier", MDFNSF_EMU_STATE | MDFNSF_UNTRUSTED_SAFE, "CPU overclock multiplier.", NULL, MDFNST_UINT, "1", "1", "100"},
{ "pce_fast.cdspeed", MDFNSF_EMU_STATE | MDFNSF_UNTRUSTED_SAFE, "CD-ROM data transfer speed multiplier.", NULL, MDFNST_UINT, "1", "1", "100" },
{ "pce_fast.nospritelimit", MDFNSF_NOFLAGS, "Remove 16-sprites-per-scanline hardware limit.", NULL, MDFNST_BOOL, "0" },
{ "pce_fast.hoverscan", MDFNSF_NOFLAGS, "Reduce 352 pixels width overscan.", NULL, MDFNST_UINT, "300", "300", "352" },
{ "pce_fast.cdbios", MDFNSF_EMU_STATE, "Path to the CD BIOS", NULL, MDFNST_STRING, "syscard3.pce" },
{ "pce_fast.adpcmlp", MDFNSF_NOFLAGS, "Enable dynamic ADPCM lowpass filter.", NULL, MDFNST_BOOL, "0" },
{ "pce_fast.cdpsgvolume", MDFNSF_NOFLAGS, "PSG volume when playing a CD game.", NULL, MDFNST_UINT, "100", "0", "200" },
{ "pce_fast.cddavolume", MDFNSF_NOFLAGS, "CD-DA volume.", NULL, MDFNST_UINT, "100", "0", "200" },
{ "pce_fast.adpcmvolume", MDFNSF_NOFLAGS, "ADPCM volume.", NULL, MDFNST_UINT, "100", "0", "200" },
{ NULL }
};
uint8 MemRead(uint32 addr)
{
return(HuCPU.PCERead[(addr / 8192) & 0xFF](addr));
@ -787,7 +765,6 @@ void HuC_Power(void)
MDFNGI EmulatedPCE_Fast =
{
PCESettings,
MDFN_MASTERCLOCK_FIXED(PCE_MASTER_CLOCK),
0,

View File

@ -4,6 +4,8 @@
#include <string>
#include <libretro.h>
#include "file.h"
#include "state.h"
#include "video.h"
#if 0
@ -16,8 +18,6 @@ typedef struct
const char *description; // Example "iNES Format ROM Image"
} FileExtensionSpecStruct;
#include "file.h"
enum
{
MDFN_ROTATE0 = 0,
@ -45,9 +45,6 @@ typedef enum
GMT_PLAYER // Music player(NSF, HES, GSF)
} GameMediumTypes;
#include "state.h"
#include "settings-common.h"
typedef enum
{
IDIT_BUTTON, // 1-bit
@ -284,8 +281,6 @@ class CDIF;
typedef struct
{
const MDFNSetting *Settings;
// Time base for EmulateSpecStruct::MasterCycles
int64 MasterClock;

View File

@ -3,8 +3,6 @@
#include <stdio.h>
#include "settings-common.h"
/* Indent stdout newlines +- "indent" amount */
void MDFN_indent(int indent);
void MDFN_printf(const char *format, ...);

View File

@ -1,75 +0,0 @@
#ifndef _MDFN_SETTINGS_COMMON_H
#define _MDFN_SETTINGS_COMMON_H
typedef enum
{
// Actual base types
MDFNST_INT = 0, // (signed), int8, int16, int32, int64(saved as)
MDFNST_UINT, // uint8, uint16, uint32, uint64(saved as)
MDFNST_BOOL, // bool. bool. bool!
MDFNST_FLOAT, // float, double(saved as).
MDFNST_STRING,
MDFNST_ENUM, // Handled like a string, but validated against the enumeration list, and MDFN_GetSettingUI() returns the number in the enumeration list.
MDFNST_ALIAS
} MDFNSettingType;
//#define MDFNST_EX_DRIVER = (1 << 16), // If this is not set, the setting is assumed to be internal. This...should probably be set automatically?
#define MDFNSF_NOFLAGS 0 // Always 0, makes setting definitions prettier...maybe.
// TODO(cats)
#define MDFNSF_CAT_INPUT (1 << 8)
#define MDFNSF_CAT_SOUND (1 << 9)
#define MDFNSF_CAT_VIDEO (1 << 10)
#define MDFNSF_EMU_STATE (1 << 17) // If the setting affects emulation from the point of view of the emulated program
#define MDFNSF_UNTRUSTED_SAFE (1 << 18) // If it's safe for an untrusted source to modify it, probably only used in conjunction with
// MDFNST_EX_EMU_STATE and network play
#define MDFNSF_SUPPRESS_DOC (1 << 19) // Suppress documentation generation for this setting.
#define MDFNSF_COMMON_TEMPLATE (1 << 20) // Auto-generated common template setting(like nes.xscale, pce.xscale, vb.xscale, nes.enable, pce.enable, vb.enable)
// TODO:
// #define MDFNSF_WILL_BREAK_GAMES (1 << ) // If changing the value of the setting from the default value will break games/programs that would otherwise work.
// TODO(in progress):
#define MDFNSF_REQUIRES_RELOAD (1 << 24) // If a game reload is required for the setting to take effect.
#define MDFNSF_REQUIRES_RESTART (1 << 25) // If Mednafen restart is required for the setting to take effect.
typedef struct
{
const char *string;
int number;
const char *description; // Short
const char *description_extra; // Extra verbose text appended to the short description.
} MDFNSetting_EnumList;
typedef struct
{
const char *name;
uint32 flags;
const char *description; // Short
const char *description_extra;
MDFNSettingType type;
const char *default_value;
const char *minimum;
const char *maximum;
bool (*validate_func)(const char *name, const char *value);
void (*ChangeNotification)(const char *name);
const MDFNSetting_EnumList *enum_list;
} MDFNSetting;
typedef struct __MDFNCS
{
char *name;
char *value;
char *game_override; // per-game setting override(netplay_override > game_override > value, in precedence)
const MDFNSetting *desc;
void (*ChangeNotification)(const char *name);
uint32 name_hash;
} MDFNCS;
#endif