Replaced tabs with spaces.

git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14448 178a84e3-b1eb-0310-8ba1-8eac791a3b58
This commit is contained in:
hikerstk 2013-11-15 12:52:39 +00:00
parent c5b8732087
commit 8247f73604
60 changed files with 1431 additions and 1434 deletions

View File

@ -1,4 +1,4 @@
// SuperTuxKart - a fun racing game with go-kart // Supertuxkart - a fun racing game with go-kart
// Copyright (C) 2009-2013 Marianne Gagnon // Copyright (C) 2009-2013 Marianne Gagnon
// //
// This program is free software; you can redistribute it and/or // This program is free software; you can redistribute it and/or

View File

@ -878,7 +878,6 @@ void KartModel::attachHat(){
bone = m_animated_node->getJointNode("head"); bone = m_animated_node->getJointNode("head");
if(bone) if(bone)
{ {
// Till we have all models fixed, accept Head and head as bone naartme // Till we have all models fixed, accept Head and head as bone naartme
scene::IMesh *hat_mesh = scene::IMesh *hat_mesh =
irr_driver->getAnimatedMesh( irr_driver->getAnimatedMesh(
@ -888,7 +887,6 @@ void KartModel::attachHat(){
m_animated_node->setCurrentFrame((float)m_animation_frame[AF_STRAIGHT]); m_animated_node->setCurrentFrame((float)m_animation_frame[AF_STRAIGHT]);
m_animated_node->OnAnimate(0); m_animated_node->OnAnimate(0);
bone->updateAbsolutePosition(); bone->updateAbsolutePosition();
// With the hat node attached to the head bone, we have to // With the hat node attached to the head bone, we have to
// reverse the transformation of the bone, so that the hat // reverse the transformation of the bone, so that the hat
// is still properly placed. Esp. the hat offset needs // is still properly placed. Esp. the hat offset needs

View File

@ -265,10 +265,6 @@ void World::reset()
void World::createRaceGUI() void World::createRaceGUI()
{ {
//if(UserConfigParams::m_minimal_race_gui &&
// race_manager->getTrackName() != "tutorial")
// m_race_gui = new MinimalRaceGUI();
//else
m_race_gui = new RaceGUI(); m_race_gui = new RaceGUI();
} }

View File

@ -678,7 +678,8 @@ void RaceGUIBase::drawGlobalMusicDescription()
} // drawGlobalMusicDescription } // drawGlobalMusicDescription
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
void RaceGUIBase::drawGlobalGoal(){ void RaceGUIBase::drawGlobalGoal()
{
static video::SColor color = video::SColor(255, 255, 255, 255); static video::SColor color = video::SColor(255, 255, 255, 255);
core::rect<s32> pos(UserConfigParams::m_width>>1, core::rect<s32> pos(UserConfigParams::m_width>>1,
UserConfigParams::m_height>>1, UserConfigParams::m_height>>1,

View File

@ -651,12 +651,14 @@ namespace StringUtils
{ {
// Special case: SVN // Special case: SVN
if(version_string=="SVN" || version_string=="svn") if(version_string=="SVN" || version_string=="svn")
{
// SVN version will be version 99.99.99i-rcJ // SVN version will be version 99.99.99i-rcJ
return 1000000*99 return 1000000*99
+ 10000*99 + 10000*99
+ 100*99 + 100*99
+ 10* 9 + 10* 9
+ 9; + 9;
}
std::string s=version_string; std::string s=version_string;
// To guarantee that a release gets a higher version number than // To guarantee that a release gets a higher version number than