diff options
| author | Andrei Karas <akaras@inbox.ru> | 2011-11-08 00:44:17 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2011-11-08 00:44:17 +0300 |
| commit | 4cea2a5cd85b8d3ad905eb3b337b28284c62d4fe (patch) | |
| tree | 714897eca03fbcb764f5b450a29cc1aef8d33433 /src/resources/beinginfo.cpp | |
| parent | 9e83411f7e4147d09af5a5006888dcc187ea0ef8 (diff) | |
| download | plus-4cea2a5cd85b8d3ad905eb3b337b28284c62d4fe.tar.gz plus-4cea2a5cd85b8d3ad905eb3b337b28284c62d4fe.tar.bz2 plus-4cea2a5cd85b8d3ad905eb3b337b28284c62d4fe.tar.xz plus-4cea2a5cd85b8d3ad905eb3b337b28284c62d4fe.zip | |
Fix more gcc 4.7 warnings.
Diffstat (limited to 'src/resources/beinginfo.cpp')
| -rw-r--r-- | src/resources/beinginfo.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/resources/beinginfo.cpp b/src/resources/beinginfo.cpp index 4aa7515b1..0b2aaa8fa 100644 --- a/src/resources/beinginfo.cpp +++ b/src/resources/beinginfo.cpp @@ -29,7 +29,7 @@ #include "debug.h" -BeingInfo *BeingInfo::unknown = 0; +BeingInfo *BeingInfo::unknown = nullptr; Attack *BeingInfo::empty = new Attack(SpriteAction::ATTACK, "", ""); BeingInfo::BeingInfo(): @@ -121,7 +121,7 @@ void BeingInfo::addAttack(int id, std::string action, void BeingInfo::clear() { delete unknown; - unknown = 0; + unknown = nullptr; delete empty; - empty = 0; + empty = nullptr; } |