Mercurial > hg > openttd
changeset 9113:09918e17ecde draft
(svn r12973) -Codechange: Rename GRMSpriteEntry to GRFLocation, as it is not necessarily specific to GRM sprites...
| author | peter1138 <peter1138@openttd.org> |
|---|---|
| date | Tue, 06 May 2008 17:24:27 +0000 |
| parents | 2699928ebd85 |
| children | cf81a7f9bd80 |
| files | src/newgrf.cpp |
| diffstat | 1 files changed, 7 insertions(+), 7 deletions(-) [+] |
line wrap: on
line diff
--- a/src/newgrf.cpp +++ b/src/newgrf.cpp @@ -118,19 +118,19 @@ /* 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 @@ /* 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 @@ 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;