Browse Source

Removed ShapeBase::Thread::sound.

Weird feature that's not script-accessible or actually implemented.
Daniel Buckmaster 11 years ago
parent
commit
69179cf809
2 changed files with 1 additions and 32 deletions
  1. 0 22
      Engine/source/T3D/shapeBase.cpp
  2. 1 10
      Engine/source/T3D/shapeBase.h

+ 0 - 22
Engine/source/T3D/shapeBase.cpp

@@ -931,7 +931,6 @@ ShapeBase::ShapeBase()
    for (i = 0; i < MaxScriptThreads; i++) {
       mScriptThread[i].sequence = -1;
       mScriptThread[i].thread = 0;
-      mScriptThread[i].sound = 0;
       mScriptThread[i].state = Thread::Stop;
       mScriptThread[i].atEnd = false;
 	   mScriptThread[i].timescale = 1.f;
@@ -2162,7 +2161,6 @@ bool ShapeBase::setThreadSequence(U32 slot, S32 seq, bool reset)
          if (!st.thread)
             st.thread = mShapeInstance->addThread();
          mShapeInstance->setSequence(st.thread,seq,0);
-         stopThreadSound(st);
          updateThread(st);
       }
       return true;
@@ -2189,7 +2187,6 @@ void ShapeBase::updateThread(Thread& st)
 				}
 
 				mShapeInstance->setTimeScale( st.thread, 0.f );
-				stopThreadSound( st );
 			} break;
 
 		case Thread::Play:
@@ -2199,7 +2196,6 @@ void ShapeBase::updateThread(Thread& st)
 					mShapeInstance->setTimeScale(st.thread,1);
 					mShapeInstance->setPos( st.thread, ( st.timescale > 0.f ) ? 1.0f : 0.0f );
 					mShapeInstance->setTimeScale(st.thread,0);
-					stopThreadSound(st);
                st.state = Thread::Stop;
 				}
 				else
@@ -2211,16 +2207,11 @@ void ShapeBase::updateThread(Thread& st)
 					}
 
 					mShapeInstance->setTimeScale(st.thread, st.timescale );
-					if (!st.sound)
-					{
-						startSequenceSound(st);
-					}
 				}
 			} break;
 
       case Thread::Destroy:
          {
-				stopThreadSound(st);
             st.atEnd = true;
             st.sequence = -1;
             if(st.thread)
@@ -2328,19 +2319,6 @@ bool ShapeBase::setThreadTimeScale( U32 slot, F32 timeScale )
 	return false;
 }
 
-void ShapeBase::stopThreadSound(Thread& thread)
-{
-   if (thread.sound) {
-   }
-}
-
-void ShapeBase::startSequenceSound(Thread& thread)
-{
-   if (!isGhost() || !thread.thread)
-      return;
-   stopThreadSound(thread);
-}
-
 void ShapeBase::advanceThreads(F32 dt)
 {
    for (U32 i = 0; i < MaxScriptThreads; i++) {

+ 1 - 10
Engine/source/T3D/shapeBase.h

@@ -733,8 +733,7 @@ protected:
                         ///
                         ///  @see Thread::State
       S32 sequence;     ///< The animation sequence which is running in this thread.
-	  F32 timescale;    ///< Timescale
-      U32 sound;        ///< Handle to sound.
+      F32 timescale;    ///< Timescale
       bool atEnd;       ///< Are we at the end of this thread?
       F32 position;
    };
@@ -1354,14 +1353,6 @@ public:
    /// @param   timescale   Timescale
    bool setThreadTimeScale( U32 slot, F32 timeScale );
 
-   /// Start the sound associated with an animation thread
-   /// @param   thread   Thread
-   void startSequenceSound(Thread& thread);
-
-   /// Stop the sound associated with an animation thread
-   /// @param   thread   Thread
-   void stopThreadSound(Thread& thread);
-
    /// Advance all animation threads attached to this shapebase
    /// @param   dt   Change in time from last call to this function
    void advanceThreads(F32 dt);