diff options
author | Jared Adams <jaxad0127@gmail.com> | 2009-08-13 17:30:59 -0600 |
---|---|---|
committer | Jared Adams <jaxad0127@gmail.com> | 2009-08-13 17:33:08 -0600 |
commit | f46cfb91278b27f4943f5512778129fe985c678e (patch) | |
tree | 0be219d66e723bcca8de2d584d66bc65d040fb26 /src/map.cpp | |
parent | be85ca9d91ff867faf140328d0bcbb2062b58cdf (diff) | |
download | mana-client-f46cfb91278b27f4943f5512778129fe985c678e.tar.gz mana-client-f46cfb91278b27f4943f5512778129fe985c678e.tar.bz2 mana-client-f46cfb91278b27f4943f5512778129fe985c678e.tar.xz mana-client-f46cfb91278b27f4943f5512778129fe985c678e.zip |
Clean up Being and it's derivatives
Move stuff only needed for Players into Player (like slots and sprite
limits). Move name handling into Being (no need for three copies of
this code). Clean up terminology (including Map terminology). Remove
hair-related variables.
Diffstat (limited to 'src/map.cpp')
-rw-r--r-- | src/map.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/map.cpp b/src/map.cpp index dbecda3d..5f6433c2 100644 --- a/src/map.cpp +++ b/src/map.cpp @@ -123,7 +123,7 @@ Image* MapLayer::getTile(int x, int y) const void MapLayer::draw(Graphics *graphics, int startX, int startY, int endX, int endY, int scrollX, int scrollY, - const Sprites &sprites) const + const MapSprites &sprites) const { startX -= mX; startY -= mY; @@ -135,7 +135,7 @@ void MapLayer::draw(Graphics *graphics, int startX, int startY, if (endX > mWidth) endX = mWidth; if (endY > mHeight) endY = mHeight; - Sprites::const_iterator si = sprites.begin(); + MapSprites::const_iterator si = sprites.begin(); for (int y = startY; y < endY; y++) { @@ -467,13 +467,13 @@ MetaTile *Map::getMetaTile(int x, int y) const return &mMetaTiles[x + y * mWidth]; } -SpriteIterator Map::addSprite(Sprite *sprite) +MapSprite Map::addSprite(Sprite *sprite) { mSprites.push_front(sprite); return mSprites.begin(); } -void Map::removeSprite(SpriteIterator iterator) +void Map::removeSprite(MapSprite iterator) { mSprites.erase(iterator); } |