gronod/OpenTTD
1
0
Fork 0
mirror of https://github.com/OpenTTD/OpenTTD.git synced 2025-03-12 18:40:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

Codechange: Simplify CheckAPIVersion()

Browse Source
This commit is contained in:
glx 2020-02-14 17:53:24 +01:00 committed by glx22
parent 05b50aa437
commit 47790b09a4
2 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/ai/ai_info.cpp
View File

@ -15,6 +15,7 @@
#include "../debug.h" #include "../debug.h"
#include "../string_func.h" #include "../string_func.h"
#include "../rev.h" #include "../rev.h"
#include <set>
#include "../safeguards.h" #include "../safeguards.h"
@ -24,11 +25,8 @@
*/ */
static bool CheckAPIVersion(const char *api_version) static bool CheckAPIVersion(const char *api_version)
{ {
return strcmp(api_version, "0.7") == 0 || strcmp(api_version, "1.0") == 0 || strcmp(api_version, "1.1") == 0 || static const std::set<std::string> versions = { "0.7", "1.0", "1.1", "1.2", "1.3", "1.4", "1.5", "1.6", "1.7", "1.8", "1.9", "1.10", "1.11" };
strcmp(api_version, "1.2") == 0 || strcmp(api_version, "1.3") == 0 || strcmp(api_version, "1.4") == 0 || return versions.find(api_version) != versions.end();
strcmp(api_version, "1.5") == 0 || strcmp(api_version, "1.6") == 0 || strcmp(api_version, "1.7") == 0 ||
strcmp(api_version, "1.8") == 0 || strcmp(api_version, "1.9") == 0 || strcmp(api_version, "1.10") == 0 ||
strcmp(api_version, "1.11") == 0;
} }
#if defined(_WIN32) #if defined(_WIN32)

7
src/game/game_info.cpp
View File

@ -13,6 +13,7 @@
#include "game_info.hpp" #include "game_info.hpp"
#include "game_scanner.hpp" #include "game_scanner.hpp"
#include "../debug.h" #include "../debug.h"
#include <set>
#include "../safeguards.h" #include "../safeguards.h"
@ -22,10 +23,8 @@
*/ */
static bool CheckAPIVersion(const char *api_version) static bool CheckAPIVersion(const char *api_version)
{ {
return strcmp(api_version, "1.2") == 0 || strcmp(api_version, "1.3") == 0 || strcmp(api_version, "1.4") == 0 || static const std::set<std::string> versions = {"1.2", "1.3", "1.4", "1.5", "1.6", "1.7", "1.8", "1.9", "1.10", "1.11"};
strcmp(api_version, "1.5") == 0 || strcmp(api_version, "1.6") == 0 || strcmp(api_version, "1.7") == 0 || return versions.find(api_version) != versions.end();
strcmp(api_version, "1.8") == 0 || strcmp(api_version, "1.9") == 0 || strcmp(api_version, "1.10") == 0 ||
strcmp(api_version, "1.11") == 0;
} }
#if defined(_WIN32) #if defined(_WIN32)