From f8292a8d11724cdbcf07fe36c2a1399590bb542c Mon Sep 17 00:00:00 2001 From: frosch Date: Mon, 24 Mar 2025 18:23:50 +0100 Subject: [PATCH] Codechange: Remove unused/obscure strgen feature for relative offsets in plural/gender choice lists. --- src/strgen/strgen_base.cpp | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/src/strgen/strgen_base.cpp b/src/strgen/strgen_base.cpp index 75ddd9f72d..aa23bc1bbf 100644 --- a/src/strgen/strgen_base.cpp +++ b/src/strgen/strgen_base.cpp @@ -235,25 +235,16 @@ void EmitSingleChar(Buffer *buffer, char *buf, int value) } /* The plural specifier looks like - * {NUM} {PLURAL -1 passenger passengers} then it picks either passenger/passengers depending on the count in NUM */ + * {NUM} {PLURAL passenger passengers} then it picks either passenger/passengers depending on the count in NUM */ static bool ParseRelNum(char **buf, int *value, int *offset) { const char *s = *buf; char *end; - bool rel = false; while (*s == ' ' || *s == '\t') s++; - if (*s == '+') { - rel = true; - s++; - } int v = std::strtol(s, &end, 0); if (end == s) return false; - if (rel || v < 0) { - *value += v; - } else { - *value = v; - } + *value = v; if (offset != nullptr && *end == ':') { /* Take the Nth within */ s = end + 1;