From 51a0974d25b4b8b75cb90206d382e03748f97d59 Mon Sep 17 00:00:00 2001 From: Kayne Ruse Date: Thu, 18 Jul 2013 23:41:52 +1000 Subject: [PATCH] Updated the graphics a bit --- client/lobby.cpp | 4 ++-- client/main_menu.cpp | 4 ++-- client/splash_screen.cpp | 4 ++-- .../{pokemon_dark_font.bmp => pk_dark_16.bmp} | Bin ...pokemon_dark_font_thin.bmp => pk_dark_8.bmp} | Bin rsc/graphics/fonts/pk_white_8.bmp | Bin 0 -> 33846 bytes rsc/graphics/interface/button.bmp | Bin 90054 -> 0 bytes rsc/graphics/interface/button_menu.bmp | Bin 0 -> 12294 bytes 8 files changed, 6 insertions(+), 6 deletions(-) rename rsc/graphics/fonts/{pokemon_dark_font.bmp => pk_dark_16.bmp} (100%) rename rsc/graphics/fonts/{pokemon_dark_font_thin.bmp => pk_dark_8.bmp} (100%) create mode 100644 rsc/graphics/fonts/pk_white_8.bmp delete mode 100644 rsc/graphics/interface/button.bmp create mode 100644 rsc/graphics/interface/button_menu.bmp 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 0000000000000000000000000000000000000000..edf2bd80c3c4116f0dc62e95b4b2e34b65f32d04 GIT binary patch literal 33846 zcmeHPJCfzd4J<_{Vr1zIGQHCs?K?aYozG9-42_WnD-s|6} zyF;_Z?j#B*0Eq&Ne2+aF``5qy^7mxNFMmwwFBoNNf8g(*I5NXO|C|yr9@(99wiuo< zOr?}m{$0{<|N2Kt+YTH6CbknOz?IUTfDOQ4KY$FJKmo3ljs$GL4nR3FZ~_Imf_H=5 zfdk0E2^8Q;3Bz=5zz!Th22P*=7m7^42JFBAWZ(n}aHWLbbZx*696$z6pa56e6Us~* zz@G!izzG!K@}+GXcHy2>cHy2>cHy2>cHy2>cHy2>cHy2>cHy2>cHy2>cHy2>cHy2>cHy2>cHy2>cHy2 z>cHy2>cHy2>cHy2>cHy2>cHy2>cHy2>cHy2>cHy2>cD4p;M=$F`2D)$>Dzbwu48pz zbzpU1b>RQK1LKFu=Y6_-3*sk}(98hM4Ikdtr}z{DAGn~If$X32@g{zk;+OpJ<<}4K z;EzxB&*QHJ_)^jI&*}TecXlzX4y+EW4y+EW4y+EW4*X6!;9n&5EiSarTRZ;u2KHyE z_!cR3DxiPc>Bp1XOKQBW^lni8 zKX|#hCx6xWonfrR7iQ0eg77;Pbzk=9A_o6CWP8 z)*H7w2Bt$~2p`Z*2A?*AMcW62e+h6#JL6{a`^|HC0y}?izUEo;S+@H5XOBD9!N*5P zW|UqZqfdwnHfOYRSZr!|4(oYMFQVmhe%W7=m7k4)v;3Q#7HUCn9@P2cUcGeoTf1lJ z?cg)#nBf92R4(^)Wadd9t-ztLN$bIjk{*_vG~ZRqZxftO}i|c8^)tb65V_@pfVD!PXI))BUUM z*%|FOs`5$Jyipelv*oee@QFLzGx;o6=Xy741}(nxV%;p8ryj~98z$W^_@&Fwf-S$f z^`mAmtDj_qv>{Hh9%Xb7o(W9a5-DsZguLOzW#I6*Zcq(29VfVZKP$hd<^J=4cIK!- z#6GX<(s;vu$1w1-@1EBJ>^j&w{dy?8@v4U4N0qi)wE0etP&3F3S;j-5U|+)s6CuiEydANLESbV~V< zo*JgxJ>m0@?9Gok`571SH~c<7`yE=C=qr}Rjd3U`FxUU$t|G7gA!~dcR3;zj*IB7VaC!D@@d;o zYD~MY$0W@Dn3aE9Y49^J3U%of!T))FZj2!=YLne1e8MmK_IiG+gB(#Is|$`W_LCaR zIi%FCk%I|#*JVYuRxs_b(X6S5{C59!HL1=hceww$be1pKlOXSYs3-WMe%p6QMyWi5q#5gAJPz_Bfp18gfV2ELOPA11YFgLoHrog+4{ViZ$QR#Z zY%-j@jc?#LLO+sg4(xhN zdh>stw#`PqX82i0+Ad$UK3wVdP$TMnfiqd`?`p=*#rQV&WWny%O;0WD!Bg@#@w|Ya9!BKAQfc$Ea~~vQ!EmJm8uWb{&+R6`w#vV>HT#&f4dLfpXoi3y6&vvEAD{!?;MQ# eEBN&Xc|3$3{h{VPZGA&btUB(4Hw1pB>wf{-UlCIP literal 0 HcmV?d00001 diff --git a/rsc/graphics/interface/button.bmp b/rsc/graphics/interface/button.bmp deleted file mode 100644 index 842f309b0649f609bdb26af70858b8e335edd771..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 90054 zcmeI*!Hr`@5P;#?1UM4{5fA`34#YqxNJPMi1RxV6G^9fU!-HOxEN{tFy{h9kvaNQz zx(}az(B9s6Km7UQr?-FqzP;YxT<`bm{pbQKg9ivqe@#B@~%=qe~I76o**i0P^j&{a@aEDGpq5z|#6psS#;SQOCJBBrZC zKvzLwu_&OcMNC(PfUbhVVo^X>iPV1auV? z7K;M9TEui!2=LO@qRVX-Kn zt3^y#g@CSt!eUWCSBsdg3ISaOg~g(Pt`;#}6#}{n3X4SnT`gj|Dg<;D6c&pDx?03^ zRS4)RC@dBQbhU`-su0jsP*^Mq=xPzuRUz=$)wPa&3j((Vo}xNmZ{Ox1flJ^qs;5VK zJ^o}(;GTd-5Z-fh>V-f=<$qZ(l>F2ch_2rL{_rBOB5)$S(mJ=DukSyD4?q$pyR24u2L48Ljhe40Ub{Tbd|E$ z917@a2@w=qhEgITX;<5YX{dKvyY?&7pv+|8^@l$KO9H3OE3I?i`TFI*#Ox5L3p}=TtwmL*Gx=H| z(mGwe9`-ANy1*$)S9LLy6#-pUl+1Jmbk!9zUlGt%MafK8Kv!Kc^A!PIRg}zh1$5OF zGhY$VRYl26S3p-?G4mAxT~(CKbOm(P6*FHE&{ajrOjkfxT`}_&0bNy;%yb2G)fF>e z5ztjd$xK&3S6wml6#-pUl+1Jmbk!9zUlGt%MafK8Kv!Kc^A!PIRg}zh1$5OFGhY$V zRYl26S3p-?G4mAxT~(CKbOm(P6*FHE&{ajrOjkfxT`}_&0bNy;%yb2G)fF>e5ztjd z$xK&3S6wml6#-pUl+1Jmbk!9zUlGt%MafK8Kv!Kc^A!PIRg}zh1$5OFGhY$VRYl26 zS3p-?G4mCH$F8nNnN*ILA@Ew@3Msle3u(O;^XvZ#oChtPoSq)(b$;?m;GV!0)%E8Q MgvY_>qQHsjAN!htu>b%7 diff --git a/rsc/graphics/interface/button_menu.bmp b/rsc/graphics/interface/button_menu.bmp new file mode 100644 index 0000000000000000000000000000000000000000..281770f0570211adee2969bc297cb0970d8f410a GIT binary patch literal 12294 zcmeI%s|^BC5Czaj_|!lHBsfqg6v1u_G(rUwK?{T?@Mts+je(FbS%pl|#1VVw^Wh?{;gaW7INC*%J z1rGb65FkK+0D->?gs&lE1PGKs_?csj0D%$+uhEPVAW#C~ZyI9+2$X=OlmLNTz*0(p aKrUb@B|sn-u#^%YkPCdCXCXi!6!-$vWe7k3 literal 0 HcmV?d00001