Merge pull request #11 from rbergen/add-english

Small bug fixes, bump version to 3.4.1

Author: rbergen

CMakeLists.txt

@@ -2,7 +2,7 @@ cmake_minimum_required(VERSION 3.15.0)
 
 project(
   R136 
-  VERSION 3.4.0)
+  VERSION 3.4.1)
 
 set(CURSES_NEED_NCURSES 1)
 set(CURSES_NEED_WIDE 1)

include/templates/base.h

@@ -145,8 +145,8 @@ const std::basic_string<TChar> &select_language_param(Language language, const s
 	return (int)texts.size() > language_value ? texts[language_value] : empty_string<TChar>;
 }
 
-template<class TArrayType>
-const TArrayType& select_language_param(Language language, const TArrayType* values)
+template<class TArrayElement>
+const TArrayElement& select_language_param(Language language, const TArrayElement* values)
 {
 	return values[to_value(language)];
 }

src/intro.cpp

@@ -324,7 +324,7 @@ namespace startup
 		console.main().empty_line();
 
 		console.main().set_attribute(A_BOLD);
-		console.main().print_centered(select("Versie 3.4.0, (C) 1998, 2022 R.I.P.", "Version 3.4.0, (C) 1998, 2022 R.I.P."));
+		console.main().print_centered(select("Versie 3.4.1, (C) 1998, 2022 R.I.P.", "Version 3.4.1, (C) 1998, 2022 R.I.P."));
 		console.main().unset_attribute(A_BOLD);
 		console.main().empty_line();
 	}

src/parser.cpp

@@ -26,7 +26,7 @@ void Parser::parse_combine_parameters(CoreData& core, ParseData& parse_data, con
 		console.input().print_error(select(
 			"syntax: combineer <voorwerp> en/met <voorwerp>"
 		, 
-			"syntax: {command} <object> and/with <object>"
+			"syntax: combine <object> and/with <object>"
 		));
 		parse_data.parse_error = true;