upstream/wesnoth
1
0
Fork 0
mirror of https://github.com/wesnoth/wesnoth synced 2025-05-09 19:36:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix the green game bug.

Browse Source 
note that game still be displaying in green as long as host don't set
the new controller.

empty slot won't be shown as available now.
This commit is contained in:
Serge Martin 2006-09-24 14:02:19 +00:00
parent 028ea77921
commit 622095452f
4 changed files with 21 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/playturn.cpp
View File

@ -15,6 +15,7 @@
#include "game_config.hpp"
#include "gettext.hpp"
#include "preferences.hpp"
#include "replay.hpp"
#include "show_dialog.hpp"
#include "sound.hpp"
@ -213,9 +214,19 @@ turn_info::PROCESS_DATA_RESULT turn_info::process_network_data(const config& cfg
switch(action) {
case 0:
teams_[side].make_ai();
{
config cfg;
cfg.values["side"] = lexical_cast<std::string>(side+1);
network::send_data(cfg);
}
return PROCESS_RESTART_TURN;
case 1:
teams_[side].make_human();
{
config cfg;
cfg.values["side"] = lexical_cast<std::string>(side+1);
network::send_data(cfg);
}
return PROCESS_RESTART_TURN;
default:
if (action > 2) {

28
src/server/game.cpp
View File

@ -358,7 +358,7 @@ const std::string& game::transfer_side_control(const config& cfg)
}
//get the socket of the player that issued the command
bool host = false; //we need to save this information before the player is erased
bool host = false; //we need to save this information before the player is erased
network::connection sock;
bool foundCommandPlayer = false;
std::multimap<network::connection, size_t>::iterator oldside;
@ -459,34 +459,24 @@ const std::string& game::transfer_side_control(const config& cfg)
return success;
}
size_t game::available_slots() const
{
size_t n_sides = level_.get_children("side").size();
size_t available_slots = 0;
for(int s = 0; s < n_sides; ++s) {
if(! sides_taken_[s]) {
available_slots++;
}
}
return available_slots;
}
bool game::describe_slots()
{
if(description() == NULL)
return false;
const int val = int(available_slots());
int available_slots = 0;
char buf[50];
int num_sides = level_.get_children("side").size();
for(config::child_list::const_iterator it = level_.get_children("side").begin(); it != level_.get_children("side").end(); ++it) {
if((**it)["allow_player"] == "no") {
int i = 0;
for(config::child_list::const_iterator it = level_.get_children("side").begin(); it != level_.get_children("side").end(); ++it, ++i) {
if((**it)["allow_player"] == "no" or (**it)["no_leader"] == "yes") {
num_sides--;
} else {
if(!sides_taken_[i])
available_slots++;
}
}
snprintf(buf,sizeof(buf),"%d/%d",val,num_sides);
snprintf(buf,sizeof(buf), "%d/%d", available_slots, num_sides);
if(buf != (*description())["slots"]) {
description()->values["slots"] = buf;

2
src/server/game.hpp
View File

@ -56,8 +56,6 @@ public:
const std::string& transfer_side_control(const config& cfg);
size_t available_slots() const;
//function to set the description to the number of slots
//returns true if the number of slots has changed
bool describe_slots();

2
src/server/server.cpp
View File

@ -980,7 +980,7 @@ void server::process_data_from_player_in_game(const network::connection sock, co
//if the owner is banning someone from the game
if(g->is_owner(sock) && (data.child("ban") != NULL || data.child("kick") != NULL)) {
std::string name;
bool ban;
bool ban = false;;
if (data.child("ban") != NULL) {
const config& u = *data.child("ban");
name = u["username"];