cpp/openttd-patchpack/source Changeset - r19953:b132b7dde65f

Changeset - r19953:b132b7dde65f

Parent rev.

Child rev.

[Not reviewed]

master

0 1 0

frosch - 11 years ago 2013-01-12 17:20:31
frosch@openttd.org

(svn r24909) -Codechange: Remove implicit bool -> integer conversion.

1 file changed with 2 insertions and 2 deletions:

src/strings.cpp

0 comments (0 inline, 0 general)

src/strings.cpp

➞

Show inline comments

@@ @@ -515,37 +515,37 @@ static int DeterminePluralForm(int64 cou @@
 	/* The absolute value determines plurality */
 	uint64 n = abs(count);
 	switch (plural_form) {
 		default:
 			NOT_REACHED();
 		/* Two forms: singular used for one only.
 		 * Used in:
 		 *   Danish, Dutch, English, German, Norwegian, Swedish, Estonian, Finnish,
 		 *   Greek, Hebrew, Italian, Portuguese, Spanish, Esperanto */
 		case 0:
 			return n != 1;
+			return n != 1 ? 1 : 0;
 		/* Only one form.
 		 * Used in:
 		 *   Hungarian, Japanese, Korean, Turkish */
 		case 1:
 			return 0;
 		/* Two forms: singular used for 0 and 1.
 		 * Used in:
 		 *   French, Brazilian Portuguese */
 		case 2:
 			return n > 1;
+			return n > 1 ? 1 : 0;
 		/* Three forms: special cases for 0, and numbers ending in 1 except when ending in 11.
 		 * Used in:
 		 *   Latvian */
 		case 3:
 			return n % 10 == 1 && n % 100 != 11 ? 0 : n != 0 ? 1 : 2;
 		/* Five forms: special cases for 1, 2, 3 to 6, and 7 to 10.
 		 * Used in:
 		 *   Gaelige (Irish) */
 		case 4:
 			return n == 1 ? 0 : n == 2 ? 1 : n < 7 ? 2 : n < 11 ? 3 : 4;

0 comments (0 inline, 0 general)