tBoolean variables can now be only TRUE, FALSE, 0 or 1. YES, NO, OFF and ON are… | |
git clone git://src.adamsgaard.dk/vaccinewars | |
Log | |
Files | |
Refs | |
README | |
LICENSE | |
--- | |
commit 987ee05bceb1689433a117983b4f7ca4f19f04d6 | |
parent 36cf108886919eae2ab9e1e3d3cb50622ece453e | |
Author: Ben Webb <[email protected]> | |
Date: Mon, 12 Aug 2002 11:37:19 +0000 | |
Boolean variables can now be only TRUE, FALSE, 0 or 1. YES, NO, OFF and ON | |
are no longer accepted. TRUE and FALSE are also no longer translated, as | |
tthis meant that configuration files could not be transferred between | |
different translations of dopewars. | |
Diffstat: | |
M src/dopewars.c | 15 +++++---------- | |
1 file changed, 5 insertions(+), 10 deletions(-) | |
--- | |
diff --git a/src/dopewars.c b/src/dopewars.c | |
t@@ -2063,7 +2063,7 @@ void PrintConfigValue(int GlobalIndex, int StructIndex, | |
* TRUE" */ | |
g_print(_("%s is %s\n"), GlobalName, | |
*GetGlobalBoolean(GlobalIndex, StructIndex) ? | |
- _("TRUE") : _("FALSE")); | |
+ "TRUE" : "FALSE"); | |
} else if (Globals[GlobalIndex].PriceVal) { | |
/* Display of a price config. file variable - e.g. "Bitch.MinPrice is | |
* $200" */ | |
t@@ -2177,16 +2177,11 @@ static gboolean SetConfigValue(int GlobalIndex, int St… | |
G_CSET_a_2_z "._0123456789" G_CSET_A_2_Z; | |
parsed = FALSE; | |
if (token == G_TOKEN_IDENTIFIER) { | |
- if (g_strcasecmp(scanner->value.v_identifier, _("TRUE")) == 0 || | |
- g_strcasecmp(scanner->value.v_identifier, _("YES")) == 0 || | |
- g_strcasecmp(scanner->value.v_identifier, _("ON")) == 0 || | |
+ if (g_strcasecmp(scanner->value.v_identifier, "TRUE") == 0 || | |
strcmp(scanner->value.v_identifier, "1") == 0) { | |
parsed = TRUE; | |
*GetGlobalBoolean(GlobalIndex, StructIndex) = TRUE; | |
- } else if (g_strcasecmp(scanner->value.v_identifier, _("FALSE")) == 0 | |
- || g_strcasecmp(scanner->value.v_identifier, _("NO")) == 0 | |
- || g_strcasecmp(scanner->value.v_identifier, | |
- _("OFF")) == 0 | |
+ } else if (g_strcasecmp(scanner->value.v_identifier, "FALSE") == 0 | |
|| strcmp(scanner->value.v_identifier, "0") == 0) { | |
parsed = TRUE; | |
*GetGlobalBoolean(GlobalIndex, StructIndex) = FALSE; | |
t@@ -2194,8 +2189,8 @@ static gboolean SetConfigValue(int GlobalIndex, int Stru… | |
} | |
if (!parsed) { | |
g_scanner_unexp_token(scanner, G_TOKEN_NONE, NULL, NULL, NULL, | |
- _("expected a boolean value (one of 0, OFF, " | |
- "NO, FALSE, 1, ON, YES, TRUE)"), FALSE); | |
+ _("expected a boolean value (one of 0, FALSE, " | |
+ "1, TRUE)"), FALSE); | |
return FALSE; | |
} | |
} else if (Globals[GlobalIndex].PriceVal) { |