Advertisement
Not a member of Pastebin yet?
Sign Up,
it unlocks many cool features!
- Index: build/premake/premake4.lua
- ===================================================================
- --- build/premake/premake4.lua (revision 13385)
- +++ build/premake/premake4.lua (working copy)
- @@ -610,6 +610,11 @@
- "opengl",
- "spidermonkey"
- }
- +
- + if not _OPTIONS["without-audio"] then
- + table.insert(extern_libs, "openal")
- + end
- +
- setup_static_lib_project("atlas", source_dirs, extern_libs, {})
- Index: source/tools/atlas/AtlasUI/ScenarioEditor/Sections/Map/Map.cpp
- ===================================================================
- --- source/tools/atlas/AtlasUI/ScenarioEditor/Sections/Map/Map.cpp (revision 13385)
- +++ source/tools/atlas/AtlasUI/ScenarioEditor/Sections/Map/Map.cpp (working copy)
- @@ -465,19 +465,11 @@
- void MapSidebar::OnSimReset(wxCommandEvent& WXUNUSED(event))
- {
- - if (IsPlaying(m_SimState))
- + if (IsPlaying(m_SimState) || m_SimState == SimPaused)
- {
- - POST_MESSAGE(SimPlay, (0.f, true));
- - POST_MESSAGE(SimStateRestore, (L"default"));
- + POST_MESSAGE(ResetSound, ());
- POST_MESSAGE(SimPlay, (0.f, false));
- - POST_MESSAGE(GuiSwitchPage, (L"page_atlas.xml"));
- - m_SimState = SimInactive;
- - }
- - else if (m_SimState == SimPaused)
- - {
- - POST_MESSAGE(SimPlay, (0.f, true));
- POST_MESSAGE(SimStateRestore, (L"default"));
- - POST_MESSAGE(SimPlay, (0.f, false));
- POST_MESSAGE(GuiSwitchPage, (L"page_atlas.xml"));
- m_SimState = SimInactive;
- }
- Index: source/tools/atlas/GameInterface/Handlers/MiscHandlers.cpp
- ===================================================================
- --- source/tools/atlas/GameInterface/Handlers/MiscHandlers.cpp (revision 13385)
- +++ source/tools/atlas/GameInterface/Handlers/MiscHandlers.cpp (working copy)
- @@ -33,6 +33,7 @@
- #include "ps/GameSetup/Config.h"
- #include "ps/GameSetup/GameSetup.h"
- #include "renderer/Renderer.h"
- +#include "soundmanager/SoundManager.h"
- extern void (*Atlas_GLSwapBuffers)(void* context);
- @@ -146,6 +147,12 @@
- AtlasView::GetView_Game()->SetTesting(msg->simTest);
- }
- +MESSAGEHANDLER(ResetSound)
- +{
- + CSoundManager::SetEnabled(false);
- + CSoundManager::SetEnabled(true);
- +}
- +
- MESSAGEHANDLER(JavaScript)
- {
- g_ScriptingHost.ExecuteScript(*msg->command, L"Atlas");
- Index: source/tools/atlas/GameInterface/Messages.h
- ===================================================================
- --- source/tools/atlas/GameInterface/Messages.h (revision 13385)
- +++ source/tools/atlas/GameInterface/Messages.h (working copy)
- @@ -120,6 +120,9 @@
- ((bool, simTest)) // true if we're in simulation test mode, false otherwise
- );
- +MESSAGE(ResetSound,
- + );
- +
- //////////////////////////////////////////////////////////////////////////
- QUERY(Ping, , );
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement