[Wesnoth-cvs-commits] wesnoth/src multiplayer.hpp multiplayer_connect...

[Yann Dirson]

CVSROOT:        /cvsroot/wesnoth
Module name:    wesnoth
Branch:         
Changes by:     Yann Dirson <address@hidden>    05/03/09 09:32:11

Modified files:
        src            : multiplayer.hpp multiplayer_connect.hpp 
                         multiplayer_ui.hpp 

Log message:
        moved mp:controller defn into multiplayer_connect, to cleanup mp deps a 
bit

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/multiplayer.hpp.diff?tr1=1.25&tr2=1.26&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/multiplayer_connect.hpp.diff?tr1=1.31&tr2=1.32&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/multiplayer_ui.hpp.diff?tr1=1.3&tr2=1.4&r1=text&r2=text

Patches:
Index: wesnoth/src/multiplayer.hpp
diff -u wesnoth/src/multiplayer.hpp:1.25 wesnoth/src/multiplayer.hpp:1.26
--- wesnoth/src/multiplayer.hpp:1.25    Sun Feb 20 22:30:27 2005
+++ wesnoth/src/multiplayer.hpp Wed Mar  9 09:32:10 2005
@@ -1,4 +1,4 @@
-/* $Id: multiplayer.hpp,v 1.25 2005/02/20 22:30:27 gruikya Exp $ */
+/* $Id: multiplayer.hpp,v 1.26 2005/03/09 09:32:10 ydirson Exp $ */
 /*
    Copyright (C)
    Part of the Battle for Wesnoth Project http://www.wesnoth.org
@@ -15,12 +15,11 @@
 
 #include "display.hpp"
 #include "config.hpp"
+#include "multiplayer_connect.hpp"
 #include "unit_types.hpp"
 
 namespace mp {
        
-enum controller { CNTR_NETWORK = 0, CNTR_LOCAL, CNTR_COMPUTER, CNTR_EMPTY, 
CNTR_LAST };
-
 /**
  * This is the main entry points of multiplayer mode.
  */
Index: wesnoth/src/multiplayer_connect.hpp
diff -u wesnoth/src/multiplayer_connect.hpp:1.31 
wesnoth/src/multiplayer_connect.hpp:1.32
--- wesnoth/src/multiplayer_connect.hpp:1.31    Sun Feb 27 18:15:21 2005
+++ wesnoth/src/multiplayer_connect.hpp Wed Mar  9 09:32:11 2005
@@ -1,4 +1,4 @@
-/* $Id: multiplayer_connect.hpp,v 1.31 2005/02/27 18:15:21 ydirson Exp $ */
+/* $Id: multiplayer_connect.hpp,v 1.32 2005/03/09 09:32:11 ydirson Exp $ */
 /*
    Copyright (C) 
    Part of the Battle for Wesnoth Project http://www.wesnoth.org
@@ -24,6 +24,8 @@
 
 namespace mp {
 
+enum controller { CNTR_NETWORK = 0, CNTR_LOCAL, CNTR_COMPUTER, CNTR_EMPTY, 
CNTR_LAST };
+
 class connect : public mp::ui
 {
 public:
Index: wesnoth/src/multiplayer_ui.hpp
diff -u wesnoth/src/multiplayer_ui.hpp:1.3 wesnoth/src/multiplayer_ui.hpp:1.4
--- wesnoth/src/multiplayer_ui.hpp:1.3  Sat Feb 26 22:41:19 2005
+++ wesnoth/src/multiplayer_ui.hpp      Wed Mar  9 09:32:11 2005
@@ -1,4 +1,4 @@
-/* $Id: multiplayer_ui.hpp,v 1.3 2005/02/26 22:41:19 gruikya Exp $ */
+/* $Id: multiplayer_ui.hpp,v 1.4 2005/03/09 09:32:11 ydirson Exp $ */
 /*
    Copyright (C) 
    Part of the Battle for Wesnoth Project http://www.wesnoth.org
@@ -13,7 +13,6 @@
 #ifndef MULTIPLAYER_UI_HPP_INCLUDED
 #define MULTIPLAYER_UI_HPP_INCLUDED
 
-#include "multiplayer.hpp"
 #include "widgets/textbox.hpp"
 #include "widgets/button.hpp"
 #include "widgets/menu.hpp"