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

Merge branch 'master' into jgrpp

Browse Source 
# Conflicts:
#	src/airport_gui.cpp
#	src/blitter/32bpp_anim_sse4.cpp
#	src/console_cmds.cpp
#	src/linkgraph/linkgraph_gui.cpp
#	src/newgrf_object.h
#	src/road_gui.cpp
#	src/widgets/road_widget.h
#	src/window.cpp
This commit is contained in:
Jonathan G Rennison
2022-10-16 20:14:13 +01:00
parent 7f782a1bc3 3b071f47e4
commit 0a9c44d1a2
82 changed files with 778 additions and 341 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/game/game.hpp
View File

@@ -93,9 +93,9 @@ public:
static void Load(int version);
/** Wrapper function for GameScanner::GetConsoleList */
static char *GetConsoleList(char *p, const char *last, bool newest_only = false);
static std::string GetConsoleList(bool newest_only = false);
/** Wrapper function for GameScanner::GetConsoleLibraryList */
static char *GetConsoleLibraryList(char *p, const char *last);
static std::string GetConsoleLibraryList();
/** Wrapper function for GameScanner::GetInfoList */
static const ScriptInfoList *GetInfoList();
/** Wrapper function for GameScanner::GetUniqueInfoList */

8
src/game/game_core.cpp
View File

@@ -222,14 +222,14 @@
}
}
/* static */ char *Game::GetConsoleList(char *p, const char *last, bool newest_only)
/* static */ std::string Game::GetConsoleList(bool newest_only)
{
return Game::scanner_info->GetConsoleList(p, last, newest_only);
return Game::scanner_info->GetConsoleList(newest_only);
}
/* static */ char *Game::GetConsoleLibraryList(char *p, const char *last)
/* static */ std::string Game::GetConsoleLibraryList()
{
return Game::scanner_library->GetConsoleList(p, last, true);
return Game::scanner_library->GetConsoleList(true);
}
/* static */ const ScriptInfoList *Game::GetInfoList()