diff options
| author | Bjørn Lindeijer <bjorn@lindeijer.nl> | 2007-09-19 17:28:33 +0000 |
|---|---|---|
| committer | Bjørn Lindeijer <bjorn@lindeijer.nl> | 2007-09-19 17:28:33 +0000 |
| commit | 1a9320fafb23940d0463e6f384713d0f99fc0c61 (patch) | |
| tree | d152680dbdc8febf0b5a445ba760255068d72f04 /src/imageparticle.cpp | |
| parent | 2f027ebcf8f0ad78f7edf58af7dda94d89034c85 (diff) | |
| download | mana-1a9320fafb23940d0463e6f384713d0f99fc0c61.tar.gz mana-1a9320fafb23940d0463e6f384713d0f99fc0c61.tar.bz2 mana-1a9320fafb23940d0463e6f384713d0f99fc0c61.tar.xz mana-1a9320fafb23940d0463e6f384713d0f99fc0c61.zip | |
Merged 0.0 changes from revision 3362 to 3580 to trunk.
Diffstat (limited to 'src/imageparticle.cpp')
| -rw-r--r-- | src/imageparticle.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/imageparticle.cpp b/src/imageparticle.cpp index 35cc21ad..17581a2a 100644 --- a/src/imageparticle.cpp +++ b/src/imageparticle.cpp @@ -31,12 +31,12 @@ ImageParticle::ImageParticle(Map *map, Image *image): Particle(map), mImage(image) { - mImage->incRef(); + if (mImage) mImage->incRef(); } ImageParticle::~ImageParticle() { - mImage->decRef(); + if (mImage) mImage->decRef(); } void ImageParticle::draw(Graphics *graphics, int offsetX, int offsetY) const @@ -44,8 +44,8 @@ void ImageParticle::draw(Graphics *graphics, int offsetX, int offsetY) const if (!mAlive) return; - int screenX = (int) mPosX + offsetX - mImage->getWidth() / 2; - int screenY = (int) mPosY - (int) mPosZ + offsetY - mImage->getHeight()/2; + int screenX = (int) mPos.x + offsetX - mImage->getWidth() / 2; + int screenY = (int) mPos.y - (int)mPos.z + offsetY - mImage->getHeight()/2; // Check if on screen if (screenX + mImage->getWidth() < 0 || |