cpp/openttd-patchpack/source Changeset - r15196:77940844856f

Changeset - r15196:77940844856f

Parent rev.

Child rev.

[Not reviewed]

master

0 2 0

alberth - 14 years ago 2010-05-16 18:50:37
alberth@openttd.org

(svn r19835) -Codechange: Extract grfident equality check to its own method.

2 files changed with 13 insertions and 5 deletions:

src/newgrf_config.cpp

src/newgrf_config.h

0 comments (0 inline, 0 general)

src/newgrf_config.cpp

➞

Show inline comments

@@ @@ -443,29 +443,25 @@ void ScanNewGRFFiles() @@
 #endif
+}
 /** Find a NewGRF in the scanned list.
  * @param grfid GRFID to look for,
  * @param md5sum Expected MD5 sum (set to \c NULL if not relevant).
  * @return The matching grf, if it exists in #_all_grfs, else \c NULL.
  */
 const GRFConfig *FindGRFConfig(uint32 grfid, const uint8 *md5sum)
+{
 	for (const GRFConfig *c = _all_grfs; c != NULL; c = c->next) {
 		if (c->ident.grfid == grfid) {
 			if (md5sum == NULL) return c;
 			if (memcmp(md5sum, c->ident.md5sum, sizeof(c->ident.md5sum)) == 0) return c;
+		}
 		if (c->ident.HasGrfIdentifier(grfid, md5sum)) return c;
+	}
 	return NULL;
+}
 #ifdef ENABLE_NETWORK
 /** Structure for UnknownGRFs; this is a lightweight variant of GRFConfig */
 struct UnknownGRF : public GRFIdentifier {
 	UnknownGRF *next;
 	char   name[NETWORK_GRF_NAME_LENGTH];
 };

src/newgrf_config.h

➞

Show inline comments

@@ @@ -44,24 +44,36 @@ enum GRFBugs { @@
 /** Status of post-gameload GRF compatibility check */
 enum GRFListCompatibility {
 	GLC_ALL_GOOD,   ///< All GRF needed by game are present
 	GLC_COMPATIBLE, ///< Compatible (eg. the same ID, but different chacksum) GRF found in at least one case
 	GLC_NOT_FOUND   ///< At least one GRF couldn't be found (higher priority than GLC_COMPATIBLE)
 };
 /** Basic data to distinguish a GRF. Used in the server list window */
 struct GRFIdentifier {
 	uint32 grfid;     ///< GRF ID (defined by Action 0x08)
 	uint8 md5sum[16]; ///< MD5 checksum of file to distinguish files with the same GRF ID (eg. newer version of GRF)
 	/** Does the identification match the provided values?
 	 * @param grfid  Expected grfid.
 	 * @param md5sum Expected md5sum, may be \c NULL (in which case, do not check it).
 	 * @return the object has the provided grfid and md5sum.
 	 */
 	FORCEINLINE bool HasGrfIdentifier(uint32 grfid, const uint8 *md5sum) const
+	{
 		if (this->grfid != grfid) return false;
 		if (md5sum == NULL) return true;
 		return memcmp(md5sum, this->md5sum, sizeof(this->md5sum)) == 0;
+	}
 };
 /** Information about why GRF had problems during initialisation */
 struct GRFError : ZeroedMemoryAllocator {
 	GRFError(StringID severity, StringID message = 0);
 	~GRFError();
 	char *custom_message;  ///< Custom message (if present)
 	char *data;            ///< Additional data for message and custom_message
 	StringID message;      ///< Default message
 	StringID severity;     ///< Info / Warning / Error / Fatal
 	uint8 num_params;      ///< Number of additinal parameters for message and custom_message (0, 1 or 2)

0 comments (0 inline, 0 general)