[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Wesnoth-cvs-commits] wesnoth/src multiplayer.cpp network.hpp show_di...
From: |
Jon Daniel |
Subject: |
[Wesnoth-cvs-commits] wesnoth/src multiplayer.cpp network.hpp show_di... |
Date: |
Fri, 05 Aug 2005 18:23:42 -0400 |
CVSROOT: /cvsroot/wesnoth
Module name: wesnoth
Branch:
Changes by: Jon Daniel <address@hidden> 05/08/05 22:23:42
Modified files:
src : multiplayer.cpp network.hpp show_dialog.cpp
Log message:
Fix multiplayer open_connection not working
CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/multiplayer.cpp.diff?tr1=1.162&tr2=1.163&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/network.hpp.diff?tr1=1.28&tr2=1.29&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/show_dialog.cpp.diff?tr1=1.136&tr2=1.137&r1=text&r2=text
Patches:
Index: wesnoth/src/multiplayer.cpp
diff -u wesnoth/src/multiplayer.cpp:1.162 wesnoth/src/multiplayer.cpp:1.163
--- wesnoth/src/multiplayer.cpp:1.162 Mon Aug 1 23:45:10 2005
+++ wesnoth/src/multiplayer.cpp Fri Aug 5 22:23:42 2005
@@ -1,4 +1,4 @@
-/* $Id: multiplayer.cpp,v 1.162 2005/08/01 23:45:10 j_daniel Exp $ */
+/* $Id: multiplayer.cpp,v 1.163 2005/08/05 22:23:42 j_daniel Exp $ */
/*
Copyright (C)
Part of the Battle for Wesnoth Project http://www.wesnoth.org
@@ -130,7 +130,7 @@
data.clear();
network::connection data_res = gui::network_data_dialog(
- disp,_("Connecting to remote host..."),data);
+ disp,_("Connecting to remote host..."),data,
sock);
mp::check_response(data_res, data);
// Backwards-compatibility "version" attribute
Index: wesnoth/src/network.hpp
diff -u wesnoth/src/network.hpp:1.28 wesnoth/src/network.hpp:1.29
--- wesnoth/src/network.hpp:1.28 Fri Aug 5 21:53:03 2005
+++ wesnoth/src/network.hpp Fri Aug 5 22:23:42 2005
@@ -1,4 +1,4 @@
-/* $Id: network.hpp,v 1.28 2005/08/05 21:53:03 j_daniel Exp $ */
+/* $Id: network.hpp,v 1.29 2005/08/05 22:23:42 j_daniel Exp $ */
/*
Copyright (C) 2003-5 by David White <address@hidden>
Part of the Battle for Wesnoth Project http://www.wesnoth.org/
@@ -168,11 +168,11 @@
total += size;
current += size;
}
- bool operator==(const statistics& stats)
+ bool operator==(const statistics& stats) const
{
return total == stats.total && current == stats.current &&
current_max == stats.current_max;
}
- bool operator!=(const statistics& stats)
+ bool operator!=(const statistics& stats) const
{
return !operator==(stats);
}
Index: wesnoth/src/show_dialog.cpp
diff -u wesnoth/src/show_dialog.cpp:1.136 wesnoth/src/show_dialog.cpp:1.137
--- wesnoth/src/show_dialog.cpp:1.136 Fri Aug 5 21:53:03 2005
+++ wesnoth/src/show_dialog.cpp Fri Aug 5 22:23:42 2005
@@ -1,4 +1,4 @@
-/* $Id: show_dialog.cpp,v 1.136 2005/08/05 21:53:03 j_daniel Exp $ */
+/* $Id: show_dialog.cpp,v 1.137 2005/08/05 22:23:42 j_daniel Exp $ */
/*
Copyright (C) 2003 by David White <address@hidden>
Part of the Battle for Wesnoth Project http://www.wesnoth.org/
@@ -875,8 +875,7 @@
cfg.clear();
for(;;) {
const network::connection res =
network::receive_data(cfg,connection_num,100);
-
- network::statistics stats =
network::get_receive_stats(connection_num);
+ const network::statistics stats =
network::get_receive_stats(connection_num);
if(stats.current_max != 0 && stats != old_stats) {
old_stats = stats;
progress.set_progress_percent((stats.current*100)/stats.current_max);
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Wesnoth-cvs-commits] wesnoth/src multiplayer.cpp network.hpp show_di...,
Jon Daniel <=