From 972f1513108f9922f6923262f534daf6361dd11d Mon Sep 17 00:00:00 2001 From: Squall Leonhart Date: Sun, 24 Oct 2021 14:38:28 +1100 Subject: [PATCH] Enable GB colorization hack support in GUI. This is used by some hacked ROMs like Metroid II DX. Add a config variable to enable the already existent core support for this. This conflicts with using a GB BIOS file, add checks and error dialogs for this. Also move including "ConfigManager.h" into "wxvbam.h". Signed-off-by: Rafael Kitover --- po/wxvbam/wxvbam.pot | 594 ++++++++++++++++++----------------- src/common/ConfigManager.cpp | 3 + src/common/ConfigManager.h | 1 + src/wx/cmdevents.cpp | 29 +- src/wx/dsound.cpp | 1 - src/wx/faudio.cpp | 1 - src/wx/guiinit.cpp | 2 +- src/wx/openal.cpp | 1 - src/wx/opts.cpp | 3 +- src/wx/panel.cpp | 14 +- src/wx/sys.cpp | 1 - src/wx/viewsupt.cpp | 1 - src/wx/wxvbam.cpp | 1 - src/wx/wxvbam.h | 9 +- src/wx/xaudio2.cpp | 1 - src/wx/xrc/MainMenu.xrc | 6 +- 16 files changed, 363 insertions(+), 305 deletions(-) diff --git a/po/wxvbam/wxvbam.pot b/po/wxvbam/wxvbam.pot index e8c3b710..6c58567f 100644 --- a/po/wxvbam/wxvbam.pot +++ b/po/wxvbam/wxvbam.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-12-05 11:34+0000\n" +"POT-Creation-Date: 2021-11-24 21:24+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -17,55 +17,55 @@ msgstr "" "Content-Type: text/plain; charset=CHARSET\n" "Content-Transfer-Encoding: 8bit\n" -#: wxvbam.cpp:226 +#: wxvbam.cpp:225 msgid "visualboyadvance-m" msgstr "" -#: wxvbam.cpp:443 +#: wxvbam.cpp:442 msgid "Could not create main window" msgstr "" -#: wxvbam.cpp:514 +#: wxvbam.cpp:513 msgid "Save built-in XRC file and exit" msgstr "" -#: wxvbam.cpp:517 +#: wxvbam.cpp:516 msgid "Save built-in vba-over.ini and exit" msgstr "" -#: wxvbam.cpp:520 +#: wxvbam.cpp:519 msgid "Print configuration path and exit" msgstr "" -#: wxvbam.cpp:523 +#: wxvbam.cpp:522 msgid "Start in full-screen mode" msgstr "" -#: wxvbam.cpp:526 +#: wxvbam.cpp:525 msgid "Set a configuration file" msgstr "" -#: wxvbam.cpp:530 +#: wxvbam.cpp:529 msgid "Delete shared link state first, if it exists" msgstr "" -#: wxvbam.cpp:537 +#: wxvbam.cpp:536 msgid "List all settable options and exit" msgstr "" -#: wxvbam.cpp:540 +#: wxvbam.cpp:539 msgid "ROM file" msgstr "" -#: wxvbam.cpp:542 +#: wxvbam.cpp:541 msgid "=" msgstr "" -#: wxvbam.cpp:573 +#: wxvbam.cpp:572 msgid "Configuration/build error: can't find built-in xrc" msgstr "" -#: wxvbam.cpp:581 +#: wxvbam.cpp:580 #, c-format msgid "" "Wrote built-in configuration to %s.\n" @@ -74,11 +74,11 @@ msgid "" "built-in:" msgstr "" -#: wxvbam.cpp:596 +#: wxvbam.cpp:595 msgid "Configuration is read from, in order:" msgstr "" -#: wxvbam.cpp:610 +#: wxvbam.cpp:609 #, c-format msgid "" "Wrote built-in override file to %s\n" @@ -86,13 +86,13 @@ msgid "" "from search path:" msgstr "" -#: wxvbam.cpp:616 +#: wxvbam.cpp:615 msgid "" "\n" "\tbuilt-in" msgstr "" -#: wxvbam.cpp:627 +#: wxvbam.cpp:626 msgid "" "Options set from the command line are saved if any configuration changes are " "made in the user interface.\n" @@ -101,217 +101,217 @@ msgid "" "\n" msgstr "" -#: wxvbam.cpp:648 +#: wxvbam.cpp:647 msgid "" "The commands available for the Keyboard/* option are:\n" "\n" msgstr "" -#: wxvbam.cpp:660 +#: wxvbam.cpp:659 msgid "Configuration file not found." msgstr "" -#: wxvbam.cpp:693 +#: wxvbam.cpp:692 msgid "Bad configuration option or multiple ROM files given:\n" msgstr "" -#: guiinit.cpp:81 +#: guiinit.cpp:80 msgid "Start!" msgstr "" -#: guiinit.cpp:100 xrc/NetLink.xrc:99 +#: guiinit.cpp:99 xrc/NetLink.xrc:99 msgid "Connect" msgstr "" -#: guiinit.cpp:117 +#: guiinit.cpp:116 msgid "You must enter a valid host name" msgstr "" -#: guiinit.cpp:118 +#: guiinit.cpp:117 msgid "Host name invalid" msgstr "" -#: guiinit.cpp:136 +#: guiinit.cpp:135 msgid "Waiting for clients..." msgstr "" -#: guiinit.cpp:137 +#: guiinit.cpp:136 #, c-format msgid "Server IP address is: %s\n" msgstr "" -#: guiinit.cpp:139 +#: guiinit.cpp:138 msgid "Waiting for connection..." msgstr "" -#: guiinit.cpp:140 +#: guiinit.cpp:139 #, c-format msgid "Connecting to %s\n" msgstr "" -#: guiinit.cpp:173 +#: guiinit.cpp:172 msgid "" "Error occurred.\n" "Please try again." msgstr "" -#: guiinit.cpp:240 guiinit.cpp:293 +#: guiinit.cpp:239 guiinit.cpp:292 msgid "Select cheat file" msgstr "" -#: guiinit.cpp:241 +#: guiinit.cpp:240 msgid "VBA cheat lists (*.clt)|*.clt|CHT cheat lists (*.cht)|*.cht" msgstr "" -#: guiinit.cpp:260 panel.cpp:437 +#: guiinit.cpp:259 panel.cpp:447 msgid "Loaded cheats" msgstr "" -#: guiinit.cpp:294 +#: guiinit.cpp:293 msgid "VBA cheat lists (*.clt)|*.clt" msgstr "" -#: guiinit.cpp:312 +#: guiinit.cpp:311 msgid "Saved cheats" msgstr "" -#: guiinit.cpp:343 guiinit.cpp:362 +#: guiinit.cpp:342 guiinit.cpp:361 msgid "Restore old values?" msgstr "" -#: guiinit.cpp:344 guiinit.cpp:363 +#: guiinit.cpp:343 guiinit.cpp:362 msgid "Removing cheats" msgstr "" -#: guiinit.cpp:754 xrc/JoyPanel.xrc:364 +#: guiinit.cpp:753 xrc/JoyPanel.xrc:364 msgid "GameShark" msgstr "" -#: guiinit.cpp:755 cmdevents.cpp:676 +#: guiinit.cpp:754 cmdevents.cpp:675 msgid "GameGenie" msgstr "" -#: guiinit.cpp:757 +#: guiinit.cpp:756 msgid "Generic Code" msgstr "" -#: guiinit.cpp:758 +#: guiinit.cpp:757 msgid "GameShark Advance" msgstr "" -#: guiinit.cpp:759 +#: guiinit.cpp:758 msgid "CodeBreaker Advance" msgstr "" -#: guiinit.cpp:760 +#: guiinit.cpp:759 msgid "Flashcart CHT" msgstr "" -#: guiinit.cpp:828 guiinit.cpp:1083 +#: guiinit.cpp:827 guiinit.cpp:1082 msgid "Number cannot be empty" msgstr "" -#: guiinit.cpp:866 +#: guiinit.cpp:865 #, c-format msgid "Search produced %d results. Please refine better" msgstr "" -#: guiinit.cpp:878 +#: guiinit.cpp:877 msgid "Search produced no results" msgstr "" -#: guiinit.cpp:1041 +#: guiinit.cpp:1040 msgid "8-bit " msgstr "" -#: guiinit.cpp:1045 +#: guiinit.cpp:1044 msgid "16-bit " msgstr "" -#: guiinit.cpp:1049 +#: guiinit.cpp:1048 msgid "32-bit " msgstr "" -#: guiinit.cpp:1055 +#: guiinit.cpp:1054 msgid "signed decimal" msgstr "" -#: guiinit.cpp:1059 +#: guiinit.cpp:1058 msgid "unsigned decimal" msgstr "" -#: guiinit.cpp:1063 +#: guiinit.cpp:1062 msgid "unsigned hexadecimal" msgstr "" -#: guiinit.cpp:1541 +#: guiinit.cpp:1540 #, c-format msgid "%d frames = %.2f ms" msgstr "" -#: guiinit.cpp:1553 +#: guiinit.cpp:1552 msgid "Default device" msgstr "" -#: guiinit.cpp:1727 +#: guiinit.cpp:1726 msgid "Desktop mode" msgstr "" -#: guiinit.cpp:1734 +#: guiinit.cpp:1733 #, c-format msgid "%d x %d - %dbpp @ %dHz" msgstr "" -#: guiinit.cpp:1847 cmdevents.cpp:746 xrc/DisplayConfig.xrc:85 +#: guiinit.cpp:1846 cmdevents.cpp:745 xrc/DisplayConfig.xrc:85 #: xrc/DisplayConfig.xrc:135 xrc/DisplayConfig.xrc:221 #: xrc/GameBoyAdvanceConfig.xrc:32 xrc/GameBoyAdvanceConfig.xrc:204 #: xrc/SoundConfig.xrc:219 xrc/SoundConfig.xrc:309 msgid "None" msgstr "" -#: guiinit.cpp:1888 +#: guiinit.cpp:1887 #, c-format msgid "No usable rpi plugins found in %s" msgstr "" -#: guiinit.cpp:1908 xrc/DisplayConfig.xrc:107 +#: guiinit.cpp:1907 xrc/DisplayConfig.xrc:107 msgid "Plugin" msgstr "" -#: guiinit.cpp:1936 +#: guiinit.cpp:1935 msgid "Please select a plugin or a different filter" msgstr "" -#: guiinit.cpp:1937 +#: guiinit.cpp:1936 msgid "Plugin selection error" msgstr "" -#: guiinit.cpp:2150 +#: guiinit.cpp:2149 msgid "This will clear all user-defined accelerators. Are you sure?" msgstr "" -#: guiinit.cpp:2150 +#: guiinit.cpp:2149 msgid "Confirm" msgstr "" -#: guiinit.cpp:2740 +#: guiinit.cpp:2739 msgid "Main icon not found" msgstr "" -#: guiinit.cpp:2750 +#: guiinit.cpp:2749 msgid "Browse" msgstr "" -#: guiinit.cpp:2764 +#: guiinit.cpp:2763 msgid "Main display panel not found" msgstr "" -#: guiinit.cpp:2929 +#: guiinit.cpp:2928 #, c-format msgid "Duplicate menu accelerator: %s for %s and %s; keeping first" msgstr "" -#: guiinit.cpp:2943 +#: guiinit.cpp:2942 #, c-format msgid "Menu accelerator %s for %s overrides default for %s ; keeping menu" msgstr "" @@ -358,8 +358,8 @@ msgid "Text files (*.txt;*.log)|*.txt;*.log|" msgstr "" #: viewers.cpp:562 viewers.cpp:772 gfxviewers.cpp:1600 gfxviewers.cpp:1742 -#: cmdevents.cpp:1158 cmdevents.cpp:1236 cmdevents.cpp:1306 cmdevents.cpp:1333 -#: viewsupt.cpp:1181 +#: cmdevents.cpp:1157 cmdevents.cpp:1235 cmdevents.cpp:1305 cmdevents.cpp:1332 +#: viewsupt.cpp:1180 msgid "Select output file" msgstr "" @@ -445,11 +445,11 @@ msgid "" "Table (*.act)|*.act" msgstr "" -#: gfxviewers.cpp:1601 gfxviewers.cpp:1743 cmdevents.cpp:1159 viewsupt.cpp:1182 +#: gfxviewers.cpp:1601 gfxviewers.cpp:1743 cmdevents.cpp:1158 viewsupt.cpp:1181 msgid "PNG images|*.png|BMP images|*.bmp" msgstr "" -#: cmdevents.cpp:105 +#: cmdevents.cpp:104 msgid "" "GameBoy Advance Files (*.agb;*.gba;*.bin;*.elf;*.mb;*.zip;*.7z;*.rar)|*.agb;" "*.gba;*.bin;*.elf;*.mb;*.agb.gz;*.gba.gz;*.bin.gz;*.elf.gz;*.mb.gz;*.agb.z;*." @@ -459,371 +459,375 @@ msgid "" "*.7z;*.rar|" msgstr "" -#: cmdevents.cpp:117 +#: cmdevents.cpp:116 msgid "Open ROM file" msgstr "" -#: cmdevents.cpp:134 +#: cmdevents.cpp:133 msgid "" "GameBoy Files (*.dmg;*.gb;*.gbc;*.cgb;*.sgb;*.zip;*.7z;*.rar)|*.dmg;*.gb;*." "gbc;*.cgb;*.sgb;*.dmg.gz;*.gb.gz;*.gbc.gz;*.cgb.gz;*.sgb.gz;*.dmg.z;*.gb.z;*." "gbc.z;*.cgb.z;*.sgb.z;*.zip;*.7z;*.rar|" msgstr "" -#: cmdevents.cpp:141 +#: cmdevents.cpp:140 msgid "Open GB ROM file" msgstr "" -#: cmdevents.cpp:158 +#: cmdevents.cpp:157 msgid "" "GameBoy Color Files (*.dmg;*.gb;*.gbc;*.cgb;*.sgb;*.zip;*.7z;*.rar)|*.dmg;*." "gb;*.gbc;*.cgb;*.sgb;*.dmg.gz;*.gb.gz;*.gbc.gz;*.cgb.gz;*.sgb.gz;*.dmg.z;*." "gb.z;*.gbc.z;*.cgb.z;*.sgb.z;*.zip;*.7z;*.rar|" msgstr "" -#: cmdevents.cpp:165 +#: cmdevents.cpp:164 msgid "Open GBC ROM file" msgstr "" -#: cmdevents.cpp:584 cmdevents.cpp:700 cmdevents.cpp:739 cmdevents.cpp:812 +#: cmdevents.cpp:583 cmdevents.cpp:699 cmdevents.cpp:738 cmdevents.cpp:811 msgid "Unknown" msgstr "" -#: cmdevents.cpp:592 +#: cmdevents.cpp:591 msgid "ROM" msgstr "" -#: cmdevents.cpp:596 +#: cmdevents.cpp:595 msgid "ROM+MBC1" msgstr "" -#: cmdevents.cpp:600 +#: cmdevents.cpp:599 msgid "ROM+MBC1+RAM" msgstr "" -#: cmdevents.cpp:604 +#: cmdevents.cpp:603 msgid "ROM+MBC1+RAM+BATT" msgstr "" -#: cmdevents.cpp:608 +#: cmdevents.cpp:607 msgid "ROM+MBC2" msgstr "" -#: cmdevents.cpp:612 +#: cmdevents.cpp:611 msgid "ROM+MBC2+BATT" msgstr "" -#: cmdevents.cpp:616 +#: cmdevents.cpp:615 msgid "ROM+MMM01" msgstr "" -#: cmdevents.cpp:620 +#: cmdevents.cpp:619 msgid "ROM+MMM01+RAM" msgstr "" -#: cmdevents.cpp:624 +#: cmdevents.cpp:623 msgid "ROM+MMM01+RAM+BATT" msgstr "" -#: cmdevents.cpp:628 +#: cmdevents.cpp:627 msgid "ROM+MBC3+TIMER+BATT" msgstr "" -#: cmdevents.cpp:632 +#: cmdevents.cpp:631 msgid "ROM+MBC3+TIMER+RAM+BATT" msgstr "" -#: cmdevents.cpp:636 +#: cmdevents.cpp:635 msgid "ROM+MBC3" msgstr "" -#: cmdevents.cpp:640 +#: cmdevents.cpp:639 msgid "ROM+MBC3+RAM" msgstr "" -#: cmdevents.cpp:644 +#: cmdevents.cpp:643 msgid "ROM+MBC3+RAM+BATT" msgstr "" -#: cmdevents.cpp:648 +#: cmdevents.cpp:647 msgid "ROM+MBC5" msgstr "" -#: cmdevents.cpp:652 +#: cmdevents.cpp:651 msgid "ROM+MBC5+RAM" msgstr "" -#: cmdevents.cpp:656 +#: cmdevents.cpp:655 msgid "ROM+MBC5+RAM+BATT" msgstr "" -#: cmdevents.cpp:660 +#: cmdevents.cpp:659 msgid "ROM+MBC5+RUMBLE" msgstr "" -#: cmdevents.cpp:664 +#: cmdevents.cpp:663 msgid "ROM+MBC5+RUMBLE+RAM" msgstr "" -#: cmdevents.cpp:668 +#: cmdevents.cpp:667 msgid "ROM+MBC5+RUMBLE+RAM+BATT" msgstr "" -#: cmdevents.cpp:672 +#: cmdevents.cpp:671 msgid "ROM+MBC7+BATT" msgstr "" -#: cmdevents.cpp:680 +#: cmdevents.cpp:679 msgid "GameShark V3.0" msgstr "" -#: cmdevents.cpp:684 +#: cmdevents.cpp:683 msgid "ROM+POCKET CAMERA" msgstr "" -#: cmdevents.cpp:688 +#: cmdevents.cpp:687 msgid "ROM+BANDAI TAMA5" msgstr "" -#: cmdevents.cpp:692 +#: cmdevents.cpp:691 msgid "ROM+HuC-3" msgstr "" -#: cmdevents.cpp:696 +#: cmdevents.cpp:695 msgid "ROM+HuC-1" msgstr "" -#: cmdevents.cpp:848 cmdevents.cpp:870 +#: cmdevents.cpp:847 cmdevents.cpp:869 msgid "Select Dot Code file" msgstr "" -#: cmdevents.cpp:850 cmdevents.cpp:872 +#: cmdevents.cpp:849 cmdevents.cpp:871 msgid "e-Reader Dot Code (*.bin;*.raw)|*.bin;*.raw" msgstr "" -#: cmdevents.cpp:891 cmdevents.cpp:1086 +#: cmdevents.cpp:890 cmdevents.cpp:1085 msgid "Select battery file" msgstr "" -#: cmdevents.cpp:892 cmdevents.cpp:1087 +#: cmdevents.cpp:891 cmdevents.cpp:1086 msgid "Battery file (*.sav)|*.sav|Flash save (*.dat)|*.dat" msgstr "" -#: cmdevents.cpp:900 +#: cmdevents.cpp:899 msgid "" "Importing a battery file will erase any saved games (permanently after the " "next write). Do you want to continue?" msgstr "" -#: cmdevents.cpp:901 cmdevents.cpp:929 cmdevents.cpp:1049 +#: cmdevents.cpp:900 cmdevents.cpp:928 cmdevents.cpp:1048 msgid "Confirm import" msgstr "" -#: cmdevents.cpp:907 panel.cpp:380 +#: cmdevents.cpp:906 panel.cpp:390 #, c-format msgid "Loaded battery %s" msgstr "" -#: cmdevents.cpp:909 +#: cmdevents.cpp:908 #, c-format msgid "Error loading battery %s" msgstr "" -#: cmdevents.cpp:918 +#: cmdevents.cpp:917 msgid "Select code file" msgstr "" -#: cmdevents.cpp:919 +#: cmdevents.cpp:918 msgid "Gameshark Code File (*.spc;*.xpc)|*.spc;*.xpc" msgstr "" -#: cmdevents.cpp:919 +#: cmdevents.cpp:918 msgid "Gameshark Code File (*.gcf)|*.gcf" msgstr "" -#: cmdevents.cpp:928 +#: cmdevents.cpp:927 msgid "" "Importing a code file will replace any loaded cheats. Do you want to " "continue?" msgstr "" -#: cmdevents.cpp:945 +#: cmdevents.cpp:944 #, c-format msgid "Cannot open file %s" msgstr "" -#: cmdevents.cpp:955 +#: cmdevents.cpp:954 #, c-format msgid "Unsupported code file %s" msgstr "" -#: cmdevents.cpp:1025 +#: cmdevents.cpp:1024 #, c-format msgid "Loaded code file %s" msgstr "" -#: cmdevents.cpp:1027 +#: cmdevents.cpp:1026 #, c-format msgid "Error loading code file %s" msgstr "" -#: cmdevents.cpp:1038 cmdevents.cpp:1114 +#: cmdevents.cpp:1037 cmdevents.cpp:1113 msgid "Select snapshot file" msgstr "" -#: cmdevents.cpp:1039 +#: cmdevents.cpp:1038 msgid "" "GS & PAC Snapshots (*.sps;*.xps)|*.sps;*.xps|GameShark SP Snapshots (*.gsv)|" "*.gsv" msgstr "" -#: cmdevents.cpp:1039 +#: cmdevents.cpp:1038 msgid "Gameboy Snapshot (*.gbs)|*.gbs" msgstr "" -#: cmdevents.cpp:1048 +#: cmdevents.cpp:1047 msgid "" "Importing a snapshot file will erase any saved games (permanently after the " "next write). Do you want to continue?" msgstr "" -#: cmdevents.cpp:1073 +#: cmdevents.cpp:1072 #, c-format msgid "Loaded snapshot file %s" msgstr "" -#: cmdevents.cpp:1075 +#: cmdevents.cpp:1074 #, c-format msgid "Error loading snapshot file %s" msgstr "" -#: cmdevents.cpp:1098 +#: cmdevents.cpp:1097 #, c-format msgid "Wrote battery %s" msgstr "" -#: cmdevents.cpp:1100 panel.cpp:689 +#: cmdevents.cpp:1099 panel.cpp:699 #, c-format msgid "Error writing battery %s" msgstr "" -#: cmdevents.cpp:1108 +#: cmdevents.cpp:1107 msgid "EEPROM saves cannot be exported" msgstr "" -#: cmdevents.cpp:1115 +#: cmdevents.cpp:1114 msgid "Gameshark Snapshot (*.sps)|*.sps" msgstr "" -#: cmdevents.cpp:1129 +#: cmdevents.cpp:1128 msgid "Exported from VisualBoyAdvance-M" msgstr "" -#: cmdevents.cpp:1141 +#: cmdevents.cpp:1140 #, c-format msgid "Saved snapshot file %s" msgstr "" -#: cmdevents.cpp:1143 +#: cmdevents.cpp:1142 #, c-format msgid "Error saving snapshot file %s" msgstr "" -#: cmdevents.cpp:1183 sys.cpp:450 +#: cmdevents.cpp:1182 sys.cpp:449 #, c-format msgid "Wrote snapshot %s" msgstr "" -#: cmdevents.cpp:1204 cmdevents.cpp:1274 +#: cmdevents.cpp:1203 cmdevents.cpp:1273 msgid " files (" msgstr "" -#: cmdevents.cpp:1334 cmdevents.cpp:1355 +#: cmdevents.cpp:1333 cmdevents.cpp:1354 msgid "VBA Movie files|*.vmv" msgstr "" -#: cmdevents.cpp:1354 +#: cmdevents.cpp:1353 msgid "Select file" msgstr "" -#: cmdevents.cpp:1669 cmdevents.cpp:1762 +#: cmdevents.cpp:1668 cmdevents.cpp:1761 msgid "Select state file" msgstr "" -#: cmdevents.cpp:1670 cmdevents.cpp:1763 +#: cmdevents.cpp:1669 cmdevents.cpp:1762 msgid "VisualBoyAdvance saved game files|*.sgm" msgstr "" -#: cmdevents.cpp:1793 cmdevents.cpp:1803 cmdevents.cpp:1814 +#: cmdevents.cpp:1792 cmdevents.cpp:1802 cmdevents.cpp:1813 #, c-format msgid "Current state slot #%d" msgstr "" -#: cmdevents.cpp:2083 +#: cmdevents.cpp:1883 +msgid "Cannot use Colorizer Hack when GB BIOS File is enabled." +msgstr "" + +#: cmdevents.cpp:2098 msgid "Sound enabled" msgstr "" -#: cmdevents.cpp:2083 +#: cmdevents.cpp:2098 msgid "Sound disabled" msgstr "" -#: cmdevents.cpp:2096 cmdevents.cpp:2110 +#: cmdevents.cpp:2111 cmdevents.cpp:2125 #, c-format msgid "Volume: %d%%" msgstr "" -#: cmdevents.cpp:2185 +#: cmdevents.cpp:2200 msgid "Set to 0 for pseudo tty" msgstr "" -#: cmdevents.cpp:2187 +#: cmdevents.cpp:2202 msgid "Port to wait for connection:" msgstr "" -#: cmdevents.cpp:2188 +#: cmdevents.cpp:2203 msgid "GDB Connection" msgstr "" -#: cmdevents.cpp:2241 +#: cmdevents.cpp:2256 #, c-format msgid "Waiting for connection at %s" msgstr "" -#: cmdevents.cpp:2248 +#: cmdevents.cpp:2263 #, c-format msgid "Waiting for connection on port %d" msgstr "" -#: cmdevents.cpp:2251 +#: cmdevents.cpp:2266 msgid "Waiting for GDB..." msgstr "" -#: cmdevents.cpp:2666 -#, c-format -msgid "Using pixel filter #%d" -msgstr "" - #: cmdevents.cpp:2681 #, c-format +msgid "Using pixel filter #%d" +msgstr "" + +#: cmdevents.cpp:2696 +#, c-format msgid "Using interframe blending #%d" msgstr "" -#: cmdevents.cpp:2720 panel.cpp:193 panel.cpp:296 +#: cmdevents.cpp:2735 panel.cpp:192 panel.cpp:306 msgid "Could not initialize the sound driver!" msgstr "" -#: cmdevents.cpp:2824 +#: cmdevents.cpp:2839 msgid "Nintendo GameBoy (+Color+Advance) emulator." msgstr "" -#: cmdevents.cpp:2825 +#: cmdevents.cpp:2840 msgid "" "Copyright (C) 1999-2003 Forgotten\n" "Copyright (C) 2004-2006 VBA development team\n" "Copyright (C) 2007-2020 VBA-M development team" msgstr "" -#: cmdevents.cpp:2826 +#: cmdevents.cpp:2841 msgid "" "This program is free software: you can redistribute it and/or modify\n" "it under the terms of the GNU General Public License as published by\n" @@ -839,276 +843,286 @@ msgid "" "along with this program. If not, see http://www.gnu.org/licenses ." msgstr "" -#: cmdevents.cpp:3136 +#: cmdevents.cpp:3101 +msgid "Cannot use GB BIOS when Colorizer Hack is enabled." +msgstr "" + +#: cmdevents.cpp:3161 msgid "LAN link is already active. Disable link mode to disconnect." msgstr "" -#: cmdevents.cpp:3142 +#: cmdevents.cpp:3167 msgid "Network is not supported in local mode." msgstr "" -#: opts.cpp:563 opts.cpp:866 +#: opts.cpp:566 opts.cpp:869 #, c-format msgid "Invalid value %s for option %s; valid values are %s%s%s" msgstr "" -#: opts.cpp:580 opts.cpp:878 +#: opts.cpp:583 opts.cpp:881 #, c-format msgid "Invalid value %d for option %s; valid values are %d - %d" msgstr "" -#: opts.cpp:587 opts.cpp:596 opts.cpp:886 opts.cpp:894 +#: opts.cpp:590 opts.cpp:599 opts.cpp:889 opts.cpp:897 #, c-format msgid "Invalid value %f for option %s; valid values are %f - %f" msgstr "" -#: opts.cpp:656 opts.cpp:677 opts.cpp:962 opts.cpp:988 +#: opts.cpp:659 opts.cpp:680 opts.cpp:965 opts.cpp:991 #, c-format msgid "Invalid key binding %s for %s" msgstr "" -#: opts.cpp:849 +#: opts.cpp:852 #, c-format msgid "Invalid flag option %s - %s ignored" msgstr "" -#: sys.cpp:125 sys.cpp:181 +#: sys.cpp:124 sys.cpp:180 msgid "No game in progress to record" msgstr "" -#: sys.cpp:138 +#: sys.cpp:137 #, c-format msgid "Cannot open output file %s" msgstr "" -#: sys.cpp:145 sys.cpp:165 sys.cpp:311 +#: sys.cpp:144 sys.cpp:164 sys.cpp:310 msgid "Error writing game recording" msgstr "" -#: sys.cpp:186 +#: sys.cpp:185 msgid "Cannot play game recording while recording" msgstr "" -#: sys.cpp:199 +#: sys.cpp:198 #, c-format msgid "Cannot open recording file %s" msgstr "" -#: sys.cpp:206 sys.cpp:216 +#: sys.cpp:205 sys.cpp:215 msgid "Error reading game recording" msgstr "" -#: sys.cpp:322 +#: sys.cpp:321 msgid "Playback ended" msgstr "" -#: sys.cpp:341 +#: sys.cpp:340 #, c-format msgid "%d%%(%d, %d fps)" msgstr "" -#: sys.cpp:349 +#: sys.cpp:348 #, c-format msgid "%d%%" msgstr "" -#: sys.cpp:768 xrc/GBPrinter.xrc:65 +#: sys.cpp:767 xrc/GBPrinter.xrc:65 msgid "&Discard" msgstr "" -#: sys.cpp:802 +#: sys.cpp:801 msgid "Image files (*.bmp;*.jpg;*.png)|*.bmp;*.jpg;*.png|" msgstr "" -#: sys.cpp:811 +#: sys.cpp:810 msgid "Save printer image to" msgstr "" -#: sys.cpp:825 sys.cpp:1008 +#: sys.cpp:824 sys.cpp:1007 #, c-format msgid "Wrote printer output to %s" msgstr "" -#: sys.cpp:830 sys.cpp:901 +#: sys.cpp:829 sys.cpp:900 msgid "&Close" msgstr "" -#: sys.cpp:896 +#: sys.cpp:895 msgid "Printed" msgstr "" -#: sys.cpp:1198 +#: sys.cpp:1197 #, c-format msgid "Error opening pseudo tty: %s" msgstr "" -#: sys.cpp:1297 +#: sys.cpp:1296 #, c-format msgid "Error setting up server socket (%d)" msgstr "" -#: panel.cpp:107 +#: panel.cpp:106 #, c-format msgid "%s is not a valid ROM file" msgstr "" -#: panel.cpp:108 panel.cpp:169 panel.cpp:234 +#: panel.cpp:107 panel.cpp:168 panel.cpp:244 msgid "Problem loading file" msgstr "" -#: panel.cpp:168 +#: panel.cpp:167 #, c-format msgid "Unable to load Game Boy ROM %s" msgstr "" -#: panel.cpp:210 panel.cpp:310 +#: panel.cpp:204 +msgid "" +"Cannot use GB BIOS file when Colorizer Hack is enabled, disabling GB BIOS " +"file." +msgstr "" + +#: panel.cpp:220 panel.cpp:320 #, c-format msgid "Could not load BIOS %s" msgstr "" -#: panel.cpp:233 +#: panel.cpp:243 #, c-format msgid "Unable to load Game Boy Advance ROM %s" msgstr "" -#: panel.cpp:469 +#: panel.cpp:479 msgid " player " msgstr "" -#: panel.cpp:637 +#: panel.cpp:647 #, c-format msgid "Loaded state %s" msgstr "" -#: panel.cpp:637 +#: panel.cpp:647 #, c-format msgid "Error loading state %s" msgstr "" -#: panel.cpp:661 +#: panel.cpp:671 #, c-format msgid "Saved state %s" msgstr "" -#: panel.cpp:661 +#: panel.cpp:671 #, c-format msgid "Error saving state %s" msgstr "" -#: panel.cpp:865 +#: panel.cpp:875 #, c-format msgid "Fullscreen mode %dx%d-%d@%d not supported; looking for another" msgstr "" -#: panel.cpp:903 +#: panel.cpp:913 #, c-format msgid "Fullscreen mode %dx%d-%d@%d not supported" msgstr "" -#: panel.cpp:908 +#: panel.cpp:918 #, c-format msgid "Valid mode: %dx%d-%d@%d" msgstr "" -#: panel.cpp:916 +#: panel.cpp:926 #, c-format msgid "Chose mode %dx%d-%d@%d" msgstr "" -#: panel.cpp:920 +#: panel.cpp:930 #, c-format msgid "Failed to change mode to %dx%d-%d@%d" msgstr "" -#: panel.cpp:1008 +#: panel.cpp:1018 msgid "Not a valid GBA cartridge" msgstr "" -#: panel.cpp:1172 +#: panel.cpp:1182 msgid "No memory for rewinding" msgstr "" -#: panel.cpp:1182 +#: panel.cpp:1192 msgid "Error writing rewind state" msgstr "" -#: panel.cpp:2280 +#: panel.cpp:2290 msgid "Failed to set glXSwapIntervalEXT" msgstr "" -#: panel.cpp:2289 +#: panel.cpp:2299 msgid "Failed to set glXSwapIntervalSGI" msgstr "" -#: panel.cpp:2298 +#: panel.cpp:2308 msgid "Failed to set glXSwapIntervalMESA" msgstr "" -#: panel.cpp:2304 +#: panel.cpp:2314 msgid "No support for wglGetExtensionsStringEXT" msgstr "" -#: panel.cpp:2307 +#: panel.cpp:2317 msgid "No support for WGL_EXT_swap_control" msgstr "" -#: panel.cpp:2316 +#: panel.cpp:2326 msgid "Failed to set wglSwapIntervalEXT" msgstr "" -#: panel.cpp:2322 +#: panel.cpp:2332 msgid "No VSYNC available on this platform" msgstr "" -#: panel.cpp:2418 +#: panel.cpp:2428 msgid "memory allocation error" msgstr "" -#: panel.cpp:2421 +#: panel.cpp:2431 msgid "error initializing codec" msgstr "" -#: panel.cpp:2424 +#: panel.cpp:2434 msgid "error writing to output file" msgstr "" -#: panel.cpp:2427 +#: panel.cpp:2437 msgid "can't guess output format from file name" msgstr "" -#: panel.cpp:2432 +#: panel.cpp:2442 msgid "programming error; aborting!" msgstr "" -#: panel.cpp:2444 panel.cpp:2473 +#: panel.cpp:2454 panel.cpp:2483 #, c-format msgid "Unable to begin recording to %s (%s)" msgstr "" -#: panel.cpp:2501 +#: panel.cpp:2511 #, c-format msgid "Error in audio/video recording (%s); aborting" msgstr "" -#: panel.cpp:2507 +#: panel.cpp:2517 #, c-format msgid "Error in audio recording (%s); aborting" msgstr "" -#: panel.cpp:2517 +#: panel.cpp:2527 #, c-format msgid "Error in video recording (%s); aborting" msgstr "" -#: viewsupt.cpp:777 +#: viewsupt.cpp:776 msgid "R:" msgstr "" -#: viewsupt.cpp:786 +#: viewsupt.cpp:785 msgid "G:" msgstr "" -#: viewsupt.cpp:795 +#: viewsupt.cpp:794 msgid "B:" msgstr "" @@ -1166,74 +1180,74 @@ msgstr "" msgid "Disconnected joystick %d" msgstr "" -#: xaudio2.cpp:35 +#: xaudio2.cpp:34 msgid "XAudio2: Enumerating devices failed!" msgstr "" -#: xaudio2.cpp:69 xaudio2.cpp:353 +#: xaudio2.cpp:68 xaudio2.cpp:352 msgid "The XAudio2 interface failed to initialize!" msgstr "" -#: xaudio2.cpp:384 +#: xaudio2.cpp:383 msgid "XAudio2: Creating mastering voice failed!" msgstr "" -#: xaudio2.cpp:393 +#: xaudio2.cpp:392 msgid "XAudio2: Creating source voice failed!" msgstr "" -#: faudio.cpp:32 +#: faudio.cpp:31 msgid "FAudio: Enumerating devices failed!" msgstr "" -#: faudio.cpp:67 faudio.cpp:352 +#: faudio.cpp:66 faudio.cpp:351 msgid "The FAudio interface failed to initialize!" msgstr "" -#: faudio.cpp:384 +#: faudio.cpp:383 msgid "FAudio: Creating mastering voice failed!" msgstr "" -#: faudio.cpp:395 +#: faudio.cpp:394 msgid "FAudio: Creating source voice failed!" msgstr "" -#: dsound.cpp:90 dsound.cpp:104 +#: dsound.cpp:89 dsound.cpp:103 #, c-format msgid "Cannot create DirectSound %08x" msgstr "" -#: dsound.cpp:109 +#: dsound.cpp:108 #, c-format msgid "Cannot SetCooperativeLevel %08x" msgstr "" -#: dsound.cpp:123 +#: dsound.cpp:122 #, c-format msgid "Cannot CreateSoundBuffer %08x" msgstr "" -#: dsound.cpp:142 +#: dsound.cpp:141 #, c-format msgid "CreateSoundBuffer(primary) failed %08x" msgstr "" -#: dsound.cpp:159 +#: dsound.cpp:158 #, c-format msgid "CreateSoundBuffer(secondary) failed %08x" msgstr "" -#: dsound.cpp:164 +#: dsound.cpp:163 #, c-format msgid "dsbSecondary->SetCurrentPosition failed %08x" msgstr "" -#: dsound.cpp:187 +#: dsound.cpp:186 #, c-format msgid "Cannot Play primary %08x" msgstr "" -#: dsound.cpp:322 +#: dsound.cpp:321 #, c-format msgid "dsbSecondary->Lock() failed: %08x" msgstr "" @@ -3135,214 +3149,218 @@ msgid "&GB color option" msgstr "" #: xrc/MainMenu.xrc:539 -msgid "&GB printer" +msgid "&GB Colorizer Hack (requires restart)" msgstr "" #: xrc/MainMenu.xrc:543 -msgid "&Gather a full page before printing" +msgid "&GB printer" msgstr "" #: xrc/MainMenu.xrc:547 +msgid "&Gather a full page before printing" +msgstr "" + +#: xrc/MainMenu.xrc:551 msgid "&Save printouts as screen captures" msgstr "" -#: xrc/MainMenu.xrc:552 -msgid "&Use GB BIOS file" +#: xrc/MainMenu.xrc:556 +msgid "&Use GB BIOS file (requires restart)" msgstr "" -#: xrc/MainMenu.xrc:556 +#: xrc/MainMenu.xrc:560 msgid "&Use GBC BIOS file" msgstr "" -#: xrc/MainMenu.xrc:561 +#: xrc/MainMenu.xrc:565 msgid "&General ..." msgstr "" -#: xrc/MainMenu.xrc:564 +#: xrc/MainMenu.xrc:568 msgid "&Speedup / Turbo ..." msgstr "" -#: xrc/MainMenu.xrc:567 +#: xrc/MainMenu.xrc:571 msgid "D&irectories ..." msgstr "" -#: xrc/MainMenu.xrc:570 +#: xrc/MainMenu.xrc:574 msgid "&Key Shortcuts ..." msgstr "" -#: xrc/MainMenu.xrc:573 +#: xrc/MainMenu.xrc:577 msgid "&UI Settings ..." msgstr "" -#: xrc/MainMenu.xrc:577 +#: xrc/MainMenu.xrc:581 msgid "&Tools" msgstr "" -#: xrc/MainMenu.xrc:579 +#: xrc/MainMenu.xrc:583 msgid "&Cheats" msgstr "" -#: xrc/MainMenu.xrc:581 +#: xrc/MainMenu.xrc:585 msgid "List &cheats ..." msgstr "" -#: xrc/MainMenu.xrc:584 +#: xrc/MainMenu.xrc:588 msgid "Find c&heat ..." msgstr "" -#: xrc/MainMenu.xrc:588 +#: xrc/MainMenu.xrc:592 msgid "A&utomatically save/load cheats" msgstr "" -#: xrc/MainMenu.xrc:592 +#: xrc/MainMenu.xrc:596 msgid "&Enable cheats" msgstr "" -#: xrc/MainMenu.xrc:599 +#: xrc/MainMenu.xrc:603 msgid "&Break into GDB" msgstr "" -#: xrc/MainMenu.xrc:603 +#: xrc/MainMenu.xrc:607 msgid "&Configure port..." msgstr "" -#: xrc/MainMenu.xrc:606 +#: xrc/MainMenu.xrc:610 msgid "&Break on load" msgstr "" -#: xrc/MainMenu.xrc:611 +#: xrc/MainMenu.xrc:615 msgid "&Disconnect" msgstr "" -#: xrc/MainMenu.xrc:613 +#: xrc/MainMenu.xrc:617 msgid "&GDB" msgstr "" -#: xrc/MainMenu.xrc:616 +#: xrc/MainMenu.xrc:620 msgid "&Disassemble..." msgstr "" -#: xrc/MainMenu.xrc:619 +#: xrc/MainMenu.xrc:623 msgid "&Logging..." msgstr "" -#: xrc/MainMenu.xrc:622 +#: xrc/MainMenu.xrc:626 msgid "&IO Viewer..." msgstr "" -#: xrc/MainMenu.xrc:625 +#: xrc/MainMenu.xrc:629 msgid "&Map Viewer..." msgstr "" -#: xrc/MainMenu.xrc:628 +#: xrc/MainMenu.xrc:632 msgid "M&emory Viewer..." msgstr "" -#: xrc/MainMenu.xrc:631 +#: xrc/MainMenu.xrc:635 msgid "&OAM Viewer..." msgstr "" -#: xrc/MainMenu.xrc:634 +#: xrc/MainMenu.xrc:638 msgid "&Palette Viewer..." msgstr "" -#: xrc/MainMenu.xrc:637 +#: xrc/MainMenu.xrc:641 msgid "&Tile Viewer..." msgstr "" -#: xrc/MainMenu.xrc:642 +#: xrc/MainMenu.xrc:646 msgid "Show all video layers" msgstr "" -#: xrc/MainMenu.xrc:646 +#: xrc/MainMenu.xrc:650 msgid "BG &0" msgstr "" -#: xrc/MainMenu.xrc:651 +#: xrc/MainMenu.xrc:655 msgid "BG &1" msgstr "" -#: xrc/MainMenu.xrc:656 +#: xrc/MainMenu.xrc:660 msgid "BG &2" msgstr "" -#: xrc/MainMenu.xrc:661 +#: xrc/MainMenu.xrc:665 msgid "BG &3" msgstr "" -#: xrc/MainMenu.xrc:666 +#: xrc/MainMenu.xrc:670 msgid "&OBJ" msgstr "" -#: xrc/MainMenu.xrc:671 +#: xrc/MainMenu.xrc:675 msgid "&WIN 0" msgstr "" -#: xrc/MainMenu.xrc:676 +#: xrc/MainMenu.xrc:680 msgid "W&IN 1" msgstr "" -#: xrc/MainMenu.xrc:681 +#: xrc/MainMenu.xrc:685 msgid "O&BJ WIN" msgstr "" -#: xrc/MainMenu.xrc:685 +#: xrc/MainMenu.xrc:689 msgid "&View Layers" msgstr "" -#: xrc/MainMenu.xrc:689 +#: xrc/MainMenu.xrc:693 msgid "Channel &1" msgstr "" -#: xrc/MainMenu.xrc:694 +#: xrc/MainMenu.xrc:698 msgid "Channel &2" msgstr "" -#: xrc/MainMenu.xrc:699 +#: xrc/MainMenu.xrc:703 msgid "Channel &3" msgstr "" -#: xrc/MainMenu.xrc:704 +#: xrc/MainMenu.xrc:708 msgid "Channel &4" msgstr "" -#: xrc/MainMenu.xrc:709 +#: xrc/MainMenu.xrc:713 msgid "Direct Sound &A" msgstr "" -#: xrc/MainMenu.xrc:714 +#: xrc/MainMenu.xrc:718 msgid "Direct Sound &B" msgstr "" -#: xrc/MainMenu.xrc:718 +#: xrc/MainMenu.xrc:722 msgid "&Sound Channels" msgstr "" -#: xrc/MainMenu.xrc:722 +#: xrc/MainMenu.xrc:726 msgid "&Help" msgstr "" -#: xrc/MainMenu.xrc:724 +#: xrc/MainMenu.xrc:728 msgid "Report &Bugs" msgstr "" -#: xrc/MainMenu.xrc:727 +#: xrc/MainMenu.xrc:731 msgid "VBA-M Support &Forum" msgstr "" -#: xrc/MainMenu.xrc:730 +#: xrc/MainMenu.xrc:734 msgid "Translations" msgstr "" -#: xrc/MainMenu.xrc:738 +#: xrc/MainMenu.xrc:742 msgid "Check for updates" msgstr "" -#: xrc/MainMenu.xrc:741 +#: xrc/MainMenu.xrc:745 msgid "&Factory Reset..." msgstr "" -#: xrc/MainMenu.xrc:745 +#: xrc/MainMenu.xrc:749 msgid "&About..." msgstr "" diff --git a/src/common/ConfigManager.cpp b/src/common/ConfigManager.cpp index e7d8d61e..11ae227e 100644 --- a/src/common/ConfigManager.cpp +++ b/src/common/ConfigManager.cpp @@ -164,6 +164,7 @@ int autoSaveLoadCheatList; int aviRecording; int captureFormat = 0; int cheatsEnabled = true; +int colorizerHack = 0; int cpuDisableSfx = false; int cpuSaveType = 0; int enableMMX; @@ -302,6 +303,7 @@ struct option argOptions[] = { { "cheat", required_argument, 0, OPT_CHEAT }, { "cheats-enabled", no_argument, &cheatsEnabled, 1 }, { "color-option", no_argument, &gbColorOption, 1 }, + { "colorizer-hack", no_argument, &colorizerHack, 1 }, { "config", required_argument, 0, 'c' }, { "cpu-disable-sfx", no_argument, &cpuDisableSfx, 1 }, { "cpu-save-type", required_argument, 0, OPT_CPU_SAVE_TYPE }, @@ -492,6 +494,7 @@ void LoadConfig() biosFileNameGBC = ReadPrefString("biosFileGBC"); captureFormat = ReadPref("captureFormat", 0); cheatsEnabled = ReadPref("cheatsEnabled", 0); + colorizerHack = ReadPref("colorizerHack", 0); cpuDisableSfx = ReadPref("disableSfx", 0); cpuSaveType = ReadPrefHex("saveType"); enableMMX = ReadPref("enableMMX", 1); diff --git a/src/common/ConfigManager.h b/src/common/ConfigManager.h index 7fdaf0a7..16772d3e 100644 --- a/src/common/ConfigManager.h +++ b/src/common/ConfigManager.h @@ -53,6 +53,7 @@ extern int autoSaveLoadCheatList; extern int aviRecording; extern int captureFormat; extern int cheatsEnabled; +extern int colorizerHack; extern int cpuDisableSfx; extern int cpuSaveType; extern int dinputKeyFocus; diff --git a/src/wx/cmdevents.cpp b/src/wx/cmdevents.cpp index 71a5f3c0..05369351 100644 --- a/src/wx/cmdevents.cpp +++ b/src/wx/cmdevents.cpp @@ -11,7 +11,6 @@ #include #include "../common/version_cpp.h" -#include "../common/ConfigManager.h" #include "../gb/gbPrinter.h" #include "../gba/agbprint.h" @@ -1875,6 +1874,22 @@ EVT_HANDLER(CheatsEnable, "Enable cheats (toggle)") update_opts(); } +EVT_HANDLER(ColorizerHack, "Enable Colorizer Hack (toggle)") +{ + int val = 0; + GetMenuOptionInt("ColorizerHack", val, 1); + + if (val == 1 && useBiosFileGB == 1) { + wxLogError(_("Cannot use Colorizer Hack when GB BIOS File is enabled.")); + val = 0; + SetMenuOption("ColorizerHack", 0); + } + + colorizerHack = val; + + update_opts(); +} + // Debug menu EVT_HANDLER_MASK(VideoLayersBG0, "Video layer BG0 (toggle)", CMDEN_GB | CMDEN_GBA) { @@ -3079,7 +3094,17 @@ EVT_HANDLER(BootRomEn, "Use the specified BIOS file for GBA") EVT_HANDLER(BootRomGB, "Use the specified BIOS file for GB") { - GetMenuOptionInt("BootRomGB", useBiosFileGB, 1); + int val = 0; + GetMenuOptionInt("BootRomGB", val, 1); + + if (val == 1 && colorizerHack == 1) { + wxLogError(_("Cannot use GB BIOS when Colorizer Hack is enabled.")); + val = 0; + SetMenuOption("BootRomGB", 0); + } + + useBiosFileGB = val; + update_opts(); } diff --git a/src/wx/dsound.cpp b/src/wx/dsound.cpp index e5da9f59..3af22c51 100644 --- a/src/wx/dsound.cpp +++ b/src/wx/dsound.cpp @@ -10,7 +10,6 @@ // DirectSound8 #define DIRECTSOUND_VERSION 0x0800 -#include "../common/ConfigManager.h" #include extern bool soundBufferLow; diff --git a/src/wx/faudio.cpp b/src/wx/faudio.cpp index f54e8397..93723ad7 100644 --- a/src/wx/faudio.cpp +++ b/src/wx/faudio.cpp @@ -5,7 +5,6 @@ #include // Interface -#include "../common/ConfigManager.h" #include "../common/SoundDriver.h" // FAudio diff --git a/src/wx/guiinit.cpp b/src/wx/guiinit.cpp index 240b223a..ba3a62cc 100644 --- a/src/wx/guiinit.cpp +++ b/src/wx/guiinit.cpp @@ -23,7 +23,6 @@ #include #include -#include "../common/ConfigManager.h" #include "../gba/CheatSearch.h" #if defined(__WXGTK__) @@ -3050,6 +3049,7 @@ bool MainFrame::BindControls() MenuOptionIntMask("VideoLayersOBJWIN", layerSettings, (1 << 15)); MenuOptionBool("CheatsAutoSaveLoad", gopts.autoload_cheats); MenuOptionIntMask("CheatsEnable", cheatsEnabled, 1); + SetMenuOption("ColorizerHack", colorizerHack ? 1 : 0); MenuOptionIntMask("KeepSaves", skipSaveGameBattery, 1); MenuOptionIntMask("KeepCheats", skipSaveGameCheats, 1); MenuOptionBool("LoadGameAutoLoad", gopts.autoload_state); diff --git a/src/wx/openal.cpp b/src/wx/openal.cpp index 3c88fa02..c2a4db7d 100644 --- a/src/wx/openal.cpp +++ b/src/wx/openal.cpp @@ -8,7 +8,6 @@ #include "wxvbam.h" // Interface -#include "../common/ConfigManager.h" #include "../common/SoundDriver.h" // OpenAL diff --git a/src/wx/opts.cpp b/src/wx/opts.cpp index 0e155b3e..25616210 100644 --- a/src/wx/opts.cpp +++ b/src/wx/opts.cpp @@ -1,4 +1,3 @@ -#include "../common/ConfigManager.h" #include "wxvbam.h" #include #include @@ -209,6 +208,7 @@ opt_desc opts[] = { /// GB STROPT("GB/BiosFile", "", wxTRANSLATE("BIOS file to use for GB, if enabled"), gopts.gb_bios), INTOPT("GB/ColorOption", "GBColorOption", wxTRANSLATE("GB color enhancement, if enabled"), gbColorOption, 0, 1), + INTOPT("GB/ColorizerHack", "ColorizerHack", wxTRANSLATE("Enable DX Colorization Hacks"), colorizerHack, 0, 1), BOOLOPT("GB/LCDFilter", "GBLcdFilter", wxTRANSLATE("Apply LCD filter, if enabled"), gbLcdFilter), STROPT("GB/GBCBiosFile", "", wxTRANSLATE("BIOS file to use for GBC, if enabled"), gopts.gbc_bios), NOOPT(wxT("GB/Palette0"), "", wxTRANSLATE("The default palette, as 8 comma-separated 4-digit hex integers (rgb555).")), @@ -263,6 +263,7 @@ opt_desc opts[] = { INTOPT("preferences/borderOn", "", wxTRANSLATE("Always enable border"), gbBorderOn, 0, 1), INTOPT("preferences/captureFormat", "", wxTRANSLATE("Screen capture file format"), captureFormat, 0, 1), INTOPT("preferences/cheatsEnabled", "", wxTRANSLATE("Enable cheats"), cheatsEnabled, 0, 1), + #ifdef MMX INTOPT("preferences/enableMMX", "MMX", wxTRANSLATE("Enable MMX"), enableMMX, 0, 1), #endif diff --git a/src/wx/panel.cpp b/src/wx/panel.cpp index 6f5b828f..147008b1 100644 --- a/src/wx/panel.cpp +++ b/src/wx/panel.cpp @@ -16,7 +16,6 @@ #include #include "../common/version_cpp.h" -#include "../common/ConfigManager.h" #include "../common/Patch.h" #include "../gb/gbPrinter.h" #include "../gba/RTC.h" @@ -199,7 +198,18 @@ void GameArea::LoadGame(const wxString& name) soundSetThrottle(throttle); gbGetHardwareType(); - bool use_bios = gbCgbMode ? useBiosFileGBC : useBiosFileGB; + + // Disable bios loading when using colorizer hack. + if (useBiosFileGB && colorizerHack) { + wxLogError(_("Cannot use GB BIOS file when Colorizer Hack is enabled, disabling GB BIOS file.")); + useBiosFileGB = 0; + update_opts(); + } + + // Set up the core for the colorizer hack. + setColorizerHack(colorizerHack); + + bool use_bios = gbCgbMode ? useBiosFileGBC : useBiosFileGB; wxCharBuffer fnb(UTF8((gbCgbMode ? gopts.gbc_bios : gopts.gb_bios))); const char* fn = fnb.data(); diff --git a/src/wx/sys.cpp b/src/wx/sys.cpp index 06b41e92..f7cd8a02 100644 --- a/src/wx/sys.cpp +++ b/src/wx/sys.cpp @@ -1,4 +1,3 @@ -#include "../common/ConfigManager.h" #include "../common/SoundSDL.h" #include "wxvbam.h" #include "SDL.h" diff --git a/src/wx/viewsupt.cpp b/src/wx/viewsupt.cpp index 570b5d82..0677b9e7 100644 --- a/src/wx/viewsupt.cpp +++ b/src/wx/viewsupt.cpp @@ -1,5 +1,4 @@ #include "viewsupt.h" -#include "../common/ConfigManager.h" #include "wxvbam.h" #include "wxutil.h" diff --git a/src/wx/wxvbam.cpp b/src/wx/wxvbam.cpp index 1d7e3e6c..e894b8f6 100644 --- a/src/wx/wxvbam.cpp +++ b/src/wx/wxvbam.cpp @@ -26,7 +26,6 @@ #include "builtin-xrc.h" // The built-in vba-over.ini -#include "../common/ConfigManager.h" #include "builtin-over.h" IMPLEMENT_APP(wxvbamApp) diff --git a/src/wx/wxvbam.h b/src/wx/wxvbam.h index 22f7e7f0..84f95c01 100644 --- a/src/wx/wxvbam.h +++ b/src/wx/wxvbam.h @@ -16,11 +16,10 @@ #include "wx/sdljoy.h" #include "wx/wxmisc.h" #include "wxhead.h" -#ifndef NO_FFMPEG -#include "../common/ffmpeg.h" -#endif /* yeah, they aren't needed globally, but I'm too lazy to limit where needed */ +#include "../common/ConfigManager.h" + #include "../System.h" #include "../Util.h" #include "../gb/gb.h" @@ -32,6 +31,10 @@ #include "../gba/Globals.h" #include "../gba/Sound.h" +#ifndef NO_FFMPEG +#include "../common/ffmpeg.h" +#endif + #include "wxlogdebug.h" #include "wxutil.h" diff --git a/src/wx/xaudio2.cpp b/src/wx/xaudio2.cpp index 2fad2ca3..e67e2fad 100644 --- a/src/wx/xaudio2.cpp +++ b/src/wx/xaudio2.cpp @@ -5,7 +5,6 @@ #include // Interface -#include "../common/ConfigManager.h" #include "../common/SoundDriver.h" // XAudio2 diff --git a/src/wx/xrc/MainMenu.xrc b/src/wx/xrc/MainMenu.xrc index 3eae4d35..3393494d 100644 --- a/src/wx/xrc/MainMenu.xrc +++ b/src/wx/xrc/MainMenu.xrc @@ -535,6 +535,10 @@ 1 + + + 1 + 1 @@ -549,7 +553,7 @@ - + 1