Ticket #1712: 1712.patch

source/simulation2/components/CCmpSoundManager.cpp

@@ -1 @@
-/* Copyright (C) 2012 Wildfire Games.
+/* Copyright (C) 2014 Wildfire Games.
  * This file is part of 0 A.D.
  *
  * 0 A.D. is free software: you can redistribute it and/or modify
@@ -85 +85 @@
         }
     }
 
+    virtual void Reset()
+    {
+        if (!g_SoundManager)
+            return;
+
+        g_SoundManager->Pause(true);
+    }
+
 };
 
 REGISTER_COMPONENT_TYPE(SoundManager)

source/simulation2/components/ICmpSoundManager.cpp

@@ -1 @@
-/* Copyright (C) 2010 Wildfire Games.
+/* Copyright (C) 2014 Wildfire Games.
  * This file is part of 0 A.D.
  *
  * 0 A.D. is free software: you can redistribute it and/or modify
@@ -23 +23 @@
 
 BEGIN_INTERFACE_WRAPPER(SoundManager)
 DEFINE_INTERFACE_METHOD_2("PlaySoundGroup", void, ICmpSoundManager, PlaySoundGroup, std::wstring, entity_id_t)
+DEFINE_INTERFACE_METHOD_0("Reset", void, ICmpSoundManager, Reset)
 END_INTERFACE_WRAPPER(SoundManager)

source/simulation2/components/ICmpSoundManager.h

@@ -1 @@
-/* Copyright (C) 2010 Wildfire Games.
+/* Copyright (C) 2014 Wildfire Games.
  * This file is part of 0 A.D.
  *
  * 0 A.D. is free software: you can redistribute it and/or modify
@@ -33 +33 @@
      */
     virtual void PlaySoundGroup(std::wstring name, entity_id_t source) = 0;
 
+    virtual void Reset() = 0;
+
     DECLARE_INTERFACE_TYPE(SoundManager)
 };
 

source/tools/atlas/GameInterface/Handlers/MiscHandlers.cpp

@@ -1 @@
-/* Copyright (C) 2013 Wildfire Games.
+/* Copyright (C) 2014 Wildfire Games.
  * This file is part of 0 A.D.
  *
  * 0 A.D. is free software: you can redistribute it and/or modify
@@ -34 +34 @@
 #include "ps/GameSetup/Config.h"
 #include "ps/GameSetup/GameSetup.h"
 #include "renderer/Renderer.h"
+#include "simulation2/Simulation2.h"
+#include "simulation2/components/ICmpSoundManager.h"
 
 extern void (*Atlas_GLSwapBuffers)(void* context);
 
@@ -133 +135 @@
 
 MESSAGEHANDLER(SimStateRestore)
 {
+    CmpPtr<ICmpSoundManager> cmpSoundManager(*g_Game->GetSimulation2(), SYSTEM_ENTITY);
+    if (cmpSoundManager)
+        cmpSoundManager->Reset();
+
     AtlasView::GetView_Game()->RestoreState(*msg->label);
 }