[Wesnoth-cvs-commits] wesnoth data/scenarios/Heir_To_The_Throne/Elves...

[David White]

CVSROOT:        /cvsroot/wesnoth
Module name:    wesnoth
Branch:         
Changes by:     David White <address@hidden>    04/08/30 02:00:37

Modified files:
        data/scenarios/Heir_To_The_Throne: Elves_Besieged.cfg 
        src            : titlescreen.cpp 

Log message:
        undo of previous accidental checkin

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/scenarios/Heir_To_The_Throne/Elves_Besieged.cfg.diff?tr1=1.19&tr2=1.20&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/titlescreen.cpp.diff?tr1=1.16&tr2=1.17&r1=text&r2=text

Patches:
Index: wesnoth/data/scenarios/Heir_To_The_Throne/Elves_Besieged.cfg
diff -u wesnoth/data/scenarios/Heir_To_The_Throne/Elves_Besieged.cfg:1.19 
wesnoth/data/scenarios/Heir_To_The_Throne/Elves_Besieged.cfg:1.20
--- wesnoth/data/scenarios/Heir_To_The_Throne/Elves_Besieged.cfg:1.19   Mon Aug 
30 01:23:16 2004
+++ wesnoth/data/scenarios/Heir_To_The_Throne/Elves_Besieged.cfg        Mon Aug 
30 02:00:36 2004
@@ -181,11 +181,6 @@
        [event]
        name=start
 
-               [terrain]
-               x=10-20
-               y=10-20
-               letter=d
-               [/terrain]
                [message]
                id=msg1_1
                speaker=narrator
Index: wesnoth/src/titlescreen.cpp
diff -u wesnoth/src/titlescreen.cpp:1.16 wesnoth/src/titlescreen.cpp:1.17
--- wesnoth/src/titlescreen.cpp:1.16    Sun Aug 29 11:12:20 2004
+++ wesnoth/src/titlescreen.cpp Mon Aug 30 02:00:36 2004
@@ -41,6 +41,8 @@
 
        std::cerr << "logo size: " << logo->w << "," << logo->h << "\n";
 
+       const video_change_detector disp_change_detector(screen.video());
+
        for(int x = 0; x != logo->w; ++x) {
                SDL_Rect srcrect = {x,0,1,logo->h};
                SDL_Rect dstrect = {xpos+x,ypos,1,logo->h};
@@ -63,7 +65,13 @@
                        SDL_Delay(10);
 
                        events::pump();
+                       if(disp_change_detector.changed()) {
+                               faded_in = true;
+                               fade_logo(screen,xpos,ypos);
+                               return;
+                       }
                }
+
        }
 
        std::cerr << "logo faded in\n";