diff options
| author | Andrei Karas <akaras@inbox.ru> | 2016-04-17 23:06:06 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2016-04-17 23:06:56 +0300 |
| commit | dba0611175c8d4a56dfbc918ccef139351e5c3e0 (patch) | |
| tree | b3c7a5684604facc0f0f5656fe373958c53dc5ad /src/particle/particle.h | |
| parent | 53530f76275df76406a9ce438a33df78c50d0948 (diff) | |
| download | manaplus-dba0611175c8d4a56dfbc918ccef139351e5c3e0.tar.gz manaplus-dba0611175c8d4a56dfbc918ccef139351e5c3e0.tar.bz2 manaplus-dba0611175c8d4a56dfbc918ccef139351e5c3e0.tar.xz manaplus-dba0611175c8d4a56dfbc918ccef139351e5c3e0.zip | |
Revert "Remove override keyword, if it present with final."
This reverts commit 55480eb4477b2cf85af1bcdcc5e8ec4f4ce6682d.
Diffstat (limited to 'src/particle/particle.h')
| -rw-r--r-- | src/particle/particle.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/particle/particle.h b/src/particle/particle.h index fe268a088..0cce98180 100644 --- a/src/particle/particle.h +++ b/src/particle/particle.h @@ -224,10 +224,10 @@ class Particle notfinal : public Actor { mAutoDelete = false; } /** We consider particles (at least for now) to be one layer-sprites */ - int getNumberOfLayers() const restrict2 final + int getNumberOfLayers() const restrict2 override final { return 1; } - float getAlpha() const restrict2 final + float getAlpha() const restrict2 override final { return 1.0F; } void setAlpha(const float alpha A_UNUSED) restrict2 override |