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

Rationalization of main menu display, button method set_xy() was added, ...

Browse source 
...move quit button last in menu.
This commit is contained in:
zas 2003-09-19 16:46:59 +00:00
parent 090ac6155a
commit 614ffecfd2
3 changed files with 17 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
src/menu.cpp
View file

@ -825,19 +825,19 @@ TITLE_RESULT show_title(display& screen)
button quit_button(screen,string_table["quit_button"]);
button language_button(screen,string_table["language_button"]);
tutorial_button.set_x(700);
new_button.set_x(700);
load_button.set_x(700);
multi_button.set_x(700);
quit_button.set_x(700);
language_button.set_x(700);
const int menu_xbase = screen.x() - (x + tutorial_button.width() + 20);
const int menu_xincr = 0;
const int menu_ybase = 120 + title_surface->h;
const int menu_yincr = 50;
int bc = 0; //button count
#define BUTTON_XY() (menu_xbase+(bc)*menu_xincr), (menu_ybase+(bc++)*menu_yincr)
tutorial_button.set_y(200);
new_button.set_y(250);
load_button.set_y(300);
multi_button.set_y(350);
language_button.set_y(400);
quit_button.set_y(450);
tutorial_button.set_xy(BUTTON_XY());
new_button.set_xy(BUTTON_XY());
load_button.set_xy(BUTTON_XY());
multi_button.set_xy(BUTTON_XY());
language_button.set_xy(BUTTON_XY());
quit_button.set_xy(BUTTON_XY());
tutorial_button.draw();
new_button.draw();
@ -866,15 +866,15 @@ TITLE_RESULT show_title(display& screen)
if(multi_button.process(mousex,mousey,left_button))
return MULTIPLAYER;
if(language_button.process(mousex,mousey,left_button))
return CHANGE_LANGUAGE;
if(quit_button.process(mousex,mousey,left_button))
return QUIT_GAME;
if(key[KEY_ESCAPE])
return QUIT_GAME;
if(language_button.process(mousex,mousey,left_button))
return CHANGE_LANGUAGE;
SDL_PumpEvents();
SDL_Delay(20);

1
src/widgets/button.cpp
View file

@ -173,6 +173,7 @@ bool button::hit(int x, int y) const
void button::set_x(int val) { x_ = val; }
void button::set_y(int val) { y_ = val; }
void button::set_xy(int valx, int valy) { x_ = valx; y_ = valy; }
int button::width() const
{

1
src/widgets/button.hpp
View file

@ -43,6 +43,7 @@ public:
void set_x(int val);
void set_y(int val);
void set_xy(int valx, int valy);
int width() const;
int height() const;