Pull Sound-manager out of FGGlobals

[flightgear.git] / src / Environment / fgclouds.cxx

diff --git a/src/Environment/fgclouds.cxx b/src/Environment/fgclouds.cxx
index f83a7276740d0b5c3b2b53e6870e5069a2602699..58653e05364c3dce780ab2695d3f308743ff8406 100644 (file)
--- a/src/Environment/fgclouds.cxx
+++ b/src/Environment/fgclouds.cxx
@@ -57,6 +57,10 @@ FGClouds::FGClouds() :
 
 FGClouds::~FGClouds()
 {
+    globals->get_commands()->removeCommand("add-cloud");
+       globals->get_commands()->removeCommand("del-cloud");
+       globals->get_commands()->removeCommand("move-cloud");
+
 }
 
 int FGClouds::get_update_event(void) const {
@@ -214,11 +218,10 @@ void FGClouds::buildLayer(int iLayer, const string& name, double coverage) {
                        double count = acloud->getDoubleValue("count", 1.0);
                        tCloudVariety[CloudVarietyCount].count = count;
                        int variety = 0;
-                       cloud_name = cloud_name + "-%d";
                        char variety_name[50];
                        do {
                                variety++;
-                               snprintf(variety_name, sizeof(variety_name) - 1, cloud_name.c_str(), variety);
+                               snprintf(variety_name, sizeof(variety_name) - 1, "%s-%d", cloud_name.c_str(), variety);
                        } while( box_def_root->getChild(variety_name, 0, false) );
 
                        totalCount += count;