Remove --new-syntax command line option.

src/commandline_options.cpp

@@ -86,7 +86,6 @@ commandline_options::commandline_options ( int argc, char** argv ) :
 	nomusic(false),
 	nosound(false),
 	new_storyscreens(false),
-	new_syntax(false),
 	new_widgets(false),
 	path(false),
 	preprocess(false),
@@ -142,8 +141,6 @@ commandline_options::commandline_options ( int argc, char** argv ) :
 		("help,h", "prints this message and exits.")
 		("language,L", po::value<std::string>(), "uses language <arg> (symbol) this session. Example: --language ang_GB@latin")
 		("load,l", po::value<std::string>(), "loads the save <arg> from the standard save game directory. When launching the map editor via -e, the map <arg> is loaded, relative to the current directory. If it is a directory, the editor will start with a load map dialog opened there.")
-		//disabled until this project continues
-		//("new-syntax", "enables the new campaign syntax parsing.")
 		("nocache", "disables caching of game data.")
 		("nodelay", "runs the game without any delays.")
 		("nomusic", "runs the game without music.")
@@ -314,8 +311,6 @@ commandline_options::commandline_options ( int argc, char** argv ) :
 		multiplayer = true;
 	if (vm.count("new-storyscreens"))
 		new_storyscreens = true;
-	if (vm.count("new-syntax"))
-		new_syntax = true;
 	if (vm.count("new-widgets"))
 		new_widgets = true;
 	if (vm.count("nocache"))

src/commandline_options.hpp

@@ -119,8 +119,6 @@ public:
 	bool nosound;
 	/// True if --new-storyscreens was given on the command line. Hidden option to help testing the work-in-progress new storyscreen code.
 	bool new_storyscreens;
-	/// True if --new-syntax was given on the command line. Does magic.
-	bool new_syntax;
 	/// True if --new-widgets was given on the command line. Hidden option to enable the new widget toolkit.
 	bool new_widgets;
 	/// True if --path was given on the command line. Prints the path to data directory and exits.

src/game.cpp

@@ -353,9 +353,6 @@ static int process_command_args(const commandline_options& cmdline_opts) {
 		std::cout << lg::list_logdomains(*cmdline_opts.logdomains);
 		return 0;
 	}
-	if(cmdline_opts.new_syntax) {
-		game_config::new_syntax = true;
-	}
 	if(cmdline_opts.path) {
 		std::cout <<  game_config::path << "\n";
 		return 0;

src/game_config.cpp

@@ -58,7 +58,9 @@ namespace game_config
 	const std::string revision = VERSION;
 #endif
 	std::string wesnoth_program_dir;
-	bool debug = false, debug_lua = false, editor = false, ignore_replay_errors = false, mp_debug = false, exit_at_end = false, new_syntax = false, no_delay = false, disable_autosave = false;
+	bool debug = false, debug_lua = false, editor = false,
+		ignore_replay_errors = false, mp_debug = false, exit_at_end = false,
+		no_delay = false, disable_autosave = false;
 
 	int cache_compression_level = 6;
 

src/game_config.hpp

@@ -52,7 +52,8 @@ namespace game_config
 	/** Default percentage gold carried over to the next scenario. */
 	extern const int gold_carryover_percentage;
 
-	extern bool debug, debug_lua, editor, ignore_replay_errors, mp_debug, exit_at_end, new_syntax, no_delay, disable_autosave;
+	extern bool debug, debug_lua, editor, ignore_replay_errors, mp_debug,
+		exit_at_end, no_delay, disable_autosave;
 
 	extern int cache_compression_level;
 

src/tests/test_commandline_options.cpp

@@ -65,7 +65,6 @@ BOOST_AUTO_TEST_CASE (test_empty_options)
 	BOOST_CHECK(!co.nomusic);
 	BOOST_CHECK(!co.nosound);
 	BOOST_CHECK(!co.new_storyscreens);
-	//BOOST_CHECK(!co.new_syntax);
 	BOOST_CHECK(!co.new_widgets);
 	BOOST_CHECK(!co.path);
 	BOOST_CHECK(!co.preprocess);
@@ -149,7 +148,6 @@ BOOST_AUTO_TEST_CASE (test_default_options)
 	BOOST_CHECK(!co.nomusic);
 	BOOST_CHECK(!co.nosound);
 	BOOST_CHECK(!co.new_storyscreens);
-	//BOOST_CHECK(!co.new_syntax);
 	BOOST_CHECK(!co.new_widgets);
 	BOOST_CHECK(!co.path);
 	BOOST_CHECK(!co.preprocess);
@@ -219,7 +217,6 @@ BOOST_AUTO_TEST_CASE (test_full_options)
 		"--max-fps=100",
 		"--multiplayer",
 		"--new-storyscreens",
-		//"--new-syntax",
 		"--new-widgets",
 		"--nocache",
 		"--nodelay",
@@ -317,7 +314,6 @@ BOOST_AUTO_TEST_CASE (test_full_options)
 	BOOST_CHECK(co.nomusic);
 	BOOST_CHECK(co.nosound);
 	BOOST_CHECK(co.new_storyscreens);
-	//BOOST_CHECK(co.new_syntax);
 	BOOST_CHECK(co.new_widgets);
 	BOOST_CHECK(co.path);
 	BOOST_CHECK(co.preprocess && co.preprocess_path && co.preprocess_target);
@@ -395,7 +391,6 @@ BOOST_AUTO_TEST_CASE (test_positional_options)
 	BOOST_CHECK(!co.nomusic);
 	BOOST_CHECK(!co.nosound);
 	BOOST_CHECK(!co.new_storyscreens);
-	//BOOST_CHECK(!co.new_syntax);
 	BOOST_CHECK(!co.new_widgets);
 	BOOST_CHECK(!co.path);
 	BOOST_CHECK(!co.preprocess);