From fe7bbbbb3d2e11cc27440e437274437ddeafdabc Mon Sep 17 00:00:00 2001 From: Kayne Ruse Date: Fri, 25 Dec 2015 22:53:05 +1100 Subject: [PATCH] Tweaked button graphics --- README.md | 6 +++++- client/gameplay_scenes/world_logic.cpp | 6 +++--- client/menu_scenes/disconnected_screen.cpp | 4 ++-- client/menu_scenes/lobby_menu.cpp | 8 ++++---- client/menu_scenes/main_menu.cpp | 8 ++++---- client/menu_scenes/options_menu.cpp | 4 ++-- makefile | 6 +++--- rsc/config_dev.cfg | 13 +++++++++++++ todo.txt | 4 +++- 9 files changed, 39 insertions(+), 20 deletions(-) create mode 100644 rsc/config_dev.cfg diff --git a/README.md b/README.md index 8ae9a3b..5ca27bd 100644 --- a/README.md +++ b/README.md @@ -7,7 +7,7 @@ This game is inspired by classic 2D RPGs (Final Fantasy, The Legend of Zelda), a ## Releases * The most recent stable build for Windows can be found [here](https://dl.dropboxusercontent.com/u/46669050/Tortuga-win.rar). -* The most recent stable build for Linux can be found [here](https://dl.dropboxusercontent.com/u/46669050/Tortuga-linux.tar). +* My linux PC died ;_; ## Documentation @@ -29,6 +29,10 @@ This game is inspired by classic 2D RPGs (Final Fantasy, The Legend of Zelda), a * [tar](http://www.gnu.org/software/tar/manual/) - The GNU archive tool; needed for Linux distribution * [Dropbox](https://www.dropbox.com/) - For hosting and distribution +## Using and Including + +* [Coolvetica Typeface](http://typodermicfonts.com/coolvetica/) + ## Copyright (Future versions (to be determined) may be released under a modified version of the [Uplink Developer's License](http://www.introversion.co.uk/uplink/developer/license.html).) diff --git a/client/gameplay_scenes/world_logic.cpp b/client/gameplay_scenes/world_logic.cpp index b09597f..ffd0326 100644 --- a/client/gameplay_scenes/world_logic.cpp +++ b/client/gameplay_scenes/world_logic.cpp @@ -40,7 +40,7 @@ World::World(int* const argClientIndex, int* const argAccountIndex): accountIndex(*argAccountIndex) { //setup the utility objects - buttonImage.Load(GetRenderer(), config["dir.interface"] + "button_red.png"); + buttonImage.Load(GetRenderer(), config["dir.interface"] + "button_blue.png"); font = TTF_OpenFont(config["client.font"].c_str(), 12); //check that the font loaded @@ -52,9 +52,9 @@ World::World(int* const argClientIndex, int* const argAccountIndex): //setup the buttons disconnectButton.SetBackgroundTexture(GetRenderer(), buttonImage.GetTexture()); - disconnectButton.SetText(GetRenderer(), font, "Disconnect", COLOR_BLUE); + disconnectButton.SetText(GetRenderer(), font, "Disconnect", COLOR_WHITE); shutdownButton.SetBackgroundTexture(GetRenderer(), buttonImage.GetTexture()); - shutdownButton.SetText(GetRenderer(), font, "Shutdown", COLOR_BLUE); + shutdownButton.SetText(GetRenderer(), font, "Shutdown", COLOR_WHITE); //set the button positions disconnectButton.SetX(50); diff --git a/client/menu_scenes/disconnected_screen.cpp b/client/menu_scenes/disconnected_screen.cpp index 1e447ac..bb4013a 100644 --- a/client/menu_scenes/disconnected_screen.cpp +++ b/client/menu_scenes/disconnected_screen.cpp @@ -37,7 +37,7 @@ DisconnectedScreen::DisconnectedScreen() { //setup the utility objects //TODO: (1) resource tool, to prevent reloading like this - image.Load(GetRenderer(), config["dir.interface"] + "button_red.png"); + image.Load(GetRenderer(), config["dir.interface"] + "button_blue.png"); font = TTF_OpenFont(config["client.font"].c_str(), 12); //check that the font loaded @@ -49,7 +49,7 @@ DisconnectedScreen::DisconnectedScreen() { //setup the button backButton.SetBackgroundTexture(GetRenderer(), image.GetTexture()); - backButton.SetText(GetRenderer(), font, "Back", COLOR_BLUE); + backButton.SetText(GetRenderer(), font, "Back", COLOR_WHITE); //set the button positions backButton.SetX(50); diff --git a/client/menu_scenes/lobby_menu.cpp b/client/menu_scenes/lobby_menu.cpp index bd28e51..c0b8a15 100644 --- a/client/menu_scenes/lobby_menu.cpp +++ b/client/menu_scenes/lobby_menu.cpp @@ -40,7 +40,7 @@ LobbyMenu::LobbyMenu(int* const argClientIndex, int* const argAccountIndex): accountIndex = -1; //setup the utility objects - buttonImage.Load(GetRenderer(), config["dir.interface"] + "button_red.png"); + buttonImage.Load(GetRenderer(), config["dir.interface"] + "button_blue.png"); font = TTF_OpenFont(config["client.font"].c_str(), 12); //check that the font loaded @@ -52,11 +52,11 @@ LobbyMenu::LobbyMenu(int* const argClientIndex, int* const argAccountIndex): //setup the buttons searchButton.SetBackgroundTexture(GetRenderer(), buttonImage.GetTexture()); - searchButton.SetText(GetRenderer(), font, "Search", COLOR_BLUE); + searchButton.SetText(GetRenderer(), font, "Search", COLOR_WHITE); joinButton.SetBackgroundTexture(GetRenderer(), buttonImage.GetTexture()); - joinButton.SetText(GetRenderer(), font, "Join", COLOR_BLUE); + joinButton.SetText(GetRenderer(), font, "Join", COLOR_WHITE); backButton.SetBackgroundTexture(GetRenderer(), buttonImage.GetTexture()); - backButton.SetText(GetRenderer(), font, "Back", COLOR_BLUE); + backButton.SetText(GetRenderer(), font, "Back", COLOR_WHITE); //set the button positions (assumed) searchButton.SetX(50); diff --git a/client/menu_scenes/main_menu.cpp b/client/menu_scenes/main_menu.cpp index aff31b8..2872838 100644 --- a/client/menu_scenes/main_menu.cpp +++ b/client/menu_scenes/main_menu.cpp @@ -34,7 +34,7 @@ MainMenu::MainMenu() { ConfigUtility& config = ConfigUtility::GetSingleton(); //setup the utility objects - buttonImage.Load(GetRenderer(), config["dir.interface"] + "button_red.png"); + buttonImage.Load(GetRenderer(), config["dir.interface"] + "button_blue.png"); font = TTF_OpenFont(config["client.font"].c_str(), 12); //check that the font loaded @@ -46,11 +46,11 @@ MainMenu::MainMenu() { //setup the buttons startButton.SetBackgroundTexture(GetRenderer(), buttonImage.GetTexture()); - startButton.SetText(GetRenderer(), font, "Start", COLOR_BLUE); + startButton.SetText(GetRenderer(), font, "Start", COLOR_WHITE); optionsButton.SetBackgroundTexture(GetRenderer(), buttonImage.GetTexture()); - optionsButton.SetText(GetRenderer(), font, "Options", COLOR_BLUE); + optionsButton.SetText(GetRenderer(), font, "Options", COLOR_WHITE); quitButton.SetBackgroundTexture(GetRenderer(), buttonImage.GetTexture()); - quitButton.SetText(GetRenderer(), font, "Quit", COLOR_BLUE); + quitButton.SetText(GetRenderer(), font, "Quit", COLOR_WHITE); //set the button positions startButton.SetX(50); diff --git a/client/menu_scenes/options_menu.cpp b/client/menu_scenes/options_menu.cpp index dc30b15..b0f034f 100644 --- a/client/menu_scenes/options_menu.cpp +++ b/client/menu_scenes/options_menu.cpp @@ -34,7 +34,7 @@ OptionsMenu::OptionsMenu() { ConfigUtility& config = ConfigUtility::GetSingleton(); //setup the utility objects - buttonImage.Load(GetRenderer(), config["dir.interface"] + "button_red.png"); + buttonImage.Load(GetRenderer(), config["dir.interface"] + "button_blue.png"); font = TTF_OpenFont(config["client.font"].c_str(), 12); //check that the font loaded @@ -46,7 +46,7 @@ OptionsMenu::OptionsMenu() { //setup the button backButton.SetBackgroundTexture(GetRenderer(), buttonImage.GetTexture()); - backButton.SetText(GetRenderer(), font, "Back", COLOR_BLUE); + backButton.SetText(GetRenderer(), font, "Back", COLOR_WHITE); //set the button positions backButton.SetX(50); diff --git a/makefile b/makefile index 4ffdebb..d4eefa6 100644 --- a/makefile +++ b/makefile @@ -37,12 +37,12 @@ $(OUTDIR): clean: ifeq ($(OS),Windows_NT) - del /S /Q *.o *.a *.exe $(OUTDIR)\* - rmdir /S /Q $(OUTDIR) + del /S /Q *.o *.a *.exe $(OUTDIR)\*.dll +# rmdir /S /Q $(OUTDIR) else ifeq ($(shell uname), Linux) find . -type f -name '*.o' -exec rm -f -r -v {} \; find . -type f -name '*.a' -exec rm -f -r -v {} \; - rm $(OUTDIR)/* -f +# rm $(OUTDIR)/* -f find . -empty -type d -delete endif diff --git a/rsc/config_dev.cfg b/rsc/config_dev.cfg new file mode 100644 index 0000000..91aef8c --- /dev/null +++ b/rsc/config_dev.cfg @@ -0,0 +1,13 @@ +config.next = ../rsc/config.cfg + +#directories +dir.logos = ../rsc/graphics/logos/ +dir.sprites = ../rsc/graphics/sprites/ +dir.tilesets = ../rsc/graphics/tilesets/ +dir.interface = ../rsc/graphics/interface/ +dir.scripts = ../rsc/scripts/ +dir.maps = ../rsc/maps/ +dir.fonts = ../rsc/fonts/ + +#debugging +client.font = ../rsc/fonts/coolvetica rg.ttf \ No newline at end of file diff --git a/todo.txt b/todo.txt index ebabc4c..cea3760 100644 --- a/todo.txt +++ b/todo.txt @@ -1,5 +1,7 @@ +TODO: Resource manager TODO: Consistency for bounds names - +TODO: Cross compiler (to replace dead linux PC ;_;) +TODO: New button graphics TODO: Account passwords (list) * backbone account server OR * social network login OR