Ratstail91/Tortuga
Archived
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Tweaked button graphics

Browse Source
This commit is contained in:
Kayne Ruse
2015-12-25 22:53:05 +11:00
parent e6e2421ba0
commit fe7bbbbb3d
9 changed files with 39 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
README.md
+5 -1
View File
@@ -7,7 +7,7 @@ This game is inspired by classic 2D RPGs (Final Fantasy, The Legend of Zelda), a
## Releases ## 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 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 ## 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 * [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 * [Dropbox](https://www.dropbox.com/) - For hosting and distribution
## Using and Including
* [Coolvetica Typeface](http://typodermicfonts.com/coolvetica/)
## Copyright ## 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).) (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).)
client/gameplay_scenes/world_logic.cpp
+3 -3
View File
@@ -40,7 +40,7 @@ World::World(int* const argClientIndex, int* const argAccountIndex):
accountIndex(*argAccountIndex) accountIndex(*argAccountIndex)
{ {
//setup the utility objects //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); font = TTF_OpenFont(config["client.font"].c_str(), 12);
//check that the font loaded //check that the font loaded
@@ -52,9 +52,9 @@ World::World(int* const argClientIndex, int* const argAccountIndex):
//setup the buttons //setup the buttons
disconnectButton.SetBackgroundTexture(GetRenderer(), buttonImage.GetTexture()); 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.SetBackgroundTexture(GetRenderer(), buttonImage.GetTexture());
shutdownButton.SetText(GetRenderer(), font, "Shutdown", COLOR_BLUE); shutdownButton.SetText(GetRenderer(), font, "Shutdown", COLOR_WHITE);
//set the button positions //set the button positions
disconnectButton.SetX(50); disconnectButton.SetX(50);
client/menu_scenes/disconnected_screen.cpp
+2 -2
View File
@@ -37,7 +37,7 @@ DisconnectedScreen::DisconnectedScreen() {
//setup the utility objects //setup the utility objects
//TODO: (1) resource tool, to prevent reloading like this //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); font = TTF_OpenFont(config["client.font"].c_str(), 12);
//check that the font loaded //check that the font loaded
@@ -49,7 +49,7 @@ DisconnectedScreen::DisconnectedScreen() {
//setup the button //setup the button
backButton.SetBackgroundTexture(GetRenderer(), image.GetTexture()); backButton.SetBackgroundTexture(GetRenderer(), image.GetTexture());
backButton.SetText(GetRenderer(), font, "Back", COLOR_BLUE); backButton.SetText(GetRenderer(), font, "Back", COLOR_WHITE);
//set the button positions //set the button positions
backButton.SetX(50); backButton.SetX(50);
client/menu_scenes/lobby_menu.cpp
+4 -4
View File
@@ -40,7 +40,7 @@ LobbyMenu::LobbyMenu(int* const argClientIndex, int* const argAccountIndex):
accountIndex = -1; accountIndex = -1;
//setup the utility objects //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); font = TTF_OpenFont(config["client.font"].c_str(), 12);
//check that the font loaded //check that the font loaded
@@ -52,11 +52,11 @@ LobbyMenu::LobbyMenu(int* const argClientIndex, int* const argAccountIndex):
//setup the buttons //setup the buttons
searchButton.SetBackgroundTexture(GetRenderer(), buttonImage.GetTexture()); 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.SetBackgroundTexture(GetRenderer(), buttonImage.GetTexture());
joinButton.SetText(GetRenderer(), font, "Join", COLOR_BLUE); joinButton.SetText(GetRenderer(), font, "Join", COLOR_WHITE);
backButton.SetBackgroundTexture(GetRenderer(), buttonImage.GetTexture()); backButton.SetBackgroundTexture(GetRenderer(), buttonImage.GetTexture());
backButton.SetText(GetRenderer(), font, "Back", COLOR_BLUE); backButton.SetText(GetRenderer(), font, "Back", COLOR_WHITE);
//set the button positions (assumed) //set the button positions (assumed)
searchButton.SetX(50); searchButton.SetX(50);
client/menu_scenes/main_menu.cpp
+4 -4
View File
@@ -34,7 +34,7 @@ MainMenu::MainMenu() {
ConfigUtility& config = ConfigUtility::GetSingleton(); ConfigUtility& config = ConfigUtility::GetSingleton();
//setup the utility objects //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); font = TTF_OpenFont(config["client.font"].c_str(), 12);
//check that the font loaded //check that the font loaded
@@ -46,11 +46,11 @@ MainMenu::MainMenu() {
//setup the buttons //setup the buttons
startButton.SetBackgroundTexture(GetRenderer(), buttonImage.GetTexture()); 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.SetBackgroundTexture(GetRenderer(), buttonImage.GetTexture());
optionsButton.SetText(GetRenderer(), font, "Options", COLOR_BLUE); optionsButton.SetText(GetRenderer(), font, "Options", COLOR_WHITE);
quitButton.SetBackgroundTexture(GetRenderer(), buttonImage.GetTexture()); quitButton.SetBackgroundTexture(GetRenderer(), buttonImage.GetTexture());
quitButton.SetText(GetRenderer(), font, "Quit", COLOR_BLUE); quitButton.SetText(GetRenderer(), font, "Quit", COLOR_WHITE);
//set the button positions //set the button positions
startButton.SetX(50); startButton.SetX(50);
client/menu_scenes/options_menu.cpp
+2 -2
View File
@@ -34,7 +34,7 @@ OptionsMenu::OptionsMenu() {
ConfigUtility& config = ConfigUtility::GetSingleton(); ConfigUtility& config = ConfigUtility::GetSingleton();
//setup the utility objects //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); font = TTF_OpenFont(config["client.font"].c_str(), 12);
//check that the font loaded //check that the font loaded
@@ -46,7 +46,7 @@ OptionsMenu::OptionsMenu() {
//setup the button //setup the button
backButton.SetBackgroundTexture(GetRenderer(), buttonImage.GetTexture()); backButton.SetBackgroundTexture(GetRenderer(), buttonImage.GetTexture());
backButton.SetText(GetRenderer(), font, "Back", COLOR_BLUE); backButton.SetText(GetRenderer(), font, "Back", COLOR_WHITE);
//set the button positions //set the button positions
backButton.SetX(50); backButton.SetX(50);
makefile
+3 -3
View File
@@ -37,12 +37,12 @@ $(OUTDIR):
clean: clean:
ifeq ($(OS),Windows_NT) ifeq ($(OS),Windows_NT)
del /S /Q *.o *.a *.exe $(OUTDIR)\* del /S /Q *.o *.a *.exe $(OUTDIR)\*.dll
rmdir /S /Q $(OUTDIR) # rmdir /S /Q $(OUTDIR)
else ifeq ($(shell uname), Linux) else ifeq ($(shell uname), Linux)
find . -type f -name '*.o' -exec rm -f -r -v {} \; find . -type f -name '*.o' -exec rm -f -r -v {} \;
find . -type f -name '*.a' -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 find . -empty -type d -delete
endif endif
rsc/config_dev.cfg
+13
View File
@@ -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
todo.txt
+3 -1
View File
@@ -1,5 +1,7 @@
TODO: Resource manager
TODO: Consistency for bounds names TODO: Consistency for bounds names
TODO: Cross compiler (to replace dead linux PC ;_;)
TODO: New button graphics
TODO: Account passwords (list) TODO: Account passwords (list)
* backbone account server OR * backbone account server OR
* social network login OR * social network login OR