Ticket #1712: 1712_dic.diff

File 1712_dic.diff, 2.3 KB (added by trompetin17, 9 years ago)

  • source/tools/atlas/AtlasUI/ScenarioEditor/Sections/Map/Map.cpp

     
    401401
    402402    // Reset sim test buttons
    403403    POST_MESSAGE(SimPlay, (0.f, false));
     404    POST_MESSAGE(SimStopMusic, ());
    404405    POST_MESSAGE(GuiSwitchPage, (L"page_atlas.xml"));
    405406    m_SimState = SimInactive;
    406407    UpdateSimButtons();
    … …  
    480481    {
    481482        POST_MESSAGE(SimPlay, (0.f, true));
    482483        POST_MESSAGE(SimStateRestore, (L"default"));
     484        POST_MESSAGE(SimStopMusic, ());
    483485        POST_MESSAGE(SimPlay, (0.f, false));
    484486        POST_MESSAGE(GuiSwitchPage, (L"page_atlas.xml"));
    485487        m_SimState = SimInactive;
    … …  
    488490    {
    489491        POST_MESSAGE(SimPlay, (0.f, true));
    490492        POST_MESSAGE(SimStateRestore, (L"default"));
     493        POST_MESSAGE(SimStopMusic, ());
    491494        POST_MESSAGE(SimPlay, (0.f, false));
    492495        POST_MESSAGE(GuiSwitchPage, (L"page_atlas.xml"));
    493496        m_SimState = SimInactive;

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

     
    127127{
    128128    UNUSED2(msg);
    129129}
     130   
     131MESSAGEHANDLER(SimStopMusic)
     132{
     133    UNUSED2(msg);
     134   
     135    CmpPtr<ICmpSoundManager> cmpSoundManager(*g_Game->GetSimulation2(), SYSTEM_ENTITY);
     136    if (cmpSoundManager)
     137        cmpSoundManager->StopMusic();
     138}
    130139
    131140MESSAGEHANDLER(SimStateSave)
    132141{
    … …  
    135144
    136145MESSAGEHANDLER(SimStateRestore)
    137146{
    138     CmpPtr<ICmpSoundManager> cmpSoundManager(*g_Game->GetSimulation2(), SYSTEM_ENTITY);
    139     if (cmpSoundManager)
    140         cmpSoundManager->StopMusic();
    141 
    142147    AtlasView::GetView_Game()->RestoreState(*msg->label);
    143148}
    144149

  • source/tools/atlas/GameInterface/Messages.h

     
    101101
    102102//////////////////////////////////////////////////////////////////////////
    103103
     104MESSAGE(SimStopMusic, );
     105
    104106MESSAGE(SimStateSave,
    105107        ((std::wstring, label)) // named slot to store saved data
    106108        );