Changeset 11054 for code/branches/cpp11_v3/src/modules/overlays/GUIOverlay.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/overlays/GUIOverlay.cc (modified) (1 diff)

code/branches/cpp11_v3/src/modules/overlays/GUIOverlay.cc

@@ -92 +92 @@
             ControllableEntity* entity = orxonox_cast<ControllableEntity*>(this->getOwner());
             if (entity)
-                GUIManager::getInstance().setPlayer(name, entity->getPlayer()); //Set Player is going to be NULL, so it needs to be set in changedVisibility() as well.
+                GUIManager::getInstance().setPlayer(name, entity->getPlayer()); //Set Player is going to be nullptr, so it needs to be set in changedVisibility() as well.
         }
     }