From 02658040031f93f91ef50c947443b5efdd938c12 Mon Sep 17 00:00:00 2001 From: erorcun Date: Wed, 21 Oct 2020 03:55:35 +0300 Subject: Cross-platform fix and a little style change --- src/text/Messages.cpp | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) (limited to 'src/text/Messages.cpp') diff --git a/src/text/Messages.cpp b/src/text/Messages.cpp index 70225860..257a47ce 100644 --- a/src/text/Messages.cpp +++ b/src/text/Messages.cpp @@ -71,10 +71,7 @@ CMessages::WideStringCompare(wchar *str1, wchar *str2, uint16 size) if (len1 != len2 && (len1 < size || len2 < size)) return false; - for (int32 i = 0; i < size; i++) { - if (FixupChar(str1[i]) == '\0' || i > size) - break; - + for (int32 i = 0; FixupChar(str1[i]) != '\0' && i < size; i++) { if (FixupChar(str1[i]) != FixupChar(str2[i])) return false; } @@ -393,7 +390,7 @@ CMessages::InsertNumberInString(wchar *str, int32 n1, int32 n2, int32 n3, int32 if (str[c] == '~' && str[c + 1] == '1' && str[c + 2] == '~') { #endif c += 3; - for (int j=0; j