Skip to content

Commit d98e860

Browse files
libretroadminLibretroAdmin
libretroadmin
authored and
LibretroAdmin
committed
settings: migrate the game AI group to a single-source def file
The final table: four override rows, unpersisted upstream and unpersisted here. The descriptor census of menu_setting.c is zero - every settings table in RetroArch is now generated from a single-source def file. Performed by tools/settings_migrate_group.py with the standard battery.
1 parent 0c60330 commit d98e860

8 files changed

Lines changed: 556 additions & 67 deletions

File tree

‎configuration.c‎

Lines changed: 15 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1934,6 +1934,9 @@ static struct config_bool_setting *populate_settings_bool(
19341934
#include "settings/settings_def_video_fullscreen.h"
19351935
#define SETTINGS_DEF_CONFIG_PASS
19361936
#include "settings/settings_def_video_sync.h"
1937+
#ifdef HAVE_GAME_AI
1938+
#include "settings/settings_def_game_ai.h"
1939+
#endif
19371940
#include "settings/settings_def_services_actions.h"
19381941
#include "settings/settings_def_video_driver_actions.h"
19391942
#include "settings/settings_def_gpu_index_vulkan.h"
@@ -2570,9 +2573,6 @@ static struct config_bool_setting *populate_settings_bool(
25702573
SETTING_BOOL("gcdwebserver_alert", &settings->bools.gcdwebserver_alert, true, true, false);
25712574
#endif
25722575

2573-
#ifdef HAVE_GAME_AI
2574-
SETTING_BOOL("quick_menu_show_game_ai", &settings->bools.quick_menu_show_game_ai, true, 1, false);
2575-
#endif
25762576

25772577
*size = count;
25782578

@@ -2641,6 +2641,9 @@ static struct config_float_setting *populate_settings_float(
26412641
#include "settings/settings_def_video_fullscreen.h"
26422642
#define SETTINGS_DEF_CONFIG_PASS
26432643
#include "settings/settings_def_video_sync.h"
2644+
#ifdef HAVE_GAME_AI
2645+
#include "settings/settings_def_game_ai.h"
2646+
#endif
26442647
#include "settings/settings_def_services_actions.h"
26452648
#include "settings/settings_def_video_driver_actions.h"
26462649
#include "settings/settings_def_gpu_index_vulkan.h"
@@ -3303,6 +3306,9 @@ static struct config_uint_setting *populate_settings_uint(
33033306
#include "settings/settings_def_video_fullscreen.h"
33043307
#define SETTINGS_DEF_CONFIG_PASS
33053308
#include "settings/settings_def_video_sync.h"
3309+
#ifdef HAVE_GAME_AI
3310+
#include "settings/settings_def_game_ai.h"
3311+
#endif
33063312
#include "settings/settings_def_services_actions.h"
33073313
#include "settings/settings_def_video_driver_actions.h"
33083314
#include "settings/settings_def_gpu_index_vulkan.h"
@@ -4001,6 +4007,9 @@ static struct config_int_setting *populate_settings_int(
40014007
#include "settings/settings_def_video_fullscreen.h"
40024008
#define SETTINGS_DEF_CONFIG_PASS
40034009
#include "settings/settings_def_video_sync.h"
4010+
#ifdef HAVE_GAME_AI
4011+
#include "settings/settings_def_game_ai.h"
4012+
#endif
40044013
#include "settings/settings_def_services_actions.h"
40054014
#include "settings/settings_def_video_driver_actions.h"
40064015
#include "settings/settings_def_gpu_index_vulkan.h"
@@ -4587,6 +4596,9 @@ static struct config_int_setting *populate_settings_int(
45874596
#include "settings/settings_def_video_fullscreen.h"
45884597
#define SETTINGS_DEF_CONFIG_PASS
45894598
#include "settings/settings_def_video_sync.h"
4599+
#ifdef HAVE_GAME_AI
4600+
#include "settings/settings_def_game_ai.h"
4601+
#endif
45904602
#include "settings/settings_def_services_actions.h"
45914603
#include "settings/settings_def_video_driver_actions.h"
45924604
#include "settings/settings_def_gpu_index_vulkan.h"

‎intl/msg_hash_lbl.h‎

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -3632,22 +3632,6 @@ MSG_HASH(
36323632
MENU_ENUM_LABEL_CORE_GAME_AI_OPTIONS,
36333633
MENU_ENUM_LABEL_CORE_GAME_AI_OPTIONS_STR
36343634
)
3635-
MSG_HASH(
3636-
MENU_ENUM_LABEL_QUICK_MENU_SHOW_GAME_AI,
3637-
MENU_ENUM_LABEL_QUICK_MENU_SHOW_GAME_AI_STR
3638-
)
3639-
MSG_HASH(
3640-
MENU_ENUM_LABEL_GAME_AI_OVERRIDE_P1,
3641-
MENU_ENUM_LABEL_GAME_AI_OVERRIDE_P1_STR
3642-
)
3643-
MSG_HASH(
3644-
MENU_ENUM_LABEL_GAME_AI_OVERRIDE_P2,
3645-
MENU_ENUM_LABEL_GAME_AI_OVERRIDE_P2_STR
3646-
)
3647-
MSG_HASH(
3648-
MENU_ENUM_LABEL_GAME_AI_SHOW_DEBUG,
3649-
MENU_ENUM_LABEL_GAME_AI_SHOW_DEBUG_STR
3650-
)
36513635
#endif
36523636
#ifdef HAVE_SMBCLIENT
36533637
MSG_HASH(

‎intl/msg_hash_us.c‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -571,6 +571,7 @@ static const char *const msg_hash_us_lbl_strs[] = {
571571
#define S_ACTION_EX_NS(T, n, sd, ok, rp, c, us) n,
572572
#include "../settings/settings_def_video_fullscreen.h"
573573
#include "../settings/settings_def_video_sync.h"
574+
#include "../settings/settings_def_game_ai.h"
574575
#include "../settings/settings_def_services_actions.h"
575576
#include "../settings/settings_def_video_driver_actions.h"
576577
#include "../settings/settings_def_gpu_index_vulkan.h"
@@ -944,6 +945,7 @@ static const uint32_t msg_hash_us_lbl_ids[] = {
944945
#define S_ACTION_EX_NS(T, n, sd, ok, rp, c, us) (uint32_t)MENU_ENUM_LABEL_##T,
945946
#include "../settings/settings_def_video_fullscreen.h"
946947
#include "../settings/settings_def_video_sync.h"
948+
#include "../settings/settings_def_game_ai.h"
947949
#include "../settings/settings_def_services_actions.h"
948950
#include "../settings/settings_def_video_driver_actions.h"
949951
#include "../settings/settings_def_gpu_index_vulkan.h"

‎intl/msg_hash_us.h‎

Lines changed: 185 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -35472,41 +35472,194 @@ MSG_HASH(
3547235472
"Game AI"
3547335473
)
3547435474

35475-
MSG_HASH(
35476-
MENU_ENUM_LABEL_VALUE_GAME_AI_OVERRIDE_P1,
35477-
"Override p1"
35478-
)
35479-
MSG_HASH(
35480-
MENU_ENUM_SUBLABEL_GAME_AI_OVERRIDE_P1,
35481-
"Override player 01"
35482-
)
35475+
/* GENERATED REGION: game AI group (see settings_def_game_ai.h). */
35476+
#define SETTINGS_DEF_STRINGS_PASS
35477+
#define S_BOOL(f, T, n, d, sd, df, c, us, sub) \
35478+
MSG_HASH(MENU_ENUM_LABEL_VALUE_##T, us) \
35479+
MSG_HASH(MENU_ENUM_SUBLABEL_##T, sub)
35480+
#define S_BOOL_NS(f, T, n, d, sd, df, c, us) \
35481+
MSG_HASH(MENU_ENUM_LABEL_VALUE_##T, us)
35482+
#define S_UINT(f, T, n, d, sd, df, c, mn, mx, st, ob, ok, rp, us, sub) \
35483+
MSG_HASH(MENU_ENUM_LABEL_VALUE_##T, us) \
35484+
MSG_HASH(MENU_ENUM_SUBLABEL_##T, sub)
35485+
#define S_UINT_NS(f, T, n, d, sd, df, c, mn, mx, st, ob, ok, rp, us) \
35486+
MSG_HASH(MENU_ENUM_LABEL_VALUE_##T, us)
35487+
#define S_INT(f, T, n, d, sd, df, c, mn, mx, st, ob, ok, rp, us, sub) \
35488+
MSG_HASH(MENU_ENUM_LABEL_VALUE_##T, us) \
35489+
MSG_HASH(MENU_ENUM_SUBLABEL_##T, sub)
35490+
#define S_INT_NS(f, T, n, d, sd, df, c, mn, mx, st, ob, ok, rp, us) \
35491+
MSG_HASH(MENU_ENUM_LABEL_VALUE_##T, us)
35492+
#define S_FLOAT(f, T, n, d, rnd, sd, df, c, mn, mx, st, ok, rp, us, sub) \
35493+
MSG_HASH(MENU_ENUM_LABEL_VALUE_##T, us) \
35494+
MSG_HASH(MENU_ENUM_SUBLABEL_##T, sub)
35495+
#define S_FLOAT_NS(f, T, n, d, rnd, sd, df, c, mn, mx, st, ok, rp, us) \
35496+
MSG_HASH(MENU_ENUM_LABEL_VALUE_##T, us)
35497+
#define S_STRING(f, T, n, d, sd, c, ok, rp, sta, sel, lf, rt, ui, us, sub) \
35498+
MSG_HASH(MENU_ENUM_LABEL_VALUE_##T, us) \
35499+
MSG_HASH(MENU_ENUM_SUBLABEL_##T, sub)
35500+
#define S_STRING_NS(f, T, n, d, sd, c, ok, rp, sta, sel, lf, rt, ui, us) \
35501+
MSG_HASH(MENU_ENUM_LABEL_VALUE_##T, us)
35502+
#define S_DIR(f, T, n, d, el, sd, c, sta, us, sub) \
35503+
MSG_HASH(MENU_ENUM_LABEL_VALUE_##T, us) \
35504+
MSG_HASH(MENU_ENUM_SUBLABEL_##T, sub)
35505+
#define S_DIR_NS(f, T, n, d, el, sd, c, sta, us) \
35506+
MSG_HASH(MENU_ENUM_LABEL_VALUE_##T, us)
35507+
#define S_STRING_P(f, T, n, d, sd, c, ok, rp, sta, sel, lf, rt, ui, us, sub) \
35508+
MSG_HASH(MENU_ENUM_LABEL_VALUE_##T, us) \
35509+
MSG_HASH(MENU_ENUM_SUBLABEL_##T, sub)
35510+
#define S_STRING_P_NS(f, T, n, d, sd, c, ok, rp, sta, sel, lf, rt, ui, us) \
35511+
MSG_HASH(MENU_ENUM_LABEL_VALUE_##T, us)
35512+
#define S_PATH(f, T, n, d, sd, c, vals, rp, ui, us, sub) \
35513+
MSG_HASH(MENU_ENUM_LABEL_VALUE_##T, us) \
35514+
MSG_HASH(MENU_ENUM_SUBLABEL_##T, sub)
35515+
#define S_PATH_NS(f, T, n, d, sd, c, vals, rp, ui, us) \
35516+
MSG_HASH(MENU_ENUM_LABEL_VALUE_##T, us)
35517+
#define S_PATH_DS(f, T, n, df2, sd, c, vals, rp, ui, us, sub) \
35518+
MSG_HASH(MENU_ENUM_LABEL_VALUE_##T, us) \
35519+
MSG_HASH(MENU_ENUM_SUBLABEL_##T, sub)
35520+
#define S_PATH_DS_NS(f, T, n, df2, sd, c, vals, rp, ui, us) \
35521+
MSG_HASH(MENU_ENUM_LABEL_VALUE_##T, us)
35522+
#define S_ACTION(T, n, us, sub) \
35523+
MSG_HASH(MENU_ENUM_LABEL_VALUE_##T, us) \
35524+
MSG_HASH(MENU_ENUM_SUBLABEL_##T, sub)
35525+
#define S_ACTION_NS(T, n, us) \
35526+
MSG_HASH(MENU_ENUM_LABEL_VALUE_##T, us)
35527+
#define S_BOOL_EX(f, T, n, d, sd, df, c, ok, rp, sta, sel, lf, rt, ui, us, sub) \
35528+
MSG_HASH(MENU_ENUM_LABEL_VALUE_##T, us) \
35529+
MSG_HASH(MENU_ENUM_SUBLABEL_##T, sub)
35530+
#define S_BOOL_EX_NS(f, T, n, d, sd, df, c, ok, rp, sta, sel, lf, rt, ui, us) \
35531+
MSG_HASH(MENU_ENUM_LABEL_VALUE_##T, us)
35532+
#define S_UINT_EX(f, T, n, d, sd, df, c, mn, mx, st, ob, ok, rp, sta, sel, lf, rt, ui, us, sub) \
35533+
MSG_HASH(MENU_ENUM_LABEL_VALUE_##T, us) \
35534+
MSG_HASH(MENU_ENUM_SUBLABEL_##T, sub)
35535+
#define S_UINT_EX_NS(f, T, n, d, sd, df, c, mn, mx, st, ob, ok, rp, sta, sel, lf, rt, ui, us) \
35536+
MSG_HASH(MENU_ENUM_LABEL_VALUE_##T, us)
35537+
#define S_INT_EX(f, T, n, d, sd, df, c, mn, mx, st, ob, ok, rp, sta, sel, lf, rt, ui, us, sub) \
35538+
MSG_HASH(MENU_ENUM_LABEL_VALUE_##T, us) \
35539+
MSG_HASH(MENU_ENUM_SUBLABEL_##T, sub)
35540+
#define S_INT_EX_NS(f, T, n, d, sd, df, c, mn, mx, st, ob, ok, rp, sta, sel, lf, rt, ui, us) \
35541+
MSG_HASH(MENU_ENUM_LABEL_VALUE_##T, us)
35542+
#define S_FLOAT_EX(f, T, n, d, rnd, sd, df, c, mn, mx, st, ok, rp, sta, sel, lf, rt, ui, us, sub) \
35543+
MSG_HASH(MENU_ENUM_LABEL_VALUE_##T, us) \
35544+
MSG_HASH(MENU_ENUM_SUBLABEL_##T, sub)
35545+
#define S_FLOAT_EX_NS(f, T, n, d, rnd, sd, df, c, mn, mx, st, ok, rp, sta, sel, lf, rt, ui, us) \
35546+
MSG_HASH(MENU_ENUM_LABEL_VALUE_##T, us)
35547+
#define S_ACTION_EX(T, n, sd, ok, rp, c, us, sub) \
35548+
MSG_HASH(MENU_ENUM_LABEL_VALUE_##T, us) \
35549+
MSG_HASH(MENU_ENUM_SUBLABEL_##T, sub)
35550+
#define S_ACTION_EX_NS(T, n, sd, ok, rp, c, us) \
35551+
MSG_HASH(MENU_ENUM_LABEL_VALUE_##T, us)
35552+
#define S_BOOL_LV(f, T, TV, n, d, sd, df, c, us, sub) \
35553+
MSG_HASH(MENU_ENUM_SUBLABEL_##T, sub)
35554+
#define S_BOOL_LV_NS(f, T, TV, n, d, sd, df, c, us)
35555+
#define S_FLOAT_LV(f, T, TV, n, d, rnd, sd, df, c, us, sub) \
35556+
MSG_HASH(MENU_ENUM_SUBLABEL_##T, sub)
35557+
#define S_FLOAT_LV_NS(f, T, TV, n, d, rnd, sd, df, c, us)
35558+
#define S_STRING_LV(f, T, TV, n, d, sd, c, ok, rp, sta, sel, lf, rt, ui, us, sub) \
35559+
MSG_HASH(MENU_ENUM_SUBLABEL_##T, sub)
35560+
#define S_STRING_LV_NS(f, T, TV, n, d, sd, c, ok, rp, sta, sel, lf, rt, ui, us)
35561+
#define S_ACTION_LV(T, TV, n, sd, ok, rp, c, us, sub) \
35562+
MSG_HASH(MENU_ENUM_SUBLABEL_##T, sub)
35563+
#define S_ACTION_LV_NS(T, TV, n, sd, ok, rp, c, us)
35564+
#define S_INT_AT(offs, T, n, d, sd, df, c, mn, mx, st, ob, ok, rp, us, sub) \
35565+
MSG_HASH(MENU_ENUM_LABEL_VALUE_##T, us) \
35566+
MSG_HASH(MENU_ENUM_SUBLABEL_##T, sub)
35567+
#define S_INT_AT_NS(offs, T, n, d, sd, df, c, mn, mx, st, ob, ok, rp, us) \
35568+
MSG_HASH(MENU_ENUM_LABEL_VALUE_##T, us)
35569+
#define S_UINT_AT_EX(offs, T, n, d, sd, df, c, mn, mx, st, ob, ok, rp, sta, sel, lf, rt, ui, us, sub) \
35570+
MSG_HASH(MENU_ENUM_LABEL_VALUE_##T, us) \
35571+
MSG_HASH(MENU_ENUM_SUBLABEL_##T, sub)
35572+
#define S_UINT_AT_EX_NS(offs, T, n, d, sd, df, c, mn, mx, st, ob, ok, rp, sta, sel, lf, rt, ui, us) \
35573+
MSG_HASH(MENU_ENUM_LABEL_VALUE_##T, us)
35574+
#include "../settings/settings_def_game_ai.h"
35575+
#undef S_BOOL
35576+
#undef S_BOOL_NS
35577+
#undef S_BOOL_H
35578+
#undef S_BOOL_NS_H
35579+
#undef S_UINT
35580+
#undef S_UINT_NS
35581+
#undef S_UINT_H
35582+
#undef S_UINT_NS_H
35583+
#undef S_INT
35584+
#undef S_INT_NS
35585+
#undef S_INT_H
35586+
#undef S_INT_NS_H
35587+
#undef S_FLOAT
35588+
#undef S_FLOAT_NS
35589+
#undef S_FLOAT_H
35590+
#undef S_FLOAT_NS_H
35591+
#undef S_STRING
35592+
#undef S_STRING_NS
35593+
#undef S_STRING_H
35594+
#undef S_STRING_NS_H
35595+
#undef S_DIR
35596+
#undef S_DIR_NS
35597+
#undef S_DIR_H
35598+
#undef S_DIR_NS_H
35599+
#undef S_STRING_P
35600+
#undef S_STRING_P_NS
35601+
#undef S_STRING_P_H
35602+
#undef S_STRING_P_NS_H
35603+
#undef S_PATH
35604+
#undef S_PATH_NS
35605+
#undef S_PATH_H
35606+
#undef S_PATH_NS_H
35607+
#undef S_PATH_DS
35608+
#undef S_PATH_DS_NS
35609+
#undef S_PATH_DS_H
35610+
#undef S_PATH_DS_NS_H
35611+
#undef S_ACTION
35612+
#undef S_ACTION_NS
35613+
#undef S_ACTION_H
35614+
#undef S_ACTION_NS_H
35615+
#undef S_BOOL_EX
35616+
#undef S_BOOL_EX_NS
35617+
#undef S_BOOL_EX_H
35618+
#undef S_BOOL_EX_NS_H
35619+
#undef S_UINT_EX
35620+
#undef S_UINT_EX_NS
35621+
#undef S_UINT_EX_H
35622+
#undef S_UINT_EX_NS_H
35623+
#undef S_INT_EX
35624+
#undef S_INT_EX_NS
35625+
#undef S_INT_EX_H
35626+
#undef S_INT_EX_NS_H
35627+
#undef S_FLOAT_EX
35628+
#undef S_FLOAT_EX_NS
35629+
#undef S_FLOAT_EX_H
35630+
#undef S_FLOAT_EX_NS_H
35631+
#undef S_ACTION_EX
35632+
#undef S_ACTION_EX_NS
35633+
#undef S_ACTION_EX_H
35634+
#undef S_ACTION_EX_NS_H
35635+
#undef S_BOOL_LV
35636+
#undef S_BOOL_LV_NS
35637+
#undef S_BOOL_LV_H
35638+
#undef S_BOOL_LV_NS_H
35639+
#undef S_FLOAT_LV
35640+
#undef S_FLOAT_LV_NS
35641+
#undef S_FLOAT_LV_H
35642+
#undef S_FLOAT_LV_NS_H
35643+
#undef S_STRING_LV
35644+
#undef S_STRING_LV_NS
35645+
#undef S_STRING_LV_H
35646+
#undef S_STRING_LV_NS_H
35647+
#undef S_ACTION_LV
35648+
#undef S_ACTION_LV_NS
35649+
#undef S_ACTION_LV_H
35650+
#undef S_ACTION_LV_NS_H
35651+
#undef S_INT_AT
35652+
#undef S_INT_AT_NS
35653+
#undef S_INT_AT_H
35654+
#undef S_INT_AT_NS_H
35655+
#undef S_UINT_AT_EX
35656+
#undef S_UINT_AT_EX_NS
35657+
#undef S_UINT_AT_EX_H
35658+
#undef S_UINT_AT_EX_NS_H
35659+
#undef SETTINGS_DEF_STRINGS_PASS
3548335660

35484-
MSG_HASH(
35485-
MENU_ENUM_LABEL_VALUE_GAME_AI_OVERRIDE_P2,
35486-
"Override p2"
35487-
)
35488-
MSG_HASH(
35489-
MENU_ENUM_SUBLABEL_GAME_AI_OVERRIDE_P2,
35490-
"Override player 02"
35491-
)
3549235661

35493-
MSG_HASH(
35494-
MENU_ENUM_LABEL_VALUE_GAME_AI_SHOW_DEBUG,
35495-
"Show Debug"
35496-
)
35497-
MSG_HASH(
35498-
MENU_ENUM_SUBLABEL_GAME_AI_SHOW_DEBUG,
35499-
"Show Debug"
35500-
)
3550135662

35502-
MSG_HASH(
35503-
MENU_ENUM_LABEL_VALUE_QUICK_MENU_SHOW_GAME_AI,
35504-
"Show 'Game AI'"
35505-
)
35506-
MSG_HASH(
35507-
MENU_ENUM_SUBLABEL_QUICK_MENU_SHOW_GAME_AI,
35508-
"Show the 'Game AI' option."
35509-
)
3551035663
#endif
3551135664
#ifdef HAVE_SMBCLIENT
3551235665
/* GENERATED REGION: netplay action (see settings_def_netplay_action.h). */

0 commit comments

Comments
 (0)