Fixed various warnings
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/irrlicht@3916 178a84e3-b1eb-0310-8ba1-8eac791a3b58
This commit is contained in:
parent
4ce732574a
commit
452808838a
@ -79,7 +79,7 @@ InputManager::~InputManager()
|
||||
|
||||
void InputManager::handleStaticAction(int key, int value)
|
||||
{
|
||||
static bool control_is_pressed=false;
|
||||
// static bool control_is_pressed=false;
|
||||
switch (key)
|
||||
{
|
||||
#ifdef DEBUG
|
||||
|
@ -904,7 +904,7 @@ bool Kart::playCustomSFX(unsigned int type)
|
||||
|
||||
// Stop all other character voices for this kart before playing a new one
|
||||
// we don't want overlapping phrases coming from the same kart
|
||||
for (int n = 0; n < SFXManager::NUM_CUSTOMS; n++)
|
||||
for (unsigned int n = 0; n < SFXManager::NUM_CUSTOMS; n++)
|
||||
{
|
||||
if (m_custom_sounds[n] != NULL)
|
||||
{
|
||||
|
@ -82,7 +82,7 @@ Kart *ProfileWorld::createKart(const std::string &kart_ident, int index,
|
||||
// Create a camera for the last kart (since this way more of the
|
||||
// karts can be seen.
|
||||
Kart *newkart = new DefaultRobot(kart_ident, index+1, init_pos, m_track);
|
||||
if(index==race_manager->getNumKarts()-1)
|
||||
if (index == (int)race_manager->getNumKarts()-1)
|
||||
{
|
||||
// The pointer to the camera does not have to be stored, since it
|
||||
// the camera for robots is not modified.
|
||||
@ -138,4 +138,4 @@ void ProfileWorld::enterRaceOverState(const bool delay)
|
||||
printf("min %f max %f av %f\n",min_t, max_t, av_t/m_kart.size());
|
||||
|
||||
std::exit(-2);
|
||||
} // enterRaceOverState
|
||||
} // enterRaceOverState
|
||||
|
@ -225,7 +225,7 @@ void RaceGUI::drawMiniMap()
|
||||
const Vec3& xyz = kart->getXYZ();
|
||||
Vec3 draw_at;
|
||||
RaceManager::getTrack()->mapPoint2MiniMap(xyz, &draw_at);
|
||||
int marker_height = m_marker->getOriginalSize().Height;
|
||||
// int marker_height = m_marker->getOriginalSize().Height;
|
||||
core::rect<s32> source(i *m_marker_rendered_size, 0,
|
||||
(i+1)*m_marker_rendered_size, m_marker_rendered_size);
|
||||
int marker_half_size = (kart->isPlayerKart() ? m_marker_player_size
|
||||
@ -774,8 +774,10 @@ void RaceGUI::drawStatusText()
|
||||
plunger_x+plunger_size, offset_y+plunger_size);
|
||||
const core::rect<s32> source(core::position2d<s32>(0,0), t->getOriginalSize());
|
||||
|
||||
static const video::SColor white = video::SColor(255, 255, 255, 255);
|
||||
|
||||
irr_driver->getVideoDriver()->draw2DImage(t, dest, source, 0,
|
||||
&video::SColor(255,255,255,255),
|
||||
&white,
|
||||
true);
|
||||
}
|
||||
} // next player
|
||||
|
@ -467,4 +467,4 @@ void QuadGraph::mapPoint2MiniMap(const Vec3 &xyz,Vec3 *draw_at) const
|
||||
draw_at->setX((xyz.getX()-m_min_coord.getX())*m_scaling.getX());
|
||||
draw_at->setY((xyz.getY()-m_min_coord.getY())*m_scaling.getY());
|
||||
|
||||
} // mapPoint
|
||||
} // mapPoint
|
||||
|
Loading…
Reference in New Issue
Block a user