[Wesnoth-cvs-commits] wesnoth/src intro.cpp intro.hpp playlevel.cpp

[Yann Dirson]

CVSROOT:        /cvsroot/wesnoth
Module name:    wesnoth
Branch:         
Changes by:     Yann Dirson <address@hidden>    05/03/20 16:27:44

Modified files:
        src            : intro.cpp intro.hpp playlevel.cpp 

Log message:
        cleanup of deps against display: intro does not need a display

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/intro.cpp.diff?tr1=1.71&tr2=1.72&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/intro.hpp.diff?tr1=1.19&tr2=1.20&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/playlevel.cpp.diff?tr1=1.187&tr2=1.188&r1=text&r2=text

Patches:
Index: wesnoth/src/intro.cpp
diff -u wesnoth/src/intro.cpp:1.71 wesnoth/src/intro.cpp:1.72
--- wesnoth/src/intro.cpp:1.71  Fri Mar 18 21:21:48 2005
+++ wesnoth/src/intro.cpp       Sun Mar 20 16:27:44 2005
@@ -1,4 +1,4 @@
-/* $Id: intro.cpp,v 1.71 2005/03/18 21:21:48 ydirson Exp $ */
+/* $Id: intro.cpp,v 1.72 2005/03/20 16:27:44 ydirson Exp $ */
 /*
    Copyright (C) 2003 by David White <address@hidden>
    Part of the Battle for Wesnoth Project http://wesnoth.whitevine.net
@@ -13,7 +13,6 @@
 
 #include "global.hpp"
 
-#include "display.hpp"
 #include "events.hpp"
 #include "font.hpp"
 #include "game_config.hpp"
@@ -39,7 +38,7 @@
 bool show_intro_part(CVideo &video, const config& part,
                const std::string& scenario);
 
-void show_intro(display& screen, const config& data, const config& level)
+void show_intro(CVideo &video, const config& data, const config& level)
 {
        std::cerr << "showing intro sequence...\n";
 
@@ -56,7 +55,7 @@
                std::pair<const std::string*, const config*> item = *i;
 
                if(*item.first == "part") {
-                       showing = show_intro_part(screen.video(), 
(*item.second), scenario);
+                       showing = show_intro_part(video, (*item.second), 
scenario);
                } else if(*item.first == "if") {
                        const std::string type = 
game_events::conditional_passed(
                                NULL, *item.second) ? "then":"else";
@@ -66,7 +65,7 @@
                                return;
                        }
                        const config& selection = *thens;
-                       show_intro(screen, selection, level);
+                       show_intro(video, selection, level);
                }
        }
 
Index: wesnoth/src/intro.hpp
diff -u wesnoth/src/intro.hpp:1.19 wesnoth/src/intro.hpp:1.20
--- wesnoth/src/intro.hpp:1.19  Tue Mar 15 20:01:31 2005
+++ wesnoth/src/intro.hpp       Sun Mar 20 16:27:44 2005
@@ -1,4 +1,4 @@
-/* $Id: intro.hpp,v 1.19 2005/03/15 20:01:31 ydirson Exp $ */
+/* $Id: intro.hpp,v 1.20 2005/03/20 16:27:44 ydirson Exp $ */
 /*
    Copyright (C) 2003 by David White <address@hidden>
    Part of the Battle for Wesnoth Project http://wesnoth.whitevine.net
@@ -15,7 +15,6 @@
 
 class config;
 class CVideo;
-class display;
 #include "SDL.h"
 
 #include <string>
@@ -32,7 +31,7 @@
 //
 //each part of the sequence will be displayed in turn, with the
 //user able to go to the next part, or skip it entirely.
-void show_intro(display& screen, const config& data, const config& level);
+void show_intro(CVideo &video, const config& data, const config& level);
 
 void the_end(CVideo& screen);
 
Index: wesnoth/src/playlevel.cpp
diff -u wesnoth/src/playlevel.cpp:1.187 wesnoth/src/playlevel.cpp:1.188
--- wesnoth/src/playlevel.cpp:1.187     Sat Mar 19 13:02:34 2005
+++ wesnoth/src/playlevel.cpp   Sun Mar 20 16:27:44 2005
@@ -1,4 +1,4 @@
-/* $Id: playlevel.cpp,v 1.187 2005/03/19 13:02:34 gruikya Exp $ */
+/* $Id: playlevel.cpp,v 1.188 2005/03/20 16:27:44 ydirson Exp $ */
 /*
    Copyright (C) 2003 by David White <address@hidden>
    Part of the Battle for Wesnoth Project http://wesnoth.whitevine.net
@@ -405,7 +405,7 @@
 
        if(recorder.skipping() == false) {
                for(std::vector<config*>::const_iterator story_i = 
story.begin(); story_i != story.end(); ++story_i) {
-                       show_intro(gui,**story_i, *level);
+                       show_intro(gui.video(),**story_i, *level);
                }
        }