From: <do...@us...> - 2012-11-19 22:51:35
|
Revision: 7169 http://exult.svn.sourceforge.net/exult/?rev=7169&view=rev Author: dominus Date: 2012-11-19 22:51:28 +0000 (Mon, 19 Nov 2012) Log Message: ----------- command line option to reset the video settings and a Windows shortcut in the Exult Start Menu group. Thanks to Malignant Manor Modified Paths: -------------- exult/trunk/ChangeLog exult/trunk/exult.cc exult/trunk/win32/exult_installer.iss Modified: exult/trunk/ChangeLog =================================================================== --- exult/trunk/ChangeLog 2012-11-17 13:55:25 UTC (rev 7168) +++ exult/trunk/ChangeLog 2012-11-19 22:51:28 UTC (rev 7169) @@ -1,3 +1,9 @@ +2012-11-19 Dominik Reichardt <do...@us...> + * exult.cc: added command line option to reset the video settings (patch by + Malignant Manor). + * win32/exult_installer.iss: "reset video settings" shortcut to the Exult + Start Menu group on Windows (again thanks to Malignant Manor). + 2012-11-16 Marzo Sette Torres Junior <ma...@ya...> * imagewin/scale_xbr.*: Performance improvements for NxBR scalers. Modified: exult/trunk/exult.cc =================================================================== --- exult/trunk/exult.cc 2012-11-17 13:55:25 UTC (rev 7168) +++ exult/trunk/exult.cc 2012-11-19 22:51:28 UTC (rev 7169) @@ -234,6 +234,7 @@ static bool arg_nomenu = false; static bool arg_edit_mode = false; // Start up ExultStudio. static bool arg_write_xml = false; // Write out game's config. as XML. +static bool arg_reset_video = false; // Resets the video setings. static bool dragging = false; // Object or gump being moved. static bool dragged = false; // Flag for when obj. moved. @@ -311,6 +312,7 @@ parameters.declare("-c",&arg_configfile,""); parameters.declare("--edit",&arg_edit_mode,true); parameters.declare("--write-xml",&arg_write_xml,true); + parameters.declare("--reset-video",&arg_reset_video,true); #if defined WIN32 bool portable = false; parameters.declare("-p",&portable,true); @@ -330,7 +332,7 @@ cerr << "Usage: exult [--help|-h] [-v|--version] [-c configfile]"<<endl << " [--bg|--fov|--si|--ss|--game <game>] [--mod <mod>]" << endl << " [--nomenu] [--buildmap 0|1|2] [--mapnum <num>]" << endl - << " [--nocrc] [--edit] [--write-xml]" << endl + << " [--nocrc] [--edit] [--write-xml] [--reset-video]" << endl << "--help\t\tShow this information" << endl << "--version\tShow version info" << endl << " -c configfile\tSpecify alternate config file" << endl @@ -356,7 +358,8 @@ #if defined WIN32 << " -p\t\tMakes the home path the Exult directory (old Windows way)" << endl #endif - << "--write-xml\tWrite 'patch/exultgame.xml'" << endl; + << "--write-xml\tWrite 'patch/exultgame.xml'" << endl + << "--reset-video\tResets to the default video settings" << endl; exit(1); } @@ -584,6 +587,23 @@ #endif } + // reset-video command line option + if (arg_reset_video) + { + config->set("config/video/display/width", 640, false); + config->set("config/video/display/height", 480, false); + config->set("config/video/game/width", 320, false); + config->set("config/video/game/height", 200, false); + config->set("config/video/scale", 2, false); + config->set("config/video/scale_method", "2xSaI" , false); + config->set("config/video/fill_mode", "center", false); + config->set("config/video/fill_scaler", "Bilinear", false); + config->set("config/video/share_video_settings", "yes", false); + config->set("config/video/fullscreen", "no", false); + config->set("config/video/force_bpp", 0, false); + + config->write_back(); + } if (config->key_exists("config/gameplay/allow_double_right_move")) { string str; Modified: exult/trunk/win32/exult_installer.iss =================================================================== --- exult/trunk/win32/exult_installer.iss 2012-11-17 13:55:25 UTC (rev 7168) +++ exult/trunk/win32/exult_installer.iss 2012-11-19 22:51:28 UTC (rev 7169) @@ -69,6 +69,7 @@ [Icons] Name: {group}\Exult; Filename: {app}\Exult.exe; WorkingDir: {app}; Flags: createonlyiffileexists; Components: Icons +Name: {group}\reset video settings; Filename: {app}\Exult.exe; Parameters: --reset-video; WorkingDir: {app}; Flags: createonlyiffileexists; Components: Icons Name: {group}\Uninstall Exult; Filename: {uninstallexe}; Components: Icons Name: {group}\COPYING; Filename: {app}\COPYING.txt; Flags: createonlyiffileexists; Components: Icons Name: {group}\ChangeLog; Filename: {app}\ChangeLog.txt; Flags: createonlyiffileexists; Components: Icons This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |