diff --git a/client/lobby.cpp b/client/lobby.cpp index ce8726a..0cbd97a 100644 --- a/client/lobby.cpp +++ b/client/lobby.cpp @@ -44,8 +44,8 @@ Lobby::Lobby() { cout << "entering Lobby" << endl; #endif refreshButton.Setup(50, 50, surfaceMgr->Get("button"), surfaceMgr->Get("font"), "Refresh"); - joinButton.Setup(50, 100, surfaceMgr->Get("button"), surfaceMgr->Get("font"), "Join"); - backButton.Setup(50, 150, surfaceMgr->Get("button"), surfaceMgr->Get("font"), "Back"); + joinButton.Setup(50, 50 + surfaceMgr->Get("button")->h/3, surfaceMgr->Get("button"), surfaceMgr->Get("font"), "Join"); + backButton.Setup(50, 50 + surfaceMgr->Get("button")->h/3 * 2, surfaceMgr->Get("button"), surfaceMgr->Get("font"), "Back"); font.SetSurface(surfaceMgr->Get("font")); listBox.x = 280; diff --git a/client/main_menu.cpp b/client/main_menu.cpp index 14dc543..a5ff28f 100644 --- a/client/main_menu.cpp +++ b/client/main_menu.cpp @@ -34,8 +34,8 @@ MainMenu::MainMenu() { cout << "entering MainMenu" << endl; #endif startButton.Setup(50, 50, surfaceMgr->Get("button"), surfaceMgr->Get("font"), "Start"); - optionsButton.Setup(50, 100, surfaceMgr->Get("button"), surfaceMgr->Get("font"), "Options"); - quitButton.Setup(50, 150, surfaceMgr->Get("button"), surfaceMgr->Get("font"), "Quit"); + optionsButton.Setup(50, 50 + surfaceMgr->Get("button")->h/3, surfaceMgr->Get("button"), surfaceMgr->Get("font"), "Options"); + quitButton.Setup(50, 50 + surfaceMgr->Get("button")->h/3 * 2, surfaceMgr->Get("button"), surfaceMgr->Get("font"), "Quit"); } MainMenu::~MainMenu() { diff --git a/client/splash_screen.cpp b/client/splash_screen.cpp index 0c3efde..24ce8f5 100644 --- a/client/splash_screen.cpp +++ b/client/splash_screen.cpp @@ -74,8 +74,8 @@ void SplashScreen::RenderFrame() { void SplashScreen::LoadResources() { //standard - surfaceMgr->Load("font", configUtil->String("fonts") + "/pokemon_dark_font.bmp"); - surfaceMgr->Load("button", configUtil->String("interface") + "/button.bmp"); + surfaceMgr->Load("font", configUtil->String("fonts") + "/pk_white_8.bmp"); + surfaceMgr->Load("button", configUtil->String("interface") + "/button_menu.bmp"); //debugging surfaceMgr->Load("elliot", configUtil->String("sprites") + "/elliot2.bmp"); diff --git a/rsc/graphics/fonts/pokemon_dark_font.bmp b/rsc/graphics/fonts/pk_dark_16.bmp similarity index 100% rename from rsc/graphics/fonts/pokemon_dark_font.bmp rename to rsc/graphics/fonts/pk_dark_16.bmp diff --git a/rsc/graphics/fonts/pokemon_dark_font_thin.bmp b/rsc/graphics/fonts/pk_dark_8.bmp similarity index 100% rename from rsc/graphics/fonts/pokemon_dark_font_thin.bmp rename to rsc/graphics/fonts/pk_dark_8.bmp diff --git a/rsc/graphics/fonts/pk_white_8.bmp b/rsc/graphics/fonts/pk_white_8.bmp new file mode 100644 index 0000000..edf2bd8 Binary files /dev/null and b/rsc/graphics/fonts/pk_white_8.bmp differ diff --git a/rsc/graphics/interface/button.bmp b/rsc/graphics/interface/button.bmp deleted file mode 100644 index 842f309..0000000 Binary files a/rsc/graphics/interface/button.bmp and /dev/null differ diff --git a/rsc/graphics/interface/button_menu.bmp b/rsc/graphics/interface/button_menu.bmp new file mode 100644 index 0000000..281770f Binary files /dev/null and b/rsc/graphics/interface/button_menu.bmp differ