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

Some multiplayer updates when loading a save

Browse source
This commit is contained in:
uid68698 2004-01-04 05:37:23 +00:00
parent 80e70522e9
commit 988ddd53de
3 changed files with 85 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

84
src/multiplayer.cpp
View file

@ -362,6 +362,13 @@ int play_multiplayer(display& disp, game_data& units_data, config cfg,
launch_game.set_xy((disp.x()/2)-launch_game.width()*2-19,(disp.y()-height)/2+height-29);
cancel_game.set_xy((disp.x()/2)+cancel_game.width()+19,(disp.y()-height)/2+height-29);
//player amount number background
rect.x = ((disp.x()-width)/2+10)+35;
rect.y = (disp.y()-height)/2+235;
rect.w = 145;
rect.h = 25;
SDL_Surface* playernum_bg=get_surface_portion(disp.video().getSurface(), rect);
update_whole_screen();
CKey key;
@ -600,7 +607,13 @@ int play_multiplayer(display& disp, game_data& units_data, config cfg,
if(loading) {
if((**sd)["controller"] == "network") {
combo_type.back().set_selected(1);
if((**sd)["description"] == "") {
combo_type.back().set_selected(1);
}else{
player_type.push_back((**sd)["description"]);
combo_type.back().set_items(player_type);
combo_type.back().set_selected(player_type.size());
}
}else if((**sd)["controller"] == "human") {
if((**sd)["description"] == preferences::login())
{
@ -682,6 +695,7 @@ int play_multiplayer(display& disp, game_data& units_data, config cfg,
config& side = **(sides.first+n);
if(side["allow_changes"] != "no"){
if(combo_type[n].process(mousex,mousey,left_button)) {
if(combo_type[n].selected() == 0) {
side["controller"] = "human";
@ -705,9 +719,16 @@ int play_multiplayer(display& disp, game_data& units_data, config cfg,
}else if(combo_type[n].selected() == 3){
side["controller"] = "human";
side["description"] = "";
}else {
side["controller"] = "network";
side["description"] = "";
}
}
}else{
combo_type[n].draw();
}
if(side["allow_changes"] != "no"){
if(combo_race[n].process(mousex,mousey,left_button))
{
const string_map& values = possible_sides[combo_race[n].selected()]->values;
@ -716,7 +737,10 @@ int play_multiplayer(display& disp, game_data& units_data, config cfg,
side[i->first] = i->second;
}
}
}else{
combo_race[n].draw();
}
if(combo_team[n].process(mousex,mousey,left_button))
{
const size_t nsides = sides.second - sides.first;
@ -735,7 +759,8 @@ int play_multiplayer(display& disp, game_data& units_data, config cfg,
}
combo_color[n].process(mousex,mousey,left_button);
if(side["allow_changes"] != "no"){
int check_playergold = 20+int(979*slider_gold[n].process(mousex,mousey,left_button));
if(abs(check_playergold) == check_playergold)
new_playergold=check_playergold;
@ -753,6 +778,9 @@ int play_multiplayer(display& disp, game_data& units_data, config cfg,
(*sides.first[n])["gold"],rect.x,rect.y);
update_rect(rect);
}
}else{
slider_gold[n].draw();
}
}
if(launch2_game.process(mousex,mousey,left_button))
@ -877,19 +905,55 @@ int play_multiplayer(display& disp, game_data& units_data, config cfg,
gamemap map(cfg,map_data);
const scoped_sdl_surface mini(image::getMinimap(175,175,map));
const scoped_sdl_surface mini(image::getMinimap(145,145,map));
if(mini != NULL) {
rect.x = ((disp.x()-width)/2+10)+20;
rect.x = ((disp.x()-width)/2+10)+35;
rect.y = (disp.y()-height)/2+80;
rect.w = 175;
rect.h = 175;
rect.w = 145;
rect.h = 145;
SDL_BlitSurface(mini, NULL, disp.video().getSurface(), &rect);
update_rect(rect);
}
//Display the number of players
rect.x = ((disp.x()-width)/2+10)+35;
rect.y = (disp.y()-height)/2+235;
rect.w = 145;
rect.h = 25;
SDL_BlitSurface(playernum_bg, NULL, disp.video().getSurface(), &rect);
config& level = *level_ptr;
const config::child_itors sides = level.child_range("side");
int sides_num;
config::child_iterator sd;
for(sd = sides.first; sd != sides.second; ++sd) {
sides_num = sd - sides.first;
}
std::stringstream players;
players << "Players: " << sides_num + 1;
font::draw_text(&disp,disp.screen_area(),12,font::GOOD_COLOUR,
players.str(),rect.x+45,rect.y);
update_rect(rect);
}else{
//TODO: Load some other non-minimap
// image, ie a floppy disk
const scoped_sdl_surface disk(image::get_image("misc/disk.png",image::UNSCALED));
if(disk != NULL) {
rect.x = ((disp.x()-width)/2+10)+35;
rect.y = (disp.y()-height)/2+80;
rect.w = 145;
rect.h = 145;
SDL_BlitSurface(disk, NULL, disp.video().getSurface(), &rect);
update_rect(rect);
}
rect.x = ((disp.x()-width)/2+10)+35;
rect.y = (disp.y()-height)/2+235;
rect.w = 145;
rect.h = 25;
SDL_BlitSurface(playernum_bg, NULL, disp.video().getSurface(), &rect);
font::draw_text(&disp,disp.screen_area(),12,font::GOOD_COLOUR,
" Load Map ",rect.x+45,rect.y);
update_rect(rect);
}
}

11
src/widgets/combo.cpp
View file

@ -28,7 +28,6 @@ combo::combo(display& disp, const std::vector<std::string>& items) :
{
}
int combo::height() const
{
return button_.height();
@ -44,6 +43,11 @@ int combo::selected() const
return selected_;
}
void combo::set_items(const std::vector<std::string>& items)
{
items_ = items;
}
void combo::set_xy(int x, int y)
{
button_.set_xy(x,y);
@ -59,6 +63,11 @@ void combo::set_selected(int val)
}
}
void combo::draw()
{
button_.draw();
}
bool combo::process(int x, int y, bool button)
{
if(button_.process(x,y,button)) {

1
src/widgets/combo.hpp
View file

@ -30,6 +30,7 @@ public:
void set_y(int val);
void set_xy(int valx, int valy);
void set_selected(int val);
void set_items(const std::vector<std::string>& items);
int width() const;
int height() const;