dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'save_ext' into jgrpp

Browse Source
This commit is contained in:
Jonathan G Rennison
2017-04-11 18:42:11 +01:00
parent f2cd869a56 498b3db504
commit d1a287d73c
10 changed files with 89 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/string_func.h
View File

@@ -27,7 +27,6 @@
#define STRING_FUNC_H
#include <stdarg.h>
#include <string>
#include "core/bitmath_func.hpp"
#include "string_type.h"
@@ -56,13 +55,6 @@ static inline void str_validate(char *str, const char *last, StringValidationSet
*str_validate_intl(str, last, settings) = '\0';
}
static inline void str_validate(std::string &str, StringValidationSettings settings = SVS_REPLACE_WITH_QUESTION_MARK)
{
if (str.empty()) return;
char *buf = const_cast<char *>(str.c_str());
str.resize(str_validate_intl(buf, buf + str.size(), settings) - buf);
}
void ValidateString(const char *str);
void str_fix_scc_encoded(char *str, const char *last);