openttd updated to 1.5.0-beta2

--HG--
branch : openttd
This commit is contained in:
Pavel Stupnikov
2015-03-01 00:30:53 +03:00
parent 0abb47ce90
commit d201932121
682 changed files with 26103 additions and 16553 deletions
+10 -8
View File
@@ -1,4 +1,4 @@
/* $Id: game_scanner.cpp 23740 2012-01-03 21:32:51Z rubidium $ */
/* $Id: game_scanner.cpp 26487 2014-04-23 21:16:58Z rubidium $ */
/*
* This file is part of OpenTTD.
@@ -15,15 +15,17 @@
#include "game_info.hpp"
#include "game_scanner.hpp"
#include "../safeguards.h"
void GameScannerInfo::Initialize()
{
ScriptScanner::Initialize("GSScanner");
}
void GameScannerInfo::GetScriptName(ScriptInfo *info, char *name, int len)
void GameScannerInfo::GetScriptName(ScriptInfo *info, char *name, const char *last)
{
snprintf(name, len, "%s", info->GetName());
seprintf(name, last, "%s", info->GetName());
}
void GameScannerInfo::RegisterAPI(class Squirrel *engine)
@@ -37,7 +39,7 @@ GameInfo *GameScannerInfo::FindInfo(const char *nameParam, int versionParam, boo
if (nameParam == NULL) return NULL;
char game_name[1024];
ttd_strlcpy(game_name, nameParam, sizeof(game_name));
strecpy(game_name, nameParam, lastof(game_name));
strtolower(game_name);
GameInfo *info = NULL;
@@ -59,7 +61,7 @@ GameInfo *GameScannerInfo::FindInfo(const char *nameParam, int versionParam, boo
if (force_exact_match) {
/* Try to find a direct 'name.version' match */
char game_name_tmp[1024];
snprintf(game_name_tmp, sizeof(game_name_tmp), "%s.%d", game_name, versionParam);
seprintf(game_name_tmp, lastof(game_name_tmp), "%s.%d", game_name, versionParam);
strtolower(game_name_tmp);
if (this->info_list.find(game_name_tmp) != this->info_list.end()) return static_cast<GameInfo *>(this->info_list[game_name_tmp]);
}
@@ -84,10 +86,10 @@ void GameScannerLibrary::Initialize()
ScriptScanner::Initialize("GSScanner");
}
void GameScannerLibrary::GetScriptName(ScriptInfo *info, char *name, int len)
void GameScannerLibrary::GetScriptName(ScriptInfo *info, char *name, const char *last)
{
GameLibrary *library = static_cast<GameLibrary *>(info);
snprintf(name, len, "%s.%s", library->GetCategory(), library->GetInstanceName());
seprintf(name, last, "%s.%s", library->GetCategory(), library->GetInstanceName());
}
void GameScannerLibrary::RegisterAPI(class Squirrel *engine)
@@ -99,7 +101,7 @@ GameLibrary *GameScannerLibrary::FindLibrary(const char *library, int version)
{
/* Internally we store libraries as 'library.version' */
char library_name[1024];
snprintf(library_name, sizeof(library_name), "%s.%d", library, version);
seprintf(library_name, lastof(library_name), "%s.%d", library, version);
strtolower(library_name);
/* Check if the library + version exists */