cpp/openttd-patchpack/source Changeset - r9113:d4c7819bf520

Changeset - r9113:d4c7819bf520

Parent rev.

Child rev.

[Not reviewed]

master

0 1 0

peter1138 - 16 years ago 2008-05-06 17:24:27
peter1138@openttd.org

(svn r12973) -Codechange: Rename GRMSpriteEntry to GRFLocation, as it is not necessarily specific to GRM sprites...

1 file changed with 7 insertions and 7 deletions:

src/newgrf.cpp

0 comments (0 inline, 0 general)

src/newgrf.cpp

➞

Show inline comments

@@ @@ -118,19 +118,19 @@ static uint32 _grm_engines[256]; @@
 /* Contains the GRF ID of the owner of a cargo if it has been reserved */
 static uint32 _grm_cargos[NUM_CARGO * 2];
-struct GRMSpriteEntry {
+struct GRFLocation {
 	uint32 grfid;
 	uint32 nfoline;
 	GRMSpriteEntry(uint32 grfid, uint32 nfoline) : grfid(grfid), nfoline(nfoline) { }
 	bool operator<(const GRMSpriteEntry &other) const
 	GRFLocation(uint32 grfid, uint32 nfoline) : grfid(grfid), nfoline(nfoline) { }
 	bool operator<(const GRFLocation &other) const
+	{
 		return this->grfid < other.grfid || (this->grfid == other.grfid && this->nfoline < other.nfoline);
+	}
 };
-static std::map<GRMSpriteEntry, SpriteID> _grm_sprites;
+static std::map<GRFLocation, SpriteID> _grm_sprites;
 /** DEBUG() function dedicated to newGRF debugging messages
  * Function is essentialy the same as DEBUG(grf, severity, ...) with the
@@ @@ -4388,7 +4388,7 @@ static void ParamSet(byte *buf, int len) @@
 							/* Reserve space at the current sprite ID */
 							grfmsg(4, "ParamSet: GRM: Allocated %d sprites at %d", count, _cur_spriteid);
-							_grm_sprites[GRMSpriteEntry(_cur_grffile->grfid, _nfo_line)] = _cur_spriteid;
+							_grm_sprites[GRFLocation(_cur_grffile->grfid, _nfo_line)] = _cur_spriteid;
 							_cur_spriteid += count;
+						}
+					}
@@ @@ -4422,7 +4422,7 @@ static void ParamSet(byte *buf, int len) @@
 							switch (op) {
 								case 0:
 									/* Return space reserved during reservation stage */
-									src1 = _grm_sprites[GRMSpriteEntry(_cur_grffile->grfid, _nfo_line)];
+									src1 = _grm_sprites[GRFLocation(_cur_grffile->grfid, _nfo_line)];
 									grfmsg(4, "ParamSet: GRM: Using pre-allocated sprites at %d", src1);
 									break;

0 comments (0 inline, 0 general)