diff --git a/data/skins/Ocean.stkskin b/data/skins/Ocean.stkskin
index 937be723e..e8b75b13a 100644
--- a/data/skins/Ocean.stkskin
+++ b/data/skins/Ocean.stkskin
@@ -258,8 +258,8 @@ when the border that intersect at this corner are enabled.
-
-
-
+
+
+
diff --git a/data/skins/Peach.stkskin b/data/skins/Peach.stkskin
index d7c4cb73d..0bed84a66 100644
--- a/data/skins/Peach.stkskin
+++ b/data/skins/Peach.stkskin
@@ -256,8 +256,8 @@ when the border that intersect at this corner are enabled.
-
-
-
+
+
+
diff --git a/src/guiengine/scalable_font.cpp b/src/guiengine/scalable_font.cpp
index 7cf14930f..d6d076adf 100644
--- a/src/guiengine/scalable_font.cpp
+++ b/src/guiengine/scalable_font.cpp
@@ -16,9 +16,10 @@
// along with this program; if not, write to the Free Software
// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+#include "guiengine/scalable_font.hpp"
+
#include "graphics/2dutils.hpp"
#include "guiengine/engine.hpp"
-#include "guiengine/scalable_font.hpp"
#include "guiengine/skin.hpp"
#include "io/file_manager.hpp"
#include "utils/translation.hpp"
@@ -992,10 +993,10 @@ void ScalableFont::doDraw(const core::stringw& text,
if (fallback[n] || m_type == T_BOLD)
{
- video::SColor title_colors[] = {GUIEngine::getSkin()->getColor("top::font" ),
- GUIEngine::getSkin()->getColor("bottom::font"),
- GUIEngine::getSkin()->getColor("top::font" ),
- GUIEngine::getSkin()->getColor("bottom::font")
+ video::SColor title_colors[] = {GUIEngine::getSkin()->getColor("font::top" ),
+ GUIEngine::getSkin()->getColor("font::bottom"),
+ GUIEngine::getSkin()->getColor("font::top" ),
+ GUIEngine::getSkin()->getColor("font::bottom")
};
if (charCollector != NULL)
diff --git a/src/karts/controller/player_controller.cpp b/src/karts/controller/player_controller.cpp
index 15b6ed92d..e77be668f 100644
--- a/src/karts/controller/player_controller.cpp
+++ b/src/karts/controller/player_controller.cpp
@@ -354,9 +354,9 @@ void PlayerController::update(float dt)
if (m)
{
m->addMessage(_("Penalty time!!"), m_kart, 2.0f,
- GUIEngine::getSkin()->getColor("top::font"));
+ GUIEngine::getSkin()->getColor("font::top"));
m->addMessage(_("Don't accelerate before go"), m_kart, 2.0f,
- GUIEngine::getSkin()->getColor("normal::font"));
+ GUIEngine::getSkin()->getColor("font::normal"));
}
m_bzzt_sound->play();
diff --git a/src/karts/kart.cpp b/src/karts/kart.cpp
index a57cbf892..f227c74da 100644
--- a/src/karts/kart.cpp
+++ b/src/karts/kart.cpp
@@ -2753,8 +2753,8 @@ void Kart::setOnScreenText(const wchar_t *text)
gui::ScalableFont* font = GUIEngine::getFont() ? GUIEngine::getFont()
: GUIEngine::getTitleFont();
new STKTextBillboard(text, font,
- GUIEngine::getSkin()->getColor("bottom::font"),
- GUIEngine::getSkin()->getColor("top::font"),
+ GUIEngine::getSkin()->getColor("font::bottom"),
+ GUIEngine::getSkin()->getColor("font::top"),
getNode(), irr_driver->getSceneManager(), -1,
core::vector3df(0.0f, 1.5f, 0.0f),
core::vector3df(1.0f, 1.0f, 1.0f));
@@ -2770,8 +2770,8 @@ void Kart::setOnScreenText(const wchar_t *text)
textsize.Height/55.0f),
core::vector3df(0.0f, 1.5f, 0.0f),
-1, // id
- GUIEngine::getSkin()->getColor("bottom::font"),
- GUIEngine::getSkin()->getColor("top::font"));
+ GUIEngine::getSkin()->getColor("font::bottom"),
+ GUIEngine::getSkin()->getColor("font::top"));
}
// No need to store the reference to the billboard scene node:
diff --git a/src/modes/linear_world.cpp b/src/modes/linear_world.cpp
index fb69d2002..245687798 100644
--- a/src/modes/linear_world.cpp
+++ b/src/modes/linear_world.cpp
@@ -282,7 +282,7 @@ void LinearWorld::newLap(unsigned int kart_index)
if (raceHasLaps() && kart_info.m_race_lap+1 == lap_count)
{
m_race_gui->addMessage(_("Final lap!"), kart,
- 3.0f, GUIEngine::getSkin()->getColor("normal::font"), true);
+ 3.0f, GUIEngine::getSkin()->getColor("font::normal"), true);
if(!m_last_lap_sfx_played && lap_count > 1)
{
if (UserConfigParams::m_music)
@@ -309,7 +309,7 @@ void LinearWorld::newLap(unsigned int kart_index)
kart_info.m_race_lap+1 < lap_count)
{
m_race_gui->addMessage(_("Lap %i", kart_info.m_race_lap+1),
- kart, 3.0f, GUIEngine::getSkin()->getColor("normal::font"),
+ kart, 3.0f, GUIEngine::getSkin()->getColor("font::normal"),
true);
}
diff --git a/src/scriptengine/script_track.cpp b/src/scriptengine/script_track.cpp
index 57d9f178a..c327ff80b 100644
--- a/src/scriptengine/script_track.cpp
+++ b/src/scriptengine/script_track.cpp
@@ -98,8 +98,8 @@ namespace Scripting
{
gui::ScalableFont* font = GUIEngine::getHighresDigitFont();
STKTextBillboard* tb = new STKTextBillboard(wtext.c_str(), font,
- GUIEngine::getSkin()->getColor("bottom::font"),
- GUIEngine::getSkin()->getColor("top::font"),
+ GUIEngine::getSkin()->getColor("font::bottom"),
+ GUIEngine::getSkin()->getColor("font::top"),
irr_driver->getSceneManager()->getRootSceneNode(),
irr_driver->getSceneManager(), -1, xyz,
core::vector3df(1.5f, 1.5f, 1.5f));
@@ -117,8 +117,8 @@ namespace Scripting
textsize.Height / 35.0f),
xyz,
-1, // id
- GUIEngine::getSkin()->getColor("bottom::font"),
- GUIEngine::getSkin()->getColor("top::font"));
+ GUIEngine::getSkin()->getColor("font::bottom"),
+ GUIEngine::getSkin()->getColor("font::top"));
World::getWorld()->getTrack()->addNode(sn);
}
}
diff --git a/src/states_screens/race_gui_overworld.cpp b/src/states_screens/race_gui_overworld.cpp
index e9d6c387a..db5728899 100644
--- a/src/states_screens/race_gui_overworld.cpp
+++ b/src/states_screens/race_gui_overworld.cpp
@@ -467,7 +467,7 @@ void RaceGUIOverworld::drawGlobalMiniMap()
irr_driver->getActualScreenSize().Width,
irr_driver->getActualScreenSize().Height);
GUIEngine::getOutlineFont()->draw(_("Press fire to play the tutorial"), pos2,
- GUIEngine::getSkin()->getColor("normal::font"),
+ GUIEngine::getSkin()->getColor("font::normal"),
true, true /* vcenter */, NULL);
continue;
}
@@ -537,7 +537,7 @@ void RaceGUIOverworld::drawGlobalMiniMap()
irr_driver->getActualScreenSize().Width,
irr_driver->getActualScreenSize().Height);
GUIEngine::getOutlineFont()->draw(_("Press fire to start the challenge"), pos2,
- GUIEngine::getSkin()->getColor("normal::font"),
+ GUIEngine::getSkin()->getColor("font::normal"),
true, true /* vcenter */, NULL);
}
}