diff options
| author | peter1138 <peter1138@openttd.org> | 2008-05-06 17:24:27 +0000 |
|---|---|---|
| committer | peter1138 <peter1138@openttd.org> | 2008-05-06 17:24:27 +0000 |
| commit | c025d7a152a5e32f5b5148f43e962e33a7a59c09 (patch) | |
| tree | 5a6d3a3aa5964ad5d2f3016d86ff1f7ccc787c66 | |
| parent | 780db88e99847d935d91593f8a44016a9269a697 (diff) | |
| download | openttd-c025d7a152a5e32f5b5148f43e962e33a7a59c09.tar.xz | |
(svn r12973) -Codechange: Rename GRMSpriteEntry to GRFLocation, as it is not necessarily specific to GRM sprites...
| -rw-r--r-- | src/newgrf.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/newgrf.cpp b/src/newgrf.cpp index d48974807..cf050e455 100644 --- a/src/newgrf.cpp +++ b/src/newgrf.cpp @@ -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) { } + GRFLocation(uint32 grfid, uint32 nfoline) : grfid(grfid), nfoline(nfoline) { } - bool operator<(const GRMSpriteEntry &other) const + 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; |