Author: soliton
Date: Fri Mar 21 06:49:49 2008
New Revision: 24927
URL: http://svn.gna.org/viewcvs/wesnoth?rev=24927&view=rev
Log:
fixed server messaging (merged r24926 from trunk)
Modified:
branches/1.4/src/server/game.cpp
branches/1.4/src/server/game.hpp
branches/1.4/src/server/server.cpp
Modified: branches/1.4/src/server/game.cpp
URL:
http://svn.gna.org/viewcvs/wesnoth/branches/1.4/src/server/game.cpp?rev=24927&r1=24926&r2=24927&view=diff
==============================================================================
--- branches/1.4/src/server/game.cpp (original)
+++ branches/1.4/src/server/game.cpp Fri Mar 21 06:49:49 2008
@@ -1214,6 +1214,13 @@
record_data(doc);
}
+void game::send_server_message_to_all(const char* message) const
+{
+ simple_wml::document doc;
+ send_server_message(message, 0, &doc);
+ send_data(doc);
+}
+
void game::send_server_message(const char* message, network::connection sock,
simple_wml::document* docptr) const
{
simple_wml::document docbuf;
Modified: branches/1.4/src/server/game.hpp
URL:
http://svn.gna.org/viewcvs/wesnoth/branches/1.4/src/server/game.hpp?rev=24927&r1=24926&r2=24927&view=diff
==============================================================================
--- branches/1.4/src/server/game.hpp (original)
+++ branches/1.4/src/server/game.hpp Fri Mar 21 06:49:49 2008
@@ -87,6 +87,7 @@
//! Returns true iff the number of slots has changed.
bool describe_slots();
+ void send_server_message_to_all(const char* message) const;
void send_server_message(const char* message, network::connection
sock=0, simple_wml::document* doc=NULL) const;
//! Send data to all players in this game except 'exclude'.
void send_and_record_server_message(const char* message,
Modified: branches/1.4/src/server/server.cpp
URL:
http://svn.gna.org/viewcvs/wesnoth/branches/1.4/src/server/server.cpp?rev=24927&r1=24926&r2=24927&view=diff
==============================================================================
--- branches/1.4/src/server/server.cpp (original)
+++ branches/1.4/src/server/server.cpp Fri Mar 21 06:49:49 2008
@@ -833,10 +833,10 @@
if (parameters == "") {
return "You must type a message.";
}
- lobby_.send_server_message(parameters.c_str());
+ lobby_.send_server_message_to_all(parameters.c_str());
if (command == "msg") {
for (std::vector<game*>::const_iterator g =
games_.begin(); g != games_.end(); ++g) {
- (*g)->send_server_message(parameters.c_str());
+
(*g)->send_server_message_to_all(parameters.c_str());
}
}
LOG_SERVER << "<server> " + parameters + "\n";
_______________________________________________
Wesnoth-commits mailing list
[email protected]
https://mail.gna.org/listinfo/wesnoth-commits
