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

made proper music player in multiplayer.

Browse source 
Made it so when it's not your turn, all your units have red orbs
This commit is contained in:
Dave White 2003-11-24 22:08:35 +00:00
parent 2243d0f0f3
commit 918ab1f758
3 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/display.cpp
View file

@ -992,9 +992,9 @@ void display::draw_tile(int x, int y, SDL_Surface* unit_image,
energy_file = "ally-energy.png";
}
} else {
if(unit_move == unit_total_move) {
if(activeTeam_ == currentTeam_ && unit_move == unit_total_move) {
energy_file = "unmoved-energy.png";
} else if(unit_can_move(loc,units_,map_,teams_)) {
} else if(activeTeam_ == currentTeam_ && unit_can_move(loc,units_,map_,teams_)) {
energy_file = "partmoved-energy.png";
} else {
energy_file = "moved-energy.png";

11
src/multiplayer.cpp
View file

@ -680,12 +680,11 @@ int play_multiplayer(display& disp, game_data& units_data, config cfg,
if(combo_race[n].process(mousex,mousey,left_button))
{
std::map<std::string,std::string>& values =
possible_sides[combo_race[n].selected()]->values;
sides[n]->values["name"] = values["name"];
sides[n]->values["type"] = values["type"];
sides[n]->values["recruit"] = values["recruit"];
sides[n]->values["recruitment_pattern"] = values["recruitment_pattern"];
const string_map& values = possible_sides[combo_race[n].selected()]->values;
for(string_map::const_iterator i = values.begin(); i != values.end(); ++i) {
(*sides[n])[i->first] = i->second;
}
}
if(combo_team[n].process(mousex,mousey,left_button))

1
src/playlevel.cpp
View file

@ -220,6 +220,7 @@ LEVEL_RESULT play_level(game_data& gameinfo, config& terrain_config,
}
if(!replaying && team_it->music().empty() == false) {
std::cerr << "playing music: '" << team_it->music() << "'\n";
sound::play_music(team_it->music());
}