Changeset 6313 for code/branches/presentation2

Timestamp:

Dec 10, 2009, 8:49:33 AM (15 years ago)

Author:

scheusso

Message:

further network fixes
changed screenshot format from jpeg to tiff (lossless)

Location:

code/branches/presentation2/src

Files:

• libraries/core/GraphicsManager.cc (modified) (1 diff)
• modules/weapons/projectiles/Rocket.cc (modified) (1 diff)
• orxonox/gamestates/GSMainMenu.cc (modified) (1 diff)
• orxonox/items/MultiStateEngine.cc (modified) (5 diffs)

code/branches/presentation2/src/libraries/core/GraphicsManager.cc

@@ -441 +441 @@
         assert(this->renderWindow_);
        
-        this->renderWindow_->writeContentsToTimestampedFile(PathConfig::getLogPathString() + "screenShot_", ".jpg");
+        this->renderWindow_->writeContentsToTimestampedFile(PathConfig::getLogPathString() + "screenShot_", ".tiff");
     }
 }

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

@@ -89 +89 @@
         this->addCameraPosition(camPosition);
 
-        this->defSndWpnEngine_ = new WorldSound(this);
-        this->defSndWpnEngine_->setLooping(true);
-        this->defSndWpnEngine_->setSource("sounds/Rocket_engine.ogg");
-        this->attach(defSndWpnEngine_);
-
-        this->defSndWpnLaunch_ = new WorldSound(this);
-        this->defSndWpnLaunch_->setLooping(false);
-        this->defSndWpnLaunch_->setSource("sounds/Rocket_launch.ogg");
-        this->attach(defSndWpnLaunch_);
+        if( GameMode::isMaster() )
+        {
+            this->defSndWpnEngine_ = new WorldSound(this);
+            this->defSndWpnEngine_->setLooping(true);
+            this->defSndWpnEngine_->setSource("sounds/Rocket_engine.ogg");
+            this->attach(defSndWpnEngine_);
+
+            this->defSndWpnLaunch_ = new WorldSound(this);
+            this->defSndWpnLaunch_->setLooping(false);
+            this->defSndWpnLaunch_->setSource("sounds/Rocket_launch.ogg");
+            this->attach(defSndWpnLaunch_);
+        }
+        else
+        {
+            this->defSndWpnEngine_ = 0;
+            this->defSndWpnLaunch_ = 0;
+        }
     }
 

code/branches/presentation2/src/orxonox/gamestates/GSMainMenu.cc

@@ -66 +66 @@
             // Load sound
             this->ambient_ = new AmbientSound(0);
+            this->ambient_->setSyncMode(0x0);
         }
     }

code/branches/presentation2/src/orxonox/items/MultiStateEngine.cc

@@ -55 +55 @@
         RegisterObject(MultiStateEngine);
 
-        this->defEngineSndNormal_ = new WorldSound(this);
-        this->defEngineSndBoost_ = new WorldSound(this);
-        this->defEngineSndNormal_->setLooping(true);
-        this->defEngineSndBoost_->setLooping(true);
+        if( GameMode::isMaster() )
+        {
+            this->defEngineSndNormal_ = new WorldSound(this);
+            this->defEngineSndBoost_ = new WorldSound(this);
+            this->defEngineSndNormal_->setLooping(true);
+            this->defEngineSndBoost_->setLooping(true);
+        }
+        else
+        {
+            this->defEngineSndBoost_ = 0;
+            this->defEngineSndNormal_ = 0;
+        }
 
         this->lua_ = new LuaState();
@@ -74 +82 @@
                 for (std::vector<WorldEntity*>::const_iterator it2 = (*it)->getEffectsBegin(); it2 != (*it)->getEffectsBegin(); ++it2)
                     (*it2)->destroy();
-            delete this->defEngineSndNormal_;
-            delete this->defEngineSndBoost_;
+            if( this->defEngineSndNormal_ )
+                delete this->defEngineSndNormal_;
+            if( this->defEngineSndBoost_  )
+                delete this->defEngineSndBoost_;
             delete this->lua_;
         }
@@ -97 +107 @@
         if (this->getShip())
         {
-            if (this->getShip()->hasLocalController())
+//             if (this->getShip()->hasLocalController())
+            if (GameMode::isMaster() && this->getShip()->hasLocalController())
             {
                 this->setSyncMode(ObjectDirection::Bidirectional);
@@ -192 +203 @@
             return;
 
-        this->getShip()->attach(defEngineSndNormal_);
-        this->getShip()->attach(defEngineSndBoost_);
+        if( this->defEngineSndNormal_ )
+            this->getShip()->attach(defEngineSndNormal_);
+        if( this->defEngineSndBoost_ )
+            this->getShip()->attach(defEngineSndBoost_);
 
         for (std::vector<EffectContainer*>::const_iterator it = this->effectContainers_.begin(); it != this->effectContainers_.end(); ++it)
@@ -226 +239 @@
     void MultiStateEngine::setDefEngSndNormal(const std::string &engineSound)
     {
-        defEngineSndNormal_->setSource(engineSound);
+        if( defEngineSndNormal_ )
+            defEngineSndNormal_->setSource(engineSound);
+        else
+            assert(0); // This should never happen, because soundpointer is only available on master
     }
 
     const std::string& MultiStateEngine::getDefEngSndNormal()
     {
-        return defEngineSndNormal_->getSource();
+        if( defEngineSndNormal_ )
+            return defEngineSndNormal_->getSource();
+        else
+            assert(0);
+        return std::string();
     }
 
     void MultiStateEngine::setDefEngSndBoost(const std::string &engineSound)
     {
-        defEngineSndBoost_->setSource(engineSound);
+        if( defEngineSndBoost_ )
+            defEngineSndBoost_->setSource(engineSound);
+        else
+            assert(0);
     }
 
     const std::string& MultiStateEngine::getDefEngSndBoost()
     {
-        return defEngineSndBoost_->getSource();
+        if( this->defEngineSndBoost_ )
+            return defEngineSndBoost_->getSource();
+        else
+            assert(0);
+        return std::string();
     }
 }