diff options
| author | Philipp Sehmisch <crush@themanaworld.org> | 2009-08-16 18:25:55 +0200 |
|---|---|---|
| committer | Philipp Sehmisch <crush@themanaworld.org> | 2009-08-16 18:25:55 +0200 |
| commit | 4263962e947b4914de8d1750f21cc7cc82567b4d (patch) | |
| tree | 32340098913c302fdb33f88ffea65fb36920db75 /src/flooritem.cpp | |
| parent | dd0844b6ac01293e7afd0dd85e695b8d77b8e4be (diff) | |
| parent | 7e2673a3b9460fdcd646e23c3bd9039de854565f (diff) | |
| download | mana-4263962e947b4914de8d1750f21cc7cc82567b4d.tar.gz mana-4263962e947b4914de8d1750f21cc7cc82567b4d.tar.bz2 mana-4263962e947b4914de8d1750f21cc7cc82567b4d.tar.xz mana-4263962e947b4914de8d1750f21cc7cc82567b4d.zip | |
More merges and conflict resolves
Diffstat (limited to 'src/flooritem.cpp')
| -rw-r--r-- | src/flooritem.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/flooritem.cpp b/src/flooritem.cpp index b08258c1..9376dd73 100644 --- a/src/flooritem.cpp +++ b/src/flooritem.cpp @@ -41,13 +41,13 @@ FloorItem::FloorItem(int id, mItem = new Item(itemId); // Add ourselves to the map - mSpriteIterator = mMap->addSprite(this); + mMapSprite = mMap->addSprite(this); } FloorItem::~FloorItem() { // Remove ourselves from the map - mMap->removeSprite(mSpriteIterator); + mMap->removeSprite(mMapSprite); delete mItem; } |