upstream/wesnoth
1
0
Fork 0
mirror of https://github.com/wesnoth/wesnoth synced 2025-05-21 08:31:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

only allow "dependent" commands for players

Browse Source 
previously this was also allowed for teh host regardless whether he is a
player or not.
This commit is contained in:
gfgtdf 2014-11-17 04:18:29 +01:00
parent 2944051f83
commit db31880012
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/server/game.cpp
View File

@ -832,7 +832,10 @@ void game::process_message(simple_wml::document& data, const player_map::iterato
send_data(data, user->first, "game message");
}
bool game::is_legal_command(const simple_wml::node& command, bool is_player) {
bool game::is_legal_command(const simple_wml::node& command, const player_map::const_iterator user) {
const bool is_player = this->is_player(user->first);
const bool is_host = user->first == owner_;
// Only single commands allowed.
// NOTE: non-dependent commands might contain a [checkup] tag after their first data.
// But those packages are usually sended by teh currenly active player which is not checks here
@ -844,7 +847,7 @@ bool game::is_legal_command(const simple_wml::node& command, bool is_player) {
{
return true;
}
if (is_player
if ((is_player || is_host)
&& (command.child("label")
|| command.child("clear_labels")
|| command.child("rename")
@ -869,10 +872,9 @@ bool game::process_turn(simple_wml::document& data, const player_map::const_iter
std::vector<int> marked;
const simple_wml::node::child_list& commands = turn->children("command");
simple_wml::node::child_list::const_iterator command;
const bool player = (is_player(user->first) || user->first == owner_);
for (command = commands.begin(); command != commands.end(); ++command) {
if (!is_current_player(user->first)
&& !is_legal_command(**command, player)) {
&& !is_legal_command(**command, user)) {
LOG_GAME << "ILLEGAL COMMAND in game: " << id_ << " ((("
<< simple_wml::node_to_string(**command) << ")))\n";
std::stringstream msg;

2
src/server/game.hpp
View File

@ -280,7 +280,7 @@ private:
bool observers_can_label() const { return false; }
bool observers_can_chat() const { return true; }
bool is_legal_command(const simple_wml::node& command, bool is_player);
bool is_legal_command(const simple_wml::node& command, const player_map::const_iterator user);
/**
* Function which returns true iff 'player' is on 'team'.