[Wesnoth-cvs-commits] wesnoth/src Makefile.am show_dialog.cpp

[Philippe Plantier]

CVSROOT:        /cvsroot/wesnoth
Module name:    wesnoth
Branch:         
Changes by:     Philippe Plantier <address@hidden>      05/04/02 14:59:58

Modified files:
        src            : Makefile.am show_dialog.cpp 

Log message:
        * Building the server does not require server/variables.cpp anymore
        * Removed some debug output

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/Makefile.am.diff?tr1=1.89&tr2=1.90&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/show_dialog.cpp.diff?tr1=1.122&tr2=1.123&r1=text&r2=text

Patches:
Index: wesnoth/src/Makefile.am
diff -u wesnoth/src/Makefile.am:1.89 wesnoth/src/Makefile.am:1.90
--- wesnoth/src/Makefile.am:1.89        Sun Mar 27 23:06:16 2005
+++ wesnoth/src/Makefile.am     Sat Apr  2 14:59:58 2005
@@ -403,7 +403,6 @@
        server/metrics.cpp \
        server/player.cpp \
        server/server.cpp \
-       server/variable.cpp \
        config.cpp \
        filesystem.cpp \
        game_config.cpp \
@@ -417,7 +416,6 @@
        serialization/string_utils.cpp \
        zipios++/xcoll.cpp \
        server/game.hpp \
-       variable.hpp \
        server/input_stream.hpp \
        server/metrics.hpp \
        server/player.hpp \
@@ -442,7 +440,6 @@
 
 campaignd_SOURCES = \
        campaign_server/campaign_server.cpp \
-       server/variable.cpp \
        config.cpp \
        filesystem.cpp \
        game_config.cpp \
@@ -458,7 +455,6 @@
        serialization/string_utils.cpp \
        serialization/tokenizer.cpp \
        zipios++/xcoll.cpp \
-       variable.hpp \
        config.hpp \
        filesystem.hpp \
        game_config.hpp \
@@ -487,7 +483,6 @@
        tools/exploder_utils.cpp \
        tools/exploder_cutter.cpp \
        tools/exploder_composer.cpp \
-       server/variable.cpp \
        tools/dummy_video.cpp \
        config.cpp \
        filesystem.cpp \
@@ -500,7 +495,6 @@
        serialization/string_utils.cpp \
        serialization/tokenizer.cpp \
        zipios++/xcoll.cpp \
-       variable.hpp \
        tools/exploder_composer.hpp \
        tools/exploder_cutter.hpp \
        tools/exploder_utils.hpp \
@@ -516,7 +510,6 @@
        tools/cutter.cpp \
        tools/exploder_utils.cpp \
        tools/exploder_cutter.cpp \
-       server/variable.cpp \
        tools/dummy_video.cpp \
        config.cpp \
        filesystem.cpp \
@@ -529,7 +522,6 @@
        serialization/string_utils.cpp \
        serialization/tokenizer.cpp \
        zipios++/xcoll.cpp \
-       variable.hpp \
        tools/exploder_composer.hpp \
        tools/exploder_cutter.hpp \
        tools/exploder_utils.hpp \
@@ -557,7 +549,6 @@
        log.cpp \
        network.cpp \
        tstring.cpp \
-       variable.hpp \
        config.hpp \
        gettext.hpp \
        filesystem.hpp \
@@ -565,7 +556,6 @@
        log.hpp \
        network.hpp \
        tstring.hpp \
-       server/variable.cpp \
        wesconfig.h
 
 wesnoth_zip_LDADD = @SDL_LIBS@ @SDL_NET_LIBS@
Index: wesnoth/src/show_dialog.cpp
diff -u wesnoth/src/show_dialog.cpp:1.122 wesnoth/src/show_dialog.cpp:1.123
--- wesnoth/src/show_dialog.cpp:1.122   Sat Apr  2 14:36:46 2005
+++ wesnoth/src/show_dialog.cpp Sat Apr  2 14:59:58 2005
@@ -1,4 +1,4 @@
-/* $Id: show_dialog.cpp,v 1.122 2005/04/02 14:36:46 gruikya Exp $ */
+/* $Id: show_dialog.cpp,v 1.123 2005/04/02 14:59:58 gruikya Exp $ */
 /*
    Copyright (C) 2003 by David White <address@hidden>
    Part of the Battle for Wesnoth Project http://wesnoth.whitevine.net
@@ -386,8 +386,6 @@
                        screen.getx() / 2,
                        screen.gety() / 2);
 
-       std::cerr << "Message is " << message << "\n";
-
        SDL_Rect text_size = { 0, 0, 0, 0 };
        if(!message.empty()) {
                text_size = font::draw_text(NULL, clipRect, message_font_size,