~performous-team/performous/old

« back to all changes in this revision

Viewing changes to game/screen_sing.cc

  • Committer: Lasse Karkkainen
  • Date: 2012-11-05 07:32:44 UTC
  • Revision ID: git-v1:e4a15346f73c76d5cf8de1bd027d589d72456e66
Cleanup.

Show diffs side-by-side

added added

removed removed

Lines of Context:
308
308
                        else if (nav == input::UP) { m_menu.move(-1); return; }
309
309
                }
310
310
                // Start button has special functions for skipping things (only in singing for now)
311
 
                if (nav == input::START && m_only_singers_alive && !m_song->getVocalTrack(m_selectedTrack).notes.empty() && !m_audio.isPaused()) {
 
311
                if (nav == input::START && m_only_singers_alive && !m_layout_singer.empty() && !m_audio.isPaused()) {
312
312
                        // Open score dialog early
313
313
                        if (status == Song::FINISHED) {
314
314
                                m_engine->kill(); // Kill the engine thread
486
486
                        statustxt = (boost::format("%02u:%02u - %s") % (t / 60) % (t % 60) % section.name).str();
487
487
                } else  statustxt = (boost::format("%02u:%02u") % (t / 60) % (t % 60)).str();
488
488
 
489
 
                if (!m_score_window.get() && m_only_singers_alive && !m_song->getVocalTrack(m_selectedTrack).notes.empty()) {
 
489
                if (!m_score_window.get() && m_only_singers_alive && !m_layout_singer.empty()) {
490
490
                        if (status == Song::INSTRUMENTAL_BREAK) statustxt += _("   ENTER to skip instrumental break");
491
491
                        if (status == Song::FINISHED && !config["game/karaoke_mode"].b()) statustxt += _("   Remember to wait for grading!");
492
492
                }