cpp/openttd-patchpack/source Changeset - r17257:6860fed50c0e

Changeset - r17257:6860fed50c0e

Parent rev.

Child rev.

[Not reviewed]

master

0 5 0

rubidium - 13 years ago 2011-02-07 09:51:16
rubidium@openttd.org

(svn r22007) -Change: only show one AI per unique ID instead of all versions in the output of "openttd -h"

5 files changed with 9 insertions and 8 deletions:

src/ai/ai.hpp

src/ai/ai_core.cpp

src/ai/ai_scanner.cpp

src/ai/ai_scanner.hpp

src/openttd.cpp

0 comments (0 inline, 0 general)

src/ai/ai.hpp

➞

Show inline comments

@@ @@ -125,7 +125,7 @@ public: @@
 	static int GetStartNextTime();
 	/** Wrapper function for AIScanner::GetAIConsoleList */
 	static char *GetConsoleList(char *p, const char *last);
+	static char *GetConsoleList(char *p, const char *last, bool newest_only = false);
 	/** Wrapper function for AIScanner::GetAIConsoleLibraryList */
 	static char *GetConsoleLibraryList(char *p, const char *last);
 	/** Wrapper function for AIScanner::GetAIInfoList */

src/ai/ai_core.cpp

➞

Show inline comments

@@ @@ -289,9 +289,9 @@ void CcAI(const CommandCost &result, Til @@
 	return DAYS_IN_YEAR;
+}
 /* static */ char *AI::GetConsoleList(char *p, const char *last)
+/* static */ char *AI::GetConsoleList(char *p, const char *last, bool newest_only)
+{
 	return AI::ai_scanner->GetAIConsoleList(p, last);
+	return AI::ai_scanner->GetAIConsoleList(p, last, newest_only);
+}
 /* static */ char *AI::GetConsoleLibraryList(char *p, const char *last)

src/ai/ai_scanner.cpp

➞

Show inline comments

@@ @@ -330,11 +330,12 @@ AIInfo *AIScanner::FindInfo(const char * @@
 	return info;
+}
 char *AIScanner::GetAIConsoleList(char *p, const char *last) const
+char *AIScanner::GetAIConsoleList(char *p, const char *last, bool newest_only) const
+{
 	p += seprintf(p, last, "List of AIs:\n");
 	AIInfoList::const_iterator it = this->info_list.begin();
 	for (; it != this->info_list.end(); it++) {
 	const AIInfoList &list = newest_only ? this->info_single_list : this->info_list;
 	AIInfoList::const_iterator it = list.begin();
 	for (; it != list.end(); it++) {
 		AIInfo *i = (*it).second;
 		p += seprintf(p, last, "%10s (v%d): %s\n", i->GetName(), i->GetVersion(), i->GetDescription());
+	}

src/ai/ai_scanner.hpp

➞

Show inline comments

@@ @@ -53,7 +53,7 @@ public: @@
 	/**
 	 * Get the list of available AIs for the console.
 	 */
 	char *GetAIConsoleList(char *p, const char *last) const;
+	char *GetAIConsoleList(char *p, const char *last, bool newest_only) const;
 	/**
 	 * Get the list of available AI Libraries for the console.

src/openttd.cpp

➞

Show inline comments

@@ @@ -204,7 +204,7 @@ static void ShowHelp() @@
 	/* We need to initialize the AI, so it finds the AIs */
 	TarScanner::DoScan();
 	AI::Initialize();
 	p = AI::GetConsoleList(p, lastof(buf));
+	p = AI::GetConsoleList(p, lastof(buf), true);
 	AI::Uninitialize(true);
 	/* ShowInfo put output to stderr, but version information should go

0 comments (0 inline, 0 general)