diff options
| author | Andrei Karas <akaras@inbox.ru> | 2011-11-13 04:57:16 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2011-11-13 04:57:16 +0300 |
| commit | 4d453108f45f9fb2ff4f5715cc1b3ddd63d36a80 (patch) | |
| tree | c1edb8d8b368fdd43cd8639e6044b0f4e8dde70a /src/rotationalparticle.cpp | |
| parent | ece00592ecd93f7a96db0ca82589d00846e2f938 (diff) | |
| parent | d471e99fd38ac589a8a9e8e8677b9f577f0cc5c6 (diff) | |
| download | manaverse-stripped1.1.11.12.tar.gz manaverse-stripped1.1.11.12.tar.bz2 manaverse-stripped1.1.11.12.tar.xz manaverse-stripped1.1.11.12.zip | |
Merge branch 'master' into strippedstripped1.1.11.12
Conflicts:
data/fonts/mplus-1p-bold.ttf
data/fonts/mplus-1p-regular.ttf
src/guichan/basiccontainer.cpp
src/guichan/focushandler.cpp
src/guichan/graphics.cpp
src/guichan/gui.cpp
src/guichan/image.cpp
src/guichan/include/guichan/widgets/checkbox.hpp
src/guichan/include/guichan/widgets/dropdown.hpp
src/guichan/sdl/sdlgraphics.cpp
src/guichan/sdl/sdlimage.cpp
src/guichan/widget.cpp
src/guichan/widgets/dropdown.cpp
src/guichan/widgets/icon.cpp
src/guichan/widgets/imagebutton.cpp
src/guichan/widgets/listbox.cpp
src/guichan/widgets/scrollarea.cpp
src/guichan/widgets/tab.cpp
src/guichan/widgets/tabbedarea.cpp
src/guichan/widgets/textbox.cpp
src/guichan/widgets/window.cpp
Diffstat (limited to 'src/rotationalparticle.cpp')
| -rw-r--r-- | src/rotationalparticle.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/rotationalparticle.cpp b/src/rotationalparticle.cpp index 60d818cd9..c7c0d10bf 100644 --- a/src/rotationalparticle.cpp +++ b/src/rotationalparticle.cpp @@ -29,7 +29,7 @@ #define PI 3.14159265 RotationalParticle::RotationalParticle(Map *map, Animation *animation): - ImageParticle(map, NULL), + ImageParticle(map, nullptr), mAnimation(new SimpleAnimation(animation)) { } @@ -44,8 +44,8 @@ RotationalParticle::RotationalParticle(Map *map, xmlNodePtr animationNode, RotationalParticle::~RotationalParticle() { delete mAnimation; - mAnimation = 0; - mImage = 0; + mAnimation = nullptr; + mImage = nullptr; } bool RotationalParticle::update() |