Changeset 11054 for code/branches/cpp11_v3/src/modules/pong/PongCenterpoint.cc

Timestamp:

Jan 10, 2016, 1:54:11 PM (9 years ago)

Author:

landauf

Message:

merged branch cpp11_v2 into cpp11_v3

Location:

code/branches/cpp11_v3

Files:

• . (modified) (1 prop)
• src/modules/pong/PongCenterpoint.cc (modified) (1 diff)

code/branches/cpp11_v3/src/modules/pong/PongCenterpoint.cc

@@ -84 +84 @@
     void PongCenterpoint::checkGametype()
     {
-        if (this->getGametype() != NULL && this->getGametype()->isA(Class(Pong)))
+        if (this->getGametype() != nullptr && this->getGametype()->isA(Class(Pong)))
         {
             Pong* pongGametype = orxonox_cast<Pong*>(this->getGametype());