Made MOSprite animations only reset the anim timer if one of their supported animations occured. Also fixed indenting on the switch

Fixed ActiveSound playing at (0, 0)
Fixed IsReloading, DoneReloading and NeedsReloading not being marked as overrides, which was screwing up their lua bindings. Also marked them and HD::IsActivated as const cause they are.

Author: garethyr

Entities/HDFirearm.cpp

@@ -563,7 +563,7 @@ void HDFirearm::Activate()
 
     // Play the pre-fire sound
     if (!IsReloading() && !m_ActiveSound.IsBeingPlayed())
-        m_ActiveSound.Play();
+        m_ActiveSound.Play(this->m_Pos);
 }
 
 
@@ -646,7 +646,7 @@ void HDFirearm::Reload()
 //////////////////////////////////////////////////////////////////////////////////////////
 // Description:     Tells whether the device is curtrently in need of being reloaded.
 
-bool HDFirearm::NeedsReloading()
+bool HDFirearm::NeedsReloading() const
 {
     if (!m_Reloading)
     {

Entities/HDFirearm.h

@@ -587,7 +587,7 @@ ENTITYALLOCATION(HDFirearm)
 // Arguments:       None.
 // Return value:    Whetehr being reloaded.
 
-    virtual bool IsReloading() const { return m_Reloading; }
+    virtual bool IsReloading() const override { return m_Reloading; }
 
 
 //////////////////////////////////////////////////////////////////////////////////////////
@@ -597,7 +597,7 @@ ENTITYALLOCATION(HDFirearm)
 // Arguments:       None.
 // Return value:    Whether just done reloading this frame.
 
-    virtual bool DoneReloading() { return m_DoneReloading; }
+    virtual bool DoneReloading() const override { return m_DoneReloading; }
 
 
 //////////////////////////////////////////////////////////////////////////////////////////
@@ -607,7 +607,7 @@ ENTITYALLOCATION(HDFirearm)
 // Arguments:       None.
 // Return value:    Whetehr in need of reloading (ie not full).
 
-    virtual bool NeedsReloading();
+    virtual bool NeedsReloading() const override;
 
 
 //////////////////////////////////////////////////////////////////////////////////////////

Entities/HeldDevice.h

@@ -476,7 +476,7 @@ ENTITYALLOCATION(HeldDevice)
 // Arguments:       None.
 // Return value:    Whether being activated.
 
-    virtual bool IsActivated() { return m_Activated; }
+    virtual bool IsActivated() const { return m_Activated; }
 
 
 //////////////////////////////////////////////////////////////////////////////////////////
@@ -486,7 +486,7 @@ ENTITYALLOCATION(HeldDevice)
 // Arguments:       None.
 // Return value:    Whetehr being reloaded.
 
-    virtual bool IsReloading() { return false; }
+    virtual bool IsReloading() const { return false; }
 
 
 //////////////////////////////////////////////////////////////////////////////////////////
@@ -496,7 +496,7 @@ ENTITYALLOCATION(HeldDevice)
 // Arguments:       None.
 // Return value:    Whether just done reloading this frame.
 
-    virtual bool DoneReloading() { return false; }
+    virtual bool DoneReloading() const { return false; }
 
 
 //////////////////////////////////////////////////////////////////////////////////////////
@@ -506,7 +506,7 @@ ENTITYALLOCATION(HeldDevice)
 // Arguments:       None.
 // Return value:    Whetehr in need of reloading (ie not full).
 
-    virtual bool NeedsReloading() { return false; }
+    virtual bool NeedsReloading() const { return false; }
 
 
 //////////////////////////////////////////////////////////////////////////////////////////

Entities/MOSprite.cpp

@@ -477,26 +477,28 @@ void MOSprite::Update() {
 
 	if (m_SpriteAnimTimer.GetElapsedSimTimeMS() > frameTime) {
 		switch (m_SpriteAnimMode) {
-		case ALWAYSLOOP:
-			m_Frame = ((m_Frame + 1) % m_FrameCount);
-			break;
-		case ALWAYSRANDOM:
-			while (m_Frame == prevFrame) {
-				m_Frame = floorf(static_cast<float>(m_FrameCount) * PosRand());
-			}
-			break;
-		case ALWAYSPINGPONG:
-			if (m_Frame == m_FrameCount - 1) {
-				m_SpriteAnimIsReversingFrames = true;
-			} else if (m_Frame == 0) {
-				m_SpriteAnimIsReversingFrames = false;
-			}
-			m_SpriteAnimIsReversingFrames ? m_Frame-- : m_Frame++;
-			break;
-		default:
-			break;
+		    case ALWAYSLOOP:
+			    m_Frame = ((m_Frame + 1) % m_FrameCount);
+                m_SpriteAnimTimer.Reset();
+			    break;
+		    case ALWAYSRANDOM:
+			    while (m_Frame == prevFrame) {
+				    m_Frame = floorf(static_cast<float>(m_FrameCount) * PosRand());
+			    }
+                m_SpriteAnimTimer.Reset();
+			    break;
+		    case ALWAYSPINGPONG:
+			    if (m_Frame == m_FrameCount - 1) {
+				    m_SpriteAnimIsReversingFrames = true;
+			    } else if (m_Frame == 0) {
+				    m_SpriteAnimIsReversingFrames = false;
+			    }
+			    m_SpriteAnimIsReversingFrames ? m_Frame-- : m_Frame++;
+                m_SpriteAnimTimer.Reset();
+			    break;
+		    default:
+			    break;
 		}
-		m_SpriteAnimTimer.Reset();
 	}
 }