Changeset 11054 for code/branches/cpp11_v3/src/modules/towerdefense/TowerDefenseTower.cc

Timestamp:

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

Author:

landauf

Message:

merged branch cpp11_v2 into cpp11_v3

Location:

code/branches/cpp11_v3

Files:

• . (modified) (1 prop)
• src/modules/towerdefense/TowerDefenseTower.cc (modified) (1 diff)

code/branches/cpp11_v3/src/modules/towerdefense/TowerDefenseTower.cc

@@ -25 +25 @@
     {
         RegisterObject(TowerDefenseTower);
-        game_ =NULL;
+        game_ =nullptr;
         this->setCollisionType(WorldEntity::None);
         upgrade = 1;