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

code/branches/cpp11_v3/src/modules/weapons/projectiles/Rocket.cc

@@ -117 +117 @@
         else
         {
-            this->defSndWpnEngine_ = 0;
-            this->defSndWpnLaunch_ = 0;
+            this->defSndWpnEngine_ = nullptr;
+            this->defSndWpnLaunch_ = nullptr;
         }