From f4436d22ee29bdbfc17d79ce80d7e3e0588a820e Mon Sep 17 00:00:00 2001 From: Nick Gasson Date: Sat, 5 Dec 2009 13:12:46 +0000 Subject: [PATCH] Change location of images and fonts --- {data/fonts => fonts}/DejaVuSansMono.ttf | Bin {data/fonts => fonts}/Vera.ttf | Bin {data/images => images}/a-nother-tree.png | Bin {data/images => images}/a-tree.png | Bin {data/images => images}/buildings_icon.png | Bin {data/images => images}/button_active.png | Bin {data/images => images}/button_base.png | Bin {data/images => images}/cloud-tree.png | Bin {data/images => images}/delete_icon.png | Bin {data/images => images}/level_icon.png | Bin {data/images => images}/lower_icon.png | Bin {data/images => images}/raise_icon.png | Bin {data/images => images}/real_tree.png | Bin {data/images => images}/smoke_particle.png | Bin {data/images => images}/start_icon.png | Bin {data/images => images}/station_icon.png | Bin {data/images => images}/track_icon.png | Bin layouts/editor.xml | 2 +- src/Game.cpp | 2 +- src/SkyBox.cpp | 2 +- src/SmokeTrail.cpp | 2 +- src/Tree.cpp | 8 ++++---- src/gui/Theme.cpp | 2 +- 23 files changed, 9 insertions(+), 9 deletions(-) rename {data/fonts => fonts}/DejaVuSansMono.ttf (100%) rename {data/fonts => fonts}/Vera.ttf (100%) rename {data/images => images}/a-nother-tree.png (100%) rename {data/images => images}/a-tree.png (100%) rename {data/images => images}/buildings_icon.png (100%) rename {data/images => images}/button_active.png (100%) rename {data/images => images}/button_base.png (100%) rename {data/images => images}/cloud-tree.png (100%) rename {data/images => images}/delete_icon.png (100%) rename {data/images => images}/level_icon.png (100%) rename {data/images => images}/lower_icon.png (100%) rename {data/images => images}/raise_icon.png (100%) rename {data/images => images}/real_tree.png (100%) rename {data/images => images}/smoke_particle.png (100%) rename {data/images => images}/start_icon.png (100%) rename {data/images => images}/station_icon.png (100%) rename {data/images => images}/track_icon.png (100%) diff --git a/data/fonts/DejaVuSansMono.ttf b/fonts/DejaVuSansMono.ttf similarity index 100% rename from data/fonts/DejaVuSansMono.ttf rename to fonts/DejaVuSansMono.ttf diff --git a/data/fonts/Vera.ttf b/fonts/Vera.ttf similarity index 100% rename from data/fonts/Vera.ttf rename to fonts/Vera.ttf diff --git a/data/images/a-nother-tree.png b/images/a-nother-tree.png similarity index 100% rename from data/images/a-nother-tree.png rename to images/a-nother-tree.png diff --git a/data/images/a-tree.png b/images/a-tree.png similarity index 100% rename from data/images/a-tree.png rename to images/a-tree.png diff --git a/data/images/buildings_icon.png b/images/buildings_icon.png similarity index 100% rename from data/images/buildings_icon.png rename to images/buildings_icon.png diff --git a/data/images/button_active.png b/images/button_active.png similarity index 100% rename from data/images/button_active.png rename to images/button_active.png diff --git a/data/images/button_base.png b/images/button_base.png similarity index 100% rename from data/images/button_base.png rename to images/button_base.png diff --git a/data/images/cloud-tree.png b/images/cloud-tree.png similarity index 100% rename from data/images/cloud-tree.png rename to images/cloud-tree.png diff --git a/data/images/delete_icon.png b/images/delete_icon.png similarity index 100% rename from data/images/delete_icon.png rename to images/delete_icon.png diff --git a/data/images/level_icon.png b/images/level_icon.png similarity index 100% rename from data/images/level_icon.png rename to images/level_icon.png diff --git a/data/images/lower_icon.png b/images/lower_icon.png similarity index 100% rename from data/images/lower_icon.png rename to images/lower_icon.png diff --git a/data/images/raise_icon.png b/images/raise_icon.png similarity index 100% rename from data/images/raise_icon.png rename to images/raise_icon.png diff --git a/data/images/real_tree.png b/images/real_tree.png similarity index 100% rename from data/images/real_tree.png rename to images/real_tree.png diff --git a/data/images/smoke_particle.png b/images/smoke_particle.png similarity index 100% rename from data/images/smoke_particle.png rename to images/smoke_particle.png diff --git a/data/images/start_icon.png b/images/start_icon.png similarity index 100% rename from data/images/start_icon.png rename to images/start_icon.png diff --git a/data/images/station_icon.png b/images/station_icon.png similarity index 100% rename from data/images/station_icon.png rename to images/station_icon.png diff --git a/data/images/track_icon.png b/images/track_icon.png similarity index 100% rename from data/images/track_icon.png rename to images/track_icon.png diff --git a/layouts/editor.xml b/layouts/editor.xml index 1efeaf8..6110eaa 100644 --- a/layouts/editor.xml +++ b/layouts/editor.xml @@ -8,7 +8,7 @@ + image="images/track_icon.png"/> diff --git a/src/Game.cpp b/src/Game.cpp index a0f9e22..b4acbc2 100644 --- a/src/Game.cpp +++ b/src/Game.cpp @@ -95,7 +95,7 @@ Game::Game(IMapPtr aMap) // Build the GUI layout = gui::makeLayout("layouts/game.xml"); - statusFont = gui::loadFont("data/fonts/Vera.ttf", 18); + statusFont = gui::loadFont("fonts/Vera.ttf", 18); } Game::~Game() diff --git a/src/SkyBox.cpp b/src/SkyBox.cpp index 41c0753..23f3f28 100644 --- a/src/SkyBox.cpp +++ b/src/SkyBox.cpp @@ -52,7 +52,7 @@ SkyBox::SkyBox(const string& aBaseName) void SkyBox::loadSkyTexture(int anIndex, const string& aSuffix) { textures[anIndex] = - loadTexture("data/images/" + baseName + "_" + aSuffix + ".png"); + loadTexture("images/" + baseName + "_" + aSuffix + ".png"); } void SkyBox::apply(float anAngle) const diff --git a/src/SmokeTrail.cpp b/src/SmokeTrail.cpp index f354196..f3ecfe4 100644 --- a/src/SmokeTrail.cpp +++ b/src/SmokeTrail.cpp @@ -66,7 +66,7 @@ SmokeTrail::SmokeTrail() mySpawnDelay(500), mySpawnCounter(0), myXSpeed(0.0f), myYSpeed(0.0f), myZSpeed(0.0f) { - particleTex = loadTexture("data/images/smoke_particle.png"); + particleTex = loadTexture("images/smoke_particle.png"); } // Returns true if the particle is dead diff --git a/src/Tree.cpp b/src/Tree.cpp index e9be3e2..2218584 100644 --- a/src/Tree.cpp +++ b/src/Tree.cpp @@ -37,10 +37,10 @@ private: Tree::Tree() { const char* trees[] = { - "data/images/a-tree.png", - "data/images/a-nother-tree.png", - "data/images/cloud-tree.png", - "data/images/real_tree.png", + "images/a-tree.png", + "images/a-nother-tree.png", + "images/cloud-tree.png", + "images/real_tree.png", }; static UniformInt rnd(0, sizeof(trees)/sizeof(char*) - 1); diff --git a/src/gui/Theme.cpp b/src/gui/Theme.cpp index 4ee2aad..ba5fc82 100644 --- a/src/gui/Theme.cpp +++ b/src/gui/Theme.cpp @@ -25,7 +25,7 @@ using namespace gui; Theme::Theme() { - normal_font_ = gui::loadFont("data/fonts/Vera.ttf", + normal_font_ = gui::loadFont("fonts/Vera.ttf", 18, gui::FONT_NORMAL); } -- 2.39.2