mail[Wesnoth-commits] r44650 - in /trunk/src/storyscreen: controller.cpp render.cpp


Others Months | Index by Date | Thread Index
>>   [Date Prev] [Date Next] [Thread Prev] [Thread Next]

Header


Content

Posted by guillaume . melquiond on July 24, 2010 - 19:15:
Author: silene
Date: Sat Jul 24 19:15:52 2010
New Revision: 44650

URL: http://svn.gna.org/viewcvs/wesnoth?rev=44650&view=rev
Log:
Changed 'play' button to 'skip'. Made it always enabled.

Modified:
    trunk/src/storyscreen/controller.cpp
    trunk/src/storyscreen/render.cpp

Modified: trunk/src/storyscreen/controller.cpp
URL: 
http://svn.gna.org/viewcvs/wesnoth/trunk/src/storyscreen/controller.cpp?rev=44650&r1=44649&r2=44650&view=diff
==============================================================================
--- trunk/src/storyscreen/controller.cpp (original)
+++ trunk/src/storyscreen/controller.cpp Sat Jul 24 19:15:52 2010
@@ -129,9 +129,9 @@
                return NEXT;
        }
 
-       gui::button back_button (disp_.video(),std::string("← ")+ 
_("Back"));
-       gui::button next_button (disp_.video(),_("Next") + std::string(" 
→"));
-       gui::button play_button (disp_.video(),_("Play") + std::string(" 
↠"));
+       gui::button back_button (disp_.video(), std::string("← ")+ 
_("Back"));
+       gui::button next_button (disp_.video(), _("Next") + std::string(" 
→"));
+       gui::button play_button (disp_.video(), _("Skip") + std::string(" 
↠"));
 
        // Build renderer cache unless built for a low-memory environment;
        // caching the scaled backgrounds can take over a decent amount of 
memory.
@@ -165,11 +165,7 @@
 
                LOG_NG << "displaying storyscreen part " << k+1 << " of " << 
parts_.size() << '\n';
 
-               const bool first_page = (segment_index_ == 0) && (k == 0);
-               const bool last_page  = (segment_index_ == total_segments_ - 
1) && (k == parts_.size() - 1);
-
-               back_button.enable(!first_page);
-               play_button.enable(last_page);
+               back_button.enable(segment_index_ != 0 || k != 0);
 
                switch(render_interface.show()) {
                case part_ui::NEXT:

Modified: trunk/src/storyscreen/render.cpp
URL: 
http://svn.gna.org/viewcvs/wesnoth/trunk/src/storyscreen/render.cpp?rev=44650&r1=44649&r2=44650&view=diff
==============================================================================
--- trunk/src/storyscreen/render.cpp (original)
+++ trunk/src/storyscreen/render.cpp Sat Jul 24 19:15:52 2010
@@ -502,7 +502,7 @@
        }
 
        if ((play_keydown && !last_key_) || play_button_.pressed()) {
-               ret_ = NEXT;
+               ret_ = QUIT;
                result = true;
        }
 




Related Messages


Powered by MHonArc, Updated Sat Jul 24 19:20:14 2010