0ct0pu5/wesnoth
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

don't return if commands are left after filtering...

Browse source 
..but check whether [turn] still has children
This commit is contained in:
Gunter Labes 2008-01-22 17:33:28 +00:00
parent d5d1d7379d
commit 7bdbfb8e2a
2 changed files with 4 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/server/game.cpp
View file

@ -636,6 +636,7 @@ bool game::process_turn(config data, const player_map::const_iterator user) {
if (!started_) return false;
config* const turn = data.child("turn");
filter_commands(user->first, *turn);
if (turn->all_children().size() == 0) return false;
//! Return value that tells whether the description changed.
const bool res = process_commands(*turn);
@ -699,8 +700,8 @@ bool game::process_turn(config data, const player_map::const_iterator user) {
//! Filter commands from all but the current player.
//! Currently removes all commands but [speak] for observers and all but
//! [speak], [label] and [rename] for players.
bool game::filter_commands(const network::connection member, config& cfg) const {
if (is_current_player(member)) return true;
void game::filter_commands(const network::connection member, config& cfg) {
if (is_current_player(member)) return;
std::vector<int> marked;
int index = 0;
const config::child_list& children = cfg.get_children("command");
@ -738,8 +739,6 @@ bool game::filter_commands(const network::connection member, config& cfg) const
for(std::vector<int>::const_iterator j = marked.begin(); j != marked.end(); ++j) {
cfg.remove_child("command",*j);
}
return cfg.all_children().empty() == false;
}
bool game::process_commands(const config& cfg) {

3
src/server/game.hpp
View file

@ -96,8 +96,7 @@ public:
//! Function which filters commands sent by a player to remove commands
//! that they don't have permission to execute.
//! Returns true iff there are still some commands left.
bool filter_commands(const network::connection player, config& cfg) const;
void filter_commands(const network::connection player, config& cfg);
//! Process [turn].
bool process_turn(config data, const player_map::const_iterator user);
//! Set the description to the number of available slots.