Added documentation for lock-on support and a fullscreen config option.

3 files changed, 25 insertions, 1 deletions

diff --git a/README b/README
index 77f5938..97f5dfa 100644
--- a/README
+++ b/README
@@ -26,6 +26,19 @@ list of supported command line options on Linux or OSX type:
 From within your BlastEm directory. On Windows type:
 	
 	blastem.exe -h
+	
+Lock-On Support
+---------------
+
+This version of BlastEm has some preliminary support for Sonic & Knuckles lock
+on technology. This is only available from the command line at the moment. To
+use it specify the Sonic & Knuckles ROM as the primary ROM and specify the ROM
+to be locked on using the -o option. As an example:
+
+	./blastem ~/romz/sonic_and_knuckles.bin -o ~/romz/sonic3.bin
+	
+Please note that Sonic 2 lock-on does not work at this time. Additionally the
+save RAM added by Sonic 3 won't work either.
 
 Configuration
 -------------
@@ -106,6 +119,11 @@ Additionally, the "turbo" feature does not function properly with vsync
 enabled. These issues will be addressed in a future release. If you wish to use
 vsync, please see the VSync section at the bottom of the README.
 
+"fullscreen" controls whether BlastEm starts in fullscreen or windowed mode.
+This can be overridden on the command line with the -f flag. If fullscreen
+is set to "off", -f will turn it on. Conversely, if fullscreen is set to "on"
+in the config, -f will turn it off.
+
 Audio
 -----
 
diff --git a/blastem.c b/blastem.c
index ba1a48b..9bcffc3 100644
--- a/blastem.c
+++ b/blastem.c
@@ -1153,9 +1153,10 @@ int main(int argc, char ** argv)
 					"Options:\n"
 					"	-h          Print this help text\n"
 					"	-r (J|U|E)  Force region to Japan, US or Europe respectively\n"
-					"	-f          Start in fullscreen mode\n"
+					"	-f          Toggles fullscreen mode\n"
 					"	-g          Disable OpenGL rendering\n"
 					"	-s FILE     Load a GST format savestate from FILE\n"
+					"	-o FILE     Load FILE as a lock-on cartridge\n"
 					"	-d          Enter debugger on startup\n"
 					"	-n          Disable Z80\n"
 					"	-v          Display version number and exit\n"
@@ -1242,6 +1243,10 @@ int main(int argc, char ** argv)
 	if (version_reg & 0x40) {
 		fps = 50;
 	}
+	char *config_fullscreen = tern_find_path(config, "video\0fullscreen\0").ptrval;
+	if (config_fullscreen && !strcmp("on", config_fullscreen)) {
+		fullscreen = !fullscreen;
+	}
 	if (!headless) {
 		render_init(width, height, title, fps, fullscreen);
 	}
diff --git a/default.cfg b/default.cfg
index 1401778..6c2f1ab 100644
--- a/default.cfg
+++ b/default.cfg
@@ -110,6 +110,7 @@ video {
 	fragment_shader default.f.glsl
 	scanlines off
 	vsync off
+	fullscreen off
 }
 
 audio {