ilikecats/stk-code_catmod
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Removed some compiler warnings.

Browse Source
This commit is contained in:
hiker 2014-02-20 08:55:35 +11:00
parent b0b9712fb9
commit 55665e21a3
4 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/karts/kart.cpp
View File

@ -2591,12 +2591,12 @@ btQuaternion Kart::getVisualRotation() const
void Kart::setOnScreenText(const wchar_t *text)
{
core::dimension2d<u32> textsize = GUIEngine::getFont()->getDimension(text);
scene::ISceneManager* sm = irr_driver->getSceneManager();
// FIXME: Titlefont is the only font guaranteed to be loaded if STK
// is started without splash screen (since "Loading" is shown even in this
// case). A smaller font would be better
// TODO: Add support in the engine for BillboardText or find a replacement
/*sm->addBillboardTextSceneNode(GUIEngine::getFont() ? GUIEngine::getFont()
/*scene::ISceneManager* sm = irr_driver->getSceneManager();
sm->addBillboardTextSceneNode(GUIEngine::getFont() ? GUIEngine::getFont()
: GUIEngine::getTitleFont(),
text,
getNode(),

1
src/states_screens/race_gui.cpp
View File

@ -610,7 +610,6 @@ void RaceGUI::drawSpeedAndEnergy(const AbstractKart* kart,
offset.X = (float)(viewport.LowerRightCorner.X-meter_width) - 24.0f*scaling.X;
offset.Y = viewport.LowerRightCorner.Y-10.0f*scaling.Y;
video::IVideoDriver *video = irr_driver->getVideoDriver();
const core::rect<s32> meter_pos((int)offset.X,
(int)(offset.Y-meter_height),
(int)(offset.X+meter_width),

2
src/states_screens/story_mode_lobby.cpp
View File

@ -109,8 +109,6 @@ void StoryModeLobbyScreen::eventCallback(Widget* widget,
{
ListWidget* list = getWidget<ListWidget>("gameslots");
bool slot_found = false;
PlayerProfile *player = PlayerManager::get()
->getPlayer(list->getSelectionLabel());
if(player)

4
src/tracks/track.cpp
View File

@ -966,12 +966,12 @@ bool Track::loadMainTrack(const XMLNode &root)
core::stringw msg = StringUtils::toWString(val);
core::dimension2d<u32> textsize = GUIEngine::getHighresDigitFont()
->getDimension(msg.c_str());
scene::ISceneManager* sm = irr_driver->getSceneManager();
assert(GUIEngine::getHighresDigitFont() != NULL);
// TODO: Add support in the engine for BillboardText or find a replacement
/* scene::ISceneNode* sn =
/* scene::ISceneManager* sm = irr_driver->getSceneManager();
scene::ISceneNode* sn =
sm->addBillboardTextSceneNode(GUIEngine::getHighresDigitFont(),
msg.c_str(),
NULL,