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

Removed compiler warning, updated VS project file.

Browse Source 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@7263 178a84e3-b1eb-0310-8ba1-8eac791a3b58
This commit is contained in:
hikerstk 2011-01-05 05:27:59 +00:00
parent f0f97d0fbb
commit cd8ea2eead
3 changed files with 20 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/graphics/particle_kind.cpp
View File

@ -31,9 +31,9 @@
ParticleKind::ParticleKind(const std::string file) : m_min_start_color(255,255,255,255), m_max_start_color(255,255,255,255) ParticleKind::ParticleKind(const std::string file) : m_min_start_color(255,255,255,255), m_max_start_color(255,255,255,255)
{ {
// ---- Initial values to prevent readin uninitialized values // ---- Initial values to prevent readin uninitialized values
m_max_size = 0.5; m_max_size = 0.5f;
m_min_size = 0.5; m_min_size = 0.5f;
m_spread_factor = 0.001; m_spread_factor = 0.001f;
m_shape = EMITTER_POINT; m_shape = EMITTER_POINT;
m_material = NULL; m_material = NULL;
m_min_rate = 10; m_min_rate = 10;

28
src/ide/vc9/supertuxkart.vcproj
View File

@ -695,7 +695,11 @@
> >
</File> </File>
<File <File
RelativePath="..\..\graphics\nitro.cpp" RelativePath="..\..\graphics\particle_emitter.cpp"
>
</File>
<File
RelativePath="..\..\graphics\particle_kind.cpp"
> >
</File> </File>
<File <File
@ -710,10 +714,6 @@
RelativePath="..\..\graphics\slip_stream.cpp" RelativePath="..\..\graphics\slip_stream.cpp"
> >
</File> </File>
<File
RelativePath="..\..\graphics\smoke.cpp"
>
</File>
<File <File
RelativePath="..\..\graphics\stars.cpp" RelativePath="..\..\graphics\stars.cpp"
> >
@ -958,10 +958,6 @@
RelativePath="..\..\states_screens\addons_screen.cpp" RelativePath="..\..\states_screens\addons_screen.cpp"
> >
</File> </File>
<File
RelativePath="..\..\states_screens\addons_update_screen.cpp"
>
</File>
<File <File
RelativePath="..\..\states_screens\arenas_screen.cpp" RelativePath="..\..\states_screens\arenas_screen.cpp"
> >
@ -1645,7 +1641,11 @@
> >
</File> </File>
<File <File
RelativePath="..\..\graphics\nitro.hpp" RelativePath="..\..\graphics\particle_emitter.hpp"
>
</File>
<File
RelativePath="..\..\graphics\particle_kind.hpp"
> >
</File> </File>
<File <File
@ -1660,10 +1660,6 @@
RelativePath="..\..\graphics\slip_stream.hpp" RelativePath="..\..\graphics\slip_stream.hpp"
> >
</File> </File>
<File
RelativePath="..\..\graphics\smoke.hpp"
>
</File>
<File <File
RelativePath="..\..\graphics\stars.hpp" RelativePath="..\..\graphics\stars.hpp"
> >
@ -1880,10 +1876,6 @@
RelativePath="..\..\states_screens\addons_screen.hpp" RelativePath="..\..\states_screens\addons_screen.hpp"
> >
</File> </File>
<File
RelativePath="..\..\states_screens\addons_update_screen.hpp"
>
</File>
<File <File
RelativePath="..\..\states_screens\arenas_screen.hpp" RelativePath="..\..\states_screens\arenas_screen.hpp"
> >

10
src/karts/kart.cpp
View File

@ -1444,8 +1444,10 @@ void Kart::loadData()
{ {
try try
{ {
core::vector3df position(-getKartWidth()*0.35f, 0.06, -getKartLength()*0.5f); core::vector3df position(-getKartWidth()*0.35f, 0.06f, -getKartLength()*0.5f);
m_smoke_system = new ParticleEmitter(new ParticleKind(file_manager->getDataFile("smoke.xml")), position); m_smoke_system = new ParticleEmitter(
new ParticleKind(file_manager->getDataFile("smoke.xml")),
position);
} }
catch (std::runtime_error& e) catch (std::runtime_error& e)
{ {
@ -1459,7 +1461,9 @@ void Kart::loadData()
try try
{ {
m_nitro = new ParticleEmitter(new ParticleKind(file_manager->getDataFile("nitro.xml")), position, getNode()); m_nitro = new ParticleEmitter(
new ParticleKind(file_manager->getDataFile("nitro.xml")),
position, getNode());
} }
catch (std::runtime_error& e) catch (std::runtime_error& e)
{ {