Skip to content

Commit 558a48f

Browse files
Rosalie241Rosalie241
committed
RMG-Core: fix default settings being incorrect
1 parent 79ad4a9 commit 558a48f

File tree

1 file changed

+77
-77
lines changed

1 file changed

+77
-77
lines changed

‎Source/RMG-Core/Settings/Settings.cpp

+77-77
Original file line numberDiff line numberDiff line change
@@ -133,16 +133,16 @@ static l_Setting get_setting(SettingsID settingId)
133133
setting = {SETTING_SECTION_GUI, "StatusBar", true};
134134
break;
135135
case SettingsID::GUI_Theme:
136-
setting = {SETTING_SECTION_GUI, "Theme", "Native"};
136+
setting = {SETTING_SECTION_GUI, "Theme", std::string("Native")};
137137
break;
138138
case SettingsID::GUI_IconTheme:
139-
setting = {SETTING_SECTION_GUI, "IconTheme", "Automatic"};
139+
setting = {SETTING_SECTION_GUI, "IconTheme", std::string("Automatic")};
140140
break;
141141
case SettingsID::GUI_CheckForUpdates:
142142
setting = {SETTING_SECTION_GUI, "CheckForUpdates", true};
143143
break;
144144
case SettingsID::GUI_LastUpdateCheck:
145-
setting = {SETTING_SECTION_GUI, "LastUpdateCheck", ""};
145+
setting = {SETTING_SECTION_GUI, "LastUpdateCheck", std::string("")};
146146
break;
147147
case SettingsID::GUI_DiscordRpc:
148148
setting = {SETTING_SECTION_GUI, "DiscordRpc", true};
@@ -154,36 +154,36 @@ static l_Setting get_setting(SettingsID settingId)
154154
case SettingsID::Core_GFX_Plugin:
155155
setting = {SETTING_SECTION_CORE, "GFX_Plugin",
156156
#ifdef _WIN32
157-
"mupen64plus-video-GLideN64.dll",
157+
std::string("mupen64plus-video-GLideN64.dll"),
158158
#else
159-
"mupen64plus-video-GLideN64.so",
159+
std::string("mupen64plus-video-GLideN64.so"),
160160
#endif // _WIN32
161161
};
162162
break;
163163
case SettingsID::Core_AUDIO_Plugin:
164164
setting = {SETTING_SECTION_CORE, "AUDIO_Plugin",
165165
#ifdef _WIN32
166-
"RMG-Audio.dll",
166+
std::string("RMG-Audio.dll"),
167167
#else
168-
"RMG-Audio.so",
168+
std::string("RMG-Audio.so"),
169169
#endif // _WIN32
170170
};
171171
break;
172172
case SettingsID::Core_INPUT_Plugin:
173173
setting = {SETTING_SECTION_CORE, "INPUT_Plugin",
174174
#ifdef _WIN32
175-
"RMG-Input.dll",
175+
std::string("RMG-Input.dll"),
176176
#else
177-
"RMG-Input.so",
177+
std::string("RMG-Input.so"),
178178
#endif // _WIN32
179179
};
180180
break;
181181
case SettingsID::Core_RSP_Plugin:
182182
setting = {SETTING_SECTION_CORE, "RSP_Plugin",
183183
#ifdef _WIN32
184-
"mupen64plus-rsp-hle.dll",
184+
std::string("mupen64plus-rsp-hle.dll"),
185185
#else
186-
"mupen64plus-rsp-hle.so",
186+
std::string("mupen64plus-rsp-hle.so"),
187187
#endif // _WIN32
188188
};
189189
break;
@@ -263,41 +263,41 @@ static l_Setting get_setting(SettingsID settingId)
263263
break;
264264

265265
case SettingsID::Core_64DD_JapaneseIPL:
266-
setting = {SETTING_SECTION_64DD, "64DD_JapaneseIPL", ""};
266+
setting = {SETTING_SECTION_64DD, "64DD_JapaneseIPL", std::string("")};
267267
break;
268268
case SettingsID::Core_64DD_AmericanIPL:
269-
setting = {SETTING_SECTION_64DD, "64DD_AmericanIPL", ""};
269+
setting = {SETTING_SECTION_64DD, "64DD_AmericanIPL", std::string("")};
270270
break;
271271
case SettingsID::Core_64DD_DevelopmentIPL:
272-
setting = {SETTING_SECTION_64DD, "64DD_DevelopmentIPL", ""};
272+
setting = {SETTING_SECTION_64DD, "64DD_DevelopmentIPL", std::string("")};
273273
break;
274274
case SettingsID::Core_64DD_SaveDiskFormat:
275275
setting = {SETTING_SECTION_M64P, "SaveDiskFormat", 1};
276276
break;
277277

278278
case SettingsID::Core_Gameboy_P1_Rom:
279-
setting = {SETTING_SECTION_GB, "Gameboy_P1_Rom", ""};
279+
setting = {SETTING_SECTION_GB, "Gameboy_P1_Rom", std::string("")};
280280
break;
281281
case SettingsID::Core_Gameboy_P1_Save:
282-
setting = {SETTING_SECTION_GB, "Gameboy_P1_Save", ""};
282+
setting = {SETTING_SECTION_GB, "Gameboy_P1_Save", std::string("")};
283283
break;
284284
case SettingsID::Core_Gameboy_P2_Rom:
285-
setting = {SETTING_SECTION_GB, "Gameboy_P2_Rom", ""};
285+
setting = {SETTING_SECTION_GB, "Gameboy_P2_Rom", std::string("")};
286286
break;
287287
case SettingsID::Core_Gameboy_P2_Save:
288-
setting = {SETTING_SECTION_GB, "Gameboy_P2_Save", ""};
288+
setting = {SETTING_SECTION_GB, "Gameboy_P2_Save", std::string("")};
289289
break;
290290
case SettingsID::Core_Gameboy_P3_Rom:
291-
setting = {SETTING_SECTION_GB, "Gameboy_P3_Rom", ""};
291+
setting = {SETTING_SECTION_GB, "Gameboy_P3_Rom", std::string("")};
292292
break;
293293
case SettingsID::Core_Gameboy_P3_Save:
294-
setting = {SETTING_SECTION_GB, "Gameboy_P3_Save", ""};
294+
setting = {SETTING_SECTION_GB, "Gameboy_P3_Save", std::string("")};
295295
break;
296296
case SettingsID::Core_Gameboy_P4_Rom:
297-
setting = {SETTING_SECTION_GB, "Gameboy_P4_Rom", ""};
297+
setting = {SETTING_SECTION_GB, "Gameboy_P4_Rom", std::string("")};
298298
break;
299299
case SettingsID::Core_Gameboy_P4_Save:
300-
setting = {SETTING_SECTION_GB, "Gameboy_P4_Save", ""};
300+
setting = {SETTING_SECTION_GB, "Gameboy_P4_Save", std::string("")};
301301
break;
302302

303303
case SettingsID::Game_OverrideSettings:
@@ -330,171 +330,171 @@ static l_Setting get_setting(SettingsID settingId)
330330
break;
331331

332332
case SettingsID::Game_GFX_Plugin:
333-
setting = {"", "GFX_Plugin", ""};
333+
setting = {"", "GFX_Plugin", std::string("")};
334334
break;
335335
case SettingsID::Game_AUDIO_Plugin:
336-
setting = {"", "AUDIO_Plugin", ""};
336+
setting = {"", "AUDIO_Plugin", std::string("")};
337337
break;
338338
case SettingsID::Game_INPUT_Plugin:
339-
setting = {"", "INPUT_Plugin", ""};
339+
setting = {"", "INPUT_Plugin", std::string("")};
340340
break;
341341
case SettingsID::Game_RSP_Plugin:
342-
setting = {"", "RSP_Plugin", ""};
342+
setting = {"", "RSP_Plugin", std::string("")};
343343
break;
344344

345345
case SettingsID::KeyBinding_RemoveDuplicates:
346346
setting = {SETTING_SECTION_KEYBIND, "RemoveDuplicates", true};
347347
break;
348348
case SettingsID::KeyBinding_StartROM:
349-
setting = {SETTING_SECTION_KEYBIND, "StartROM", "Ctrl+O"};
349+
setting = {SETTING_SECTION_KEYBIND, "StartROM", std::string("Ctrl+O")};
350350
break;
351351
case SettingsID::KeyBinding_StartCombo:
352-
setting = {SETTING_SECTION_KEYBIND, "StartCombo", "Ctrl+Shift+O"};
352+
setting = {SETTING_SECTION_KEYBIND, "StartCombo", std::string("Ctrl+Shift+O")};
353353
break;
354354
case SettingsID::KeyBinding_Shutdown:
355-
setting = {SETTING_SECTION_KEYBIND, "Shutdown", "F12"};
355+
setting = {SETTING_SECTION_KEYBIND, "Shutdown", std::string("F12")};
356356
break;
357357
case SettingsID::KeyBinding_RefreshROMList:
358-
setting = {SETTING_SECTION_KEYBIND, "RefreshROMList", "F5"};
358+
setting = {SETTING_SECTION_KEYBIND, "RefreshROMList", std::string("F5")};
359359
break;
360360
case SettingsID::KeyBinding_Exit:
361-
setting = {SETTING_SECTION_KEYBIND, "Exit", "Alt+F4"};
361+
setting = {SETTING_SECTION_KEYBIND, "Exit", std::string("Alt+F4")};
362362
break;
363363
case SettingsID::KeyBinding_SoftReset:
364-
setting = {SETTING_SECTION_KEYBIND, "SoftReset", "F1"};
364+
setting = {SETTING_SECTION_KEYBIND, "SoftReset", std::string("F1")};
365365
break;
366366
case SettingsID::KeyBinding_HardReset:
367-
setting = {SETTING_SECTION_KEYBIND, "HardReset", "Shift+F1"};
367+
setting = {SETTING_SECTION_KEYBIND, "HardReset", std::string("Shift+F1")};
368368
break;
369369
case SettingsID::KeyBinding_Resume:
370-
setting = {SETTING_SECTION_KEYBIND, "Resume", "F2"};
370+
setting = {SETTING_SECTION_KEYBIND, "Resume", std::string("F2")};
371371
break;
372372
case SettingsID::KeyBinding_Screenshot:
373-
setting = {SETTING_SECTION_KEYBIND, "Screenshot", "F3"};
373+
setting = {SETTING_SECTION_KEYBIND, "Screenshot", std::string("F3")};
374374
break;
375375
case SettingsID::KeyBinding_LimitFPS:
376-
setting = {SETTING_SECTION_KEYBIND, "LimitFPS", "F4"};
376+
setting = {SETTING_SECTION_KEYBIND, "LimitFPS", std::string("F4")};
377377
break;
378378
case SettingsID::KeyBinding_SpeedFactor25:
379-
setting = {SETTING_SECTION_KEYBIND, "SpeedFactor25", "Alt+0"};
379+
setting = {SETTING_SECTION_KEYBIND, "SpeedFactor25", std::string("Alt+0")};
380380
break;
381381
case SettingsID::KeyBinding_SpeedFactor50:
382-
setting = {SETTING_SECTION_KEYBIND, "SpeedFactor50", "Alt+1"};
382+
setting = {SETTING_SECTION_KEYBIND, "SpeedFactor50", std::string("Alt+1")};
383383
break;
384384
case SettingsID::KeyBinding_SpeedFactor75:
385-
setting = {SETTING_SECTION_KEYBIND, "SpeedFactor75", "Alt+2"};
385+
setting = {SETTING_SECTION_KEYBIND, "SpeedFactor75", std::string("Alt+2")};
386386
break;
387387
case SettingsID::KeyBinding_SpeedFactor100:
388-
setting = {SETTING_SECTION_KEYBIND, "SpeedFactor100", "Alt+3"};
388+
setting = {SETTING_SECTION_KEYBIND, "SpeedFactor100", std::string("Alt+3")};
389389
break;
390390
case SettingsID::KeyBinding_SpeedFactor125:
391-
setting = {SETTING_SECTION_KEYBIND, "SpeedFactor125", "Alt+4"};
391+
setting = {SETTING_SECTION_KEYBIND, "SpeedFactor125", std::string("Alt+4")};
392392
break;
393393
case SettingsID::KeyBinding_SpeedFactor150:
394-
setting = {SETTING_SECTION_KEYBIND, "SpeedFactor150", "Alt+5"};
394+
setting = {SETTING_SECTION_KEYBIND, "SpeedFactor150", std::string("Alt+5")};
395395
break;
396396
case SettingsID::KeyBinding_SpeedFactor175:
397-
setting = {SETTING_SECTION_KEYBIND, "SpeedFactor175", "Alt+6"};
397+
setting = {SETTING_SECTION_KEYBIND, "SpeedFactor175", std::string("Alt+6")};
398398
break;
399399
case SettingsID::KeyBinding_SpeedFactor200:
400-
setting = {SETTING_SECTION_KEYBIND, "SpeedFactor200", "Alt+7"};
400+
setting = {SETTING_SECTION_KEYBIND, "SpeedFactor200", std::string("Alt+7")};
401401
break;
402402
case SettingsID::KeyBinding_SpeedFactor225:
403-
setting = {SETTING_SECTION_KEYBIND, "SpeedFactor225", "Alt+8"};
403+
setting = {SETTING_SECTION_KEYBIND, "SpeedFactor225", std::string("Alt+8")};
404404
break;
405405
case SettingsID::KeyBinding_SpeedFactor250:
406-
setting = {SETTING_SECTION_KEYBIND, "SpeedFactor250", "Alt+9"};
406+
setting = {SETTING_SECTION_KEYBIND, "SpeedFactor250", std::string("Alt+9")};
407407
break;
408408
case SettingsID::KeyBinding_SpeedFactor275:
409-
setting = {SETTING_SECTION_KEYBIND, "SpeedFactor275", "Alt+["};
409+
setting = {SETTING_SECTION_KEYBIND, "SpeedFactor275", std::string("Alt+[")};
410410
break;
411411
case SettingsID::KeyBinding_SpeedFactor300:
412-
setting = {SETTING_SECTION_KEYBIND, "SpeedFactor300", "Alt+]"};
412+
setting = {SETTING_SECTION_KEYBIND, "SpeedFactor300", std::string("Alt+]")};
413413
break;
414414
case SettingsID::KeyBinding_SaveState:
415-
setting = {SETTING_SECTION_KEYBIND, "SaveState", "F5"};
415+
setting = {SETTING_SECTION_KEYBIND, "SaveState", std::string("F5")};
416416
break;
417417
case SettingsID::KeyBinding_SaveAs:
418-
setting = {SETTING_SECTION_KEYBIND, "SaveAs", "Ctrl+S"};
418+
setting = {SETTING_SECTION_KEYBIND, "SaveAs", std::string("Ctrl+S")};
419419
break;
420420
case SettingsID::KeyBinding_LoadState:
421-
setting = {SETTING_SECTION_KEYBIND, "LoadState", "F7"};
421+
setting = {SETTING_SECTION_KEYBIND, "LoadState", std::string("F7")};
422422
break;
423423
case SettingsID::KeyBinding_Load:
424-
setting = {SETTING_SECTION_KEYBIND, "Load", "Ctrl+L"};
424+
setting = {SETTING_SECTION_KEYBIND, "Load", std::string("Ctrl+L")};
425425
break;
426426
case SettingsID::KeyBinding_Cheats:
427-
setting = {SETTING_SECTION_KEYBIND, "Cheats", "Ctrl+C"};
427+
setting = {SETTING_SECTION_KEYBIND, "Cheats", std::string("Ctrl+C")};
428428
break;
429429
case SettingsID::KeyBinding_GSButton:
430-
setting = {SETTING_SECTION_KEYBIND, "GSButton", "F9"};
430+
setting = {SETTING_SECTION_KEYBIND, "GSButton", std::string("F9")};
431431
break;
432432
case SettingsID::KeyBinding_SaveStateSlot0:
433-
setting = {SETTING_SECTION_KEYBIND, "SaveStateSlot0", "Ctrl+0"};
433+
setting = {SETTING_SECTION_KEYBIND, "SaveStateSlot0", std::string("Ctrl+0")};
434434
break;
435435
case SettingsID::KeyBinding_SaveStateSlot1:
436-
setting = {SETTING_SECTION_KEYBIND, "SaveStateSlot1", "Ctrl+1"};
436+
setting = {SETTING_SECTION_KEYBIND, "SaveStateSlot1", std::string("Ctrl+1")};
437437
break;
438438
case SettingsID::KeyBinding_SaveStateSlot2:
439-
setting = {SETTING_SECTION_KEYBIND, "SaveStateSlot2", "Ctrl+2"};
439+
setting = {SETTING_SECTION_KEYBIND, "SaveStateSlot2", std::string("Ctrl+2")};
440440
break;
441441
case SettingsID::KeyBinding_SaveStateSlot3:
442-
setting = {SETTING_SECTION_KEYBIND, "SaveStateSlot3", "Ctrl+3"};
442+
setting = {SETTING_SECTION_KEYBIND, "SaveStateSlot3", std::string("Ctrl+3")};
443443
break;
444444
case SettingsID::KeyBinding_SaveStateSlot4:
445-
setting = {SETTING_SECTION_KEYBIND, "SaveStateSlot4", "Ctrl+4"};
445+
setting = {SETTING_SECTION_KEYBIND, "SaveStateSlot4", std::string("Ctrl+4")};
446446
break;
447447
case SettingsID::KeyBinding_SaveStateSlot5:
448-
setting = {SETTING_SECTION_KEYBIND, "SaveStateSlot5", "Ctrl+5"};
448+
setting = {SETTING_SECTION_KEYBIND, "SaveStateSlot5", std::string("Ctrl+5")};
449449
break;
450450
case SettingsID::KeyBinding_SaveStateSlot6:
451-
setting = {SETTING_SECTION_KEYBIND, "SaveStateSlot6", "Ctrl+6"};
451+
setting = {SETTING_SECTION_KEYBIND, "SaveStateSlot6", std::string("Ctrl+6")};
452452
break;
453453
case SettingsID::KeyBinding_SaveStateSlot7:
454-
setting = {SETTING_SECTION_KEYBIND, "SaveStateSlot7", "Ctrl+7"};
454+
setting = {SETTING_SECTION_KEYBIND, "SaveStateSlot7", std::string("Ctrl+7")};
455455
break;
456456
case SettingsID::KeyBinding_SaveStateSlot8:
457-
setting = {SETTING_SECTION_KEYBIND, "SaveStateSlot8", "Ctrl+8"};
457+
setting = {SETTING_SECTION_KEYBIND, "SaveStateSlot8", std::string("Ctrl+8")};
458458
break;
459459
case SettingsID::KeyBinding_SaveStateSlot9:
460-
setting = {SETTING_SECTION_KEYBIND, "SaveStateSlot9", "Ctrl+9"};
460+
setting = {SETTING_SECTION_KEYBIND, "SaveStateSlot9", std::string("Ctrl+9")};
461461
break;
462462
case SettingsID::KeyBinding_Fullscreen:
463-
setting = {SETTING_SECTION_KEYBIND, "Fullscreen", "Alt+Return"};
463+
setting = {SETTING_SECTION_KEYBIND, "Fullscreen", std::string("Alt+Return")};
464464
break;
465465
case SettingsID::Keybinding_ViewLog:
466-
setting = {SETTING_SECTION_KEYBIND, "ViewLog", "Ctrl+L"};
466+
setting = {SETTING_SECTION_KEYBIND, "ViewLog", std::string("Ctrl+L")};
467467
break;
468468
case SettingsID::KeyBinding_GraphicsSettings:
469-
setting = {SETTING_SECTION_KEYBIND, "GraphicsSettings", "Ctrl+G"};
469+
setting = {SETTING_SECTION_KEYBIND, "GraphicsSettings", std::string("Ctrl+G")};
470470
break;
471471
case SettingsID::KeyBinding_AudioSettings:
472-
setting = {SETTING_SECTION_KEYBIND, "AudioSettings", "Ctrl+A"};
472+
setting = {SETTING_SECTION_KEYBIND, "AudioSettings", std::string("Ctrl+A")};
473473
break;
474474
case SettingsID::KeyBinding_RspSettings:
475-
setting = {SETTING_SECTION_KEYBIND, "RspSettings", "Ctrl+R"};
475+
setting = {SETTING_SECTION_KEYBIND, "RspSettings", std::string("Ctrl+R")};
476476
break;
477477
case SettingsID::KeyBinding_InputSettings:
478-
setting = {SETTING_SECTION_KEYBIND, "InputSettings", "Ctrl+I"};
478+
setting = {SETTING_SECTION_KEYBIND, "InputSettings", std::string("Ctrl+I")};
479479
break;
480480
case SettingsID::KeyBinding_Settings:
481-
setting = {SETTING_SECTION_KEYBIND, "Settings", "Ctrl+T"};
481+
setting = {SETTING_SECTION_KEYBIND, "Settings", std::string("Ctrl+T")};
482482
break;
483483
case SettingsID::KeyBinding_IncreaseVolume:
484-
setting = {SETTING_SECTION_KEYBIND, "IncreaseVolume", ""};
484+
setting = {SETTING_SECTION_KEYBIND, "IncreaseVolume", std::string("")};
485485
break;
486486
case SettingsID::KeyBinding_DecreaseVolume:
487-
setting = {SETTING_SECTION_KEYBIND, "DecreaseVolume", ""};
487+
setting = {SETTING_SECTION_KEYBIND, "DecreaseVolume", std::string("")};
488488
break;
489489
case SettingsID::KeyBinding_ToggleMuteVolume:
490-
setting = {SETTING_SECTION_KEYBIND, "ToggleMuteVolume", ""};
490+
setting = {SETTING_SECTION_KEYBIND, "ToggleMuteVolume", std::string("")};
491491
break;
492492

493493
case SettingsID::RomBrowser_Directory:
494-
setting = {SETTING_SECTION_ROMBROWSER, "Directory", ""};
494+
setting = {SETTING_SECTION_ROMBROWSER, "Directory", std::string("")};
495495
break;
496496
case SettingsID::RomBrowser_Geometry:
497-
setting = {SETTING_SECTION_ROMBROWSER, "Geometry", ""};
497+
setting = {SETTING_SECTION_ROMBROWSER, "Geometry", std::string("")};
498498
break;
499499
case SettingsID::RomBrowser_Maximized:
500500
setting = {SETTING_SECTION_ROMBROWSER, "Maximized", false};
@@ -593,7 +593,7 @@ static l_Setting get_setting(SettingsID settingId)
593593

594594

595595
case SettingsID::Input_Profiles:
596-
setting = {SETTING_SECTION_INPUT, "Profiles", ""};
596+
setting = {SETTING_SECTION_INPUT, "Profiles", std::string("")};
597597
break;
598598
case SettingsID::Input_UseProfile:
599599
setting = {"", "UseProfile"};

0 commit comments

Comments
 (0)