cpp/openttd-patchpack/source Changeset - r12670:39f36ac861e2

Changeset - r12670:39f36ac861e2

Parent rev.

Child rev.

[Not reviewed]

master

0 1 0

rubidium - 15 years ago 2009-08-09 18:44:35
rubidium@openttd.org

(svn r17135) -Fix (r17133): some (older) GCCs failed to compile

1 file changed with 6 insertions and 2 deletions:

src/base_media_base.h

0 comments (0 inline, 0 general)

src/base_media_base.h

➞

Show inline comments

@@ @@ -4,12 +4,16 @@ @@
 #ifndef BASE_MEDIA_BASE_H
 #define BASE_MEDIA_BASE_H
 #include "fileio_func.h"
 /* Forward declare these; can't do 'struct X' in functions as older GCCs barf on that */
 struct IniFile;
 struct ContentInfo;
 /** Structure holding filename and MD5 information about a single file */
 struct MD5File {
 	const char *filename;        ///< filename
 	uint8 hash[16];              ///< md5 sum of the file
 	const char *missing_warning; ///< warning when this file is missing
@@ @@ -64,13 +68,13 @@ struct BaseSet { @@
 	/**
 	 * Read the set information from a loaded ini.
 	 * @param ini      the ini to read from
 	 * @param path     the path to this ini file (for filenames)
 	 * @return true if loading was successful.
 	 */
-	bool FillSetDetails(struct IniFile *ini, const char *path);
 	bool FillSetDetails(IniFile *ini, const char *path);
 };
 /**
  * Base for all base media (graphics, sound)
  * @tparam Tbase_set the real set we're going to be
  */
@@ @@ -146,13 +150,13 @@ public: @@
 	/**
 	 * Check whether we have an set with the exact characteristics as ci.
 	 * @param ci the characteristics to search on (shortname and md5sum)
 	 * @param md5sum whether to check the MD5 checksum
 	 * @return true iff we have an set matching.
 	 */
-	static bool HasSet(const struct ContentInfo *ci, bool md5sum);
 	static bool HasSet(const ContentInfo *ci, bool md5sum);
 };
 /** Types of graphics in the base graphics set */
 enum GraphicsFileType {
 	GFT_BASE,     ///< Base sprites for all climates

0 comments (0 inline, 0 general)