Merge branch 'master' of https://github.com/BlitterStudio/amiberry

src/osdep/gui/PanelCPU.cpp

@@ -940,25 +940,35 @@ void RefreshPanelCPU()
 bool HelpPanelCPU(std::vector<std::string>& helptext)
 {
 	helptext.clear();
-	helptext.emplace_back("Select the required Amiga CPU (68000 - 68040). If you select 68020, you can choose");
+	helptext.emplace_back("Select the required Amiga CPU (68000 - 68060). If you select 68020, you can choose");
 	helptext.emplace_back("between 24-bit (68EC020) or 32-bit (68020) addressing.");
 	helptext.emplace_back(" ");
 	helptext.emplace_back("The option \"More compatible\" will emulate prefetch (68000) or prefetch and");
 	helptext.emplace_back("instruction cache. It's more compatible but slower, but not required");
 	helptext.emplace_back("for most games and demos.");
 	helptext.emplace_back(" ");
 	helptext.emplace_back("JIT/JIT FPU enables the Just-in-time compiler. This may break compatibility in some games.");
+	helptext.emplace_back("Note: Not available in all platforms currently");
 	helptext.emplace_back(" ");
 	helptext.emplace_back("The available FPU models depend on the selected CPU type. The option \"More compatible\"");
 	helptext.emplace_back("activates a more accurate rounding method and compare of two floats.");
 	helptext.emplace_back(" ");
-	helptext.emplace_back("With \"CPU Speed\" you can choose the clock rate of the emulated Amiga. Use 7MHz for A500,");
-	helptext.emplace_back("or 14MHz for A1200 speed. Fastest Possible will only give the minimum time to the Chipset,");
-	helptext.emplace_back("and maximum time as possible for the CPU, which may result in dropped frames.\"Cycle exact\"");
-	helptext.emplace_back("emulates 68000/chipset cycles accurately, is very slow and not required in most situations.");
+	helptext.emplace_back("The CPU Speed slider allows you to set the CPU speed. The fastest possible setting");
+	helptext.emplace_back("will run the CPU as fast as possible. The A500/A1200 setting will run the CPU at");
+	helptext.emplace_back("the speed of an A500 or A1200. The slider allows you to set the CPU speed in");
+	helptext.emplace_back("percentages of the maximum speed.");
+	helptext.emplace_back(" ");
+	helptext.emplace_back("The CPU Idle slider allows you to set how much the CPU should sleep when idle.");
+	helptext.emplace_back("This is useful to keep the system temperature down.");
+	helptext.emplace_back(" ");
+	helptext.emplace_back("The MMU option allows you to enable the Memory Management Unit. This is only available");
+	helptext.emplace_back("for the 68030, 68040 and 68060 CPUs.");
+	helptext.emplace_back(" ");
+	helptext.emplace_back("The FPU option allows you to enable the FPU. This is only available for the 68020, 68030,");
+	helptext.emplace_back("68040 and 68060 CPUs.");
+	helptext.emplace_back(" ");
+	helptext.emplace_back("The PPC emulation option allows you to enable the PowerPC emulation. This is only available");
+	helptext.emplace_back("for the 68040 and 68060 CPUs and requires an extra plugin (qemu-uae) to be available.");
 	helptext.emplace_back(" ");
-	helptext.emplace_back("You can use the CPU Idle slider to set how much the CPU emulation should sleep when idle.");
-	helptext.emplace_back("This is useful on some small devices, to help keep the system temperature down.");
-
 	return true;
 }

src/osdep/gui/PanelExpansions.cpp

@@ -1420,7 +1420,7 @@ bool HelpPanelExpansions(std::vector<std::string>& helptext)
     helptext.emplace_back("Amiga as being connected to the network Amiberry is running on.");
     helptext.emplace_back(" ");
     helptext.emplace_back("\"uaescsi.device\" enables the uaescsi.device, which can be used to connect to hard");
-    helptext.emplace_back("drives inside the emulation.");
+    helptext.emplace_back("drives inside the emulation. This is required for CDFS automounting to work.");
     helptext.emplace_back(" ");
     helptext.emplace_back("\"CD32 Full Motion Video cartridge\" enables the FMV module for the CD32, which is");
     helptext.emplace_back("only useful if you're emulating a CD32 of course.");

src/osdep/gui/PanelHD.cpp

@@ -804,19 +804,34 @@ int count_HDs(const uae_prefs* p)
 bool HelpPanelHD(std::vector<std::string>& helptext)
 {
 	helptext.clear();
-	helptext.emplace_back(R"(Use "Add Directory" to add a folder or "Add Hardfile" to add a HDF file as)");
-	helptext.emplace_back("a hard disk. To edit the settings of a HDD, click on \"...\" left to the entry in");
-	helptext.emplace_back("the list. With the red cross, you can delete an entry.");
+	helptext.emplace_back("Hard Drives and CD/DVD drives");
+	helptext.emplace_back(" ");
+	helptext.emplace_back("This panel allows you to add and configure virtual hard drives and CD/DVD drives.");
+	helptext.emplace_back(" ");
+	helptext.emplace_back(R"(Use "Add Directory/Archive" to add a folder or Archive as a virtual Amiga drive.)");
+	helptext.emplace_back(R"(Use "Add Hardfile to add an HDD image (hdf) as a hard disk.)");
+	helptext.emplace_back(R"(Use "Add Hard Drive" to add a physical hard drive as a hard disk.)");
+	helptext.emplace_back(R"(Use "Add Tape Drive" to add a tape drive (directory or file only).)");
 	helptext.emplace_back(" ");
 	helptext.emplace_back("With \"Create Hardfile\", you can create a new formatted HDF file up to 2 GB.");
 	helptext.emplace_back("For large files, it will take some time to create the new hard disk. You have to");
 	helptext.emplace_back("format the new HDD in the Amiga via the Workbench.");
 	helptext.emplace_back(" ");
-	helptext.emplace_back("If \"Master harddrive write protection\" is activated, you can't write to any HD.");
+	helptext.emplace_back("You can use the \"...\" button to edit the selected drive. You can change the");
+	helptext.emplace_back("name, volume label, path, read/write mode, size and boot priority.");
+	helptext.emplace_back(" ");
+	helptext.emplace_back("Use the \"Delete\" button to remove the selected drive.");
+	helptext.emplace_back(" ");
+	helptext.emplace_back("CD/DVD drives:");
+	helptext.emplace_back(" ");
+	helptext.emplace_back("Use \"CD drive/image\" to connect a CD drive. You can select an iso/cue file");
+	helptext.emplace_back("or use the \"Eject\" button to remove the CD from the drive.");
+	helptext.emplace_back(" ");
+	helptext.emplace_back("You can enable the \"CDTV/CDTV-CR/CD32 turbo CD read speed\" option to speed up");
+	helptext.emplace_back("the CD read speed.");
 	helptext.emplace_back(" ");
-	helptext.emplace_back(R"(Activate "CD drive" to emulate a CD drive. Use "Eject" to remove current CD)");
-	helptext.emplace_back("and click on \"...\" to open a dialog to select the iso/cue file for CD emulation.");
+	helptext.emplace_back("You can enable the \"CDFS automount CD/DVD drives\" option to automatically mount");
+	helptext.emplace_back("CD/DVD drives on Workbench, when a CD/DVD is inserted.");
 	helptext.emplace_back(" ");
-	helptext.emplace_back("In the current version, WAV, MP3 and FLAC files are supported for audio tracks.");
 	return true;
 }

src/osdep/gui/PanelRTG.cpp

@@ -514,9 +514,8 @@ bool HelpPanelRTG(std::vector<std::string>& helptext)
 	helptext.emplace_back("versions, as both as supported.");
 	helptext.emplace_back(" ");
 	helptext.emplace_back("The color modes dropdowns allow you to choose which pixel format");
-	helptext.emplace_back("will be used. Please note that for performance reasons, the default");
-	helptext.emplace_back("32-bit mode is not the same as in WinUAE (Amiberry uses RGBA, WinUAE");
-	helptext.emplace_back("uses BGRA).");
+	helptext.emplace_back("will be used. For optimized performance, Amiberry uses the same");
+	helptext.emplace_back("pixel format always (RGB565 for 16-bit and BGRA32 for 32-bit modes).");
 	helptext.emplace_back(" ");
 	helptext.emplace_back("Some options are not implemented, so they appear as disabled.");
 	helptext.emplace_back(" ");

src/osdep/gui/PanelSavestate.cpp

@@ -117,7 +117,7 @@ class SavestateActionListener : public gcn::ActionListener
 
 				if (!unsafe || unsafe_confirmed)
 				{
-					savestate_initsave(savestate_fname, 1, true, true);
+					savestate_initsave(savestate_fname, 1, false, true);
 					save_state(savestate_fname, "...");
 					if (create_screenshot())
 						save_thumb(screenshot_filename);
@@ -395,16 +395,27 @@ void RefreshPanelSavestate()
 bool HelpPanelSavestate(std::vector<std::string>& helptext)
 {
 	helptext.clear();
-	helptext.emplace_back("Savestates can be used with floppy disk image files, whdload.lha files, and with HDD");
-	helptext.emplace_back("emulation setups.");
+	helptext.emplace_back("Savestates");
+	helptext.emplace_back(" ");
+	helptext.emplace_back("Savestates allow you to save the current state of the emulation to a file, and to");
+	helptext.emplace_back("restore it later. This can be useful to save your progress in a game, or to quickly");
+	helptext.emplace_back("load a specific configuration. A screenshot of the current state is saved along with");
+	helptext.emplace_back("the statefile.");
+	helptext.emplace_back(" ");
+	helptext.emplace_back("To save a state, click the 'Save to Slot' button. To load a state, click the 'Load from");
+	helptext.emplace_back("Slot' button. To delete a state, click the 'Delete Slot' button.");
+	helptext.emplace_back(" ");
+	helptext.emplace_back("You can also save and load states to and from files. Click the 'Save state...' button");
+	helptext.emplace_back("to save the current state to a file, and the 'Load state...' button to load a state");
+	helptext.emplace_back("from a file.");
+	helptext.emplace_back(" ");
+	helptext.emplace_back("Savestates are saved to the 'savestates' directory in the Amiberry data directory.");
 	helptext.emplace_back(" ");
 	helptext.emplace_back("Note: Savestates will not work when emulating CD32/CDTV machine types, and will likely");
 	helptext.emplace_back("fail when the JIT/PPC/RTG emulation options are enabled.");
 	helptext.emplace_back(" ");
 	helptext.emplace_back("Savestates are stored in a .uss file, with the name being that of the currently loaded");
 	helptext.emplace_back("floppy disk image or whdload .lha file, or the name of the loaded HDD .uae config.");
 	helptext.emplace_back(" ");
-	helptext.emplace_back("For more information about Savestates, please read the related Amiberry Wiki page.");
-	helptext.emplace_back(" ");
 	return true;
 }