immibis
/
colobot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Removed unused particle types

master
krzys-h 2015-07-14 14:16:19 +02:00
parent 4506a4b8bd
commit 5a1c6d19ff
2 changed files with 16 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/graphics/engine/particle.cpp
View File

@ -269,7 +269,6 @@ int CParticle::CreateParticle(Math::Vector pos, Math::Vector speed, Math::Point
type == PARTILIMIT1 || type == PARTILIMIT1 ||
type == PARTILIMIT2 || type == PARTILIMIT2 ||
type == PARTILIMIT3 || type == PARTILIMIT3 ||
type == PARTILIMIT4 ||
type == PARTIEXPLOG1 || type == PARTIEXPLOG1 ||
type == PARTIEXPLOG2 ) type == PARTIEXPLOG2 )
{ {
@ -374,7 +373,7 @@ int CParticle::CreateParticle(Math::Vector pos, Math::Vector speed, Math::Point
} }
if ( type >= PARTIFOG0 && if ( type >= PARTIFOG0 &&
type <= PARTIFOG9 ) type <= PARTIFOG7 )
{ {
if (m_fogTotal < MAXPARTIFOG) if (m_fogTotal < MAXPARTIFOG)
m_fog[m_fogTotal++] = i; m_fog[m_fogTotal++] = i;
@ -548,8 +547,7 @@ int CParticle::CreateRay(Math::Vector pos, Math::Vector goal,
int t = -1; int t = -1;
if ( type == PARTIRAY1 || if ( type == PARTIRAY1 ||
type == PARTIRAY2 || type == PARTIRAY2 ||
type == PARTIRAY3 || type == PARTIRAY3 )
type == PARTIRAY4 )
{ {
t = 3; // effect02 t = 3; // effect02
} }
@ -1622,7 +1620,7 @@ void CParticle::FrameParticle(float rTime)
// Decreases the intensity if the camera // Decreases the intensity if the camera
// is almost at the same height (fog was eye level). // is almost at the same height (fog was eye level).
if ( m_particle[i].type >= PARTIFOG0 && if ( m_particle[i].type >= PARTIFOG0 &&
m_particle[i].type <= PARTIFOG9 ) m_particle[i].type <= PARTIFOG7 )
{ {
float h = 10.0f; float h = 10.0f;
@ -3608,17 +3606,16 @@ void CParticle::DrawParticle(int sheet)
DrawParticleFlat(i); DrawParticleFlat(i);
} }
else if ( m_particle[i].type >= PARTIFOG0 && else if ( m_particle[i].type >= PARTIFOG0 &&
m_particle[i].type <= PARTIFOG9 ) m_particle[i].type <= PARTIFOG7 )
{ {
DrawParticleFog(i); DrawParticleFog(i);
} }
else if ( m_particle[i].type >= PARTISPHERE0 && else if ( m_particle[i].type >= PARTISPHERE0 &&
m_particle[i].type <= PARTISPHERE9 ) // sphere? m_particle[i].type <= PARTISPHERE6 ) // sphere?
{ {
DrawParticleSphere(i); DrawParticleSphere(i);
} }
else if ( m_particle[i].type >= PARTIPLOUF0 && else if ( m_particle[i].type >= PARTIPLOUF0 ) // cylinder?
m_particle[i].type <= PARTIPLOUF4 ) // cylinder?
{ {
DrawParticleCylinder(i); DrawParticleCylinder(i);
} }
@ -3905,4 +3902,3 @@ bool CParticle::WriteWheelTrace(const char *filename, int width, int height,
} }
} // namespace Gfx } // namespace Gfx

43
src/graphics/engine/particle.h
View File

@ -69,20 +69,19 @@ enum ParticleType
PARTIFIRE = 9, //! < fireball shrinks PARTIFIRE = 9, //! < fireball shrinks
PARTIFIREZ = 10, //! < fireball grows PARTIFIREZ = 10, //! < fireball grows
PARTIBLUE = 11, //! < blue ball PARTIBLUE = 11, //! < blue ball
PARTISELY = 12, //! < yellow selection PARTISELY = 12, //! < yellow robot lights
PARTISELR = 13, //! < red selection PARTISELR = 13, //! < red robot lights
PARTIGUN1 = 18, //! < a bullet (fireball) PARTIGUN1 = 18, //! < bullet 1 (fireball)
PARTIGUN2 = 19, //! < bullet 2 (ant) PARTIGUN2 = 19, //! < bullet 2 (ant)
PARTIGUN3 = 20, //! < bullet 3 (spider) PARTIGUN3 = 20, //! < bullet 3 (spider)
PARTIGUN4 = 21, //! < bullet 4 (orgaball) PARTIGUN4 = 21, //! < bullet 4 (orgaball)
PARTIFRAG = 22, //! < triangular fragment PARTIFRAG = 22, //! < triangular fragment
PARTIQUEUE = 23, //! < inflamed tail PARTIQUEUE = 23, //! < inflamed tail (TODO: unused?)
PARTIORGANIC1 = 24, //! < organic ball mother PARTIORGANIC1 = 24, //! < organic ball mother
PARTIORGANIC2 = 25, //! < organic ball daughter PARTIORGANIC2 = 25, //! < organic ball daughter
PARTISMOKE1 = 26, //! < black smoke PARTISMOKE1 = 26, //! < black smoke
PARTISMOKE2 = 27, //! < black smoke PARTISMOKE2 = 27, //! < black smoke
PARTISMOKE3 = 28, //! < black smoke PARTISMOKE3 = 28, //! < black smoke
PARTISMOKE4 = 29, //! < black smoke
PARTIBLOOD = 30, //! < human blood PARTIBLOOD = 30, //! < human blood
PARTIBLOODM = 31, //! < blood laying PARTIBLOODM = 31, //! < blood laying
PARTIVAPOR = 32, //! < steam PARTIVAPOR = 32, //! < steam
@ -98,17 +97,16 @@ enum ParticleType
PARTIVIRUS10 = 42, //! < virus 10 PARTIVIRUS10 = 42, //! < virus 10
PARTIRAY1 = 43, //! < ray 1 (turn) PARTIRAY1 = 43, //! < ray 1 (turn)
PARTIRAY2 = 44, //! < ray 2 (electric arc) PARTIRAY2 = 44, //! < ray 2 (electric arc)
PARTIRAY3 = 45, //! < ray 3 PARTIRAY3 = 45, //! < ray 3 (ExchangePost)
PARTIRAY4 = 46, //! < ray 4
PARTIFLAME = 47, //! < flame PARTIFLAME = 47, //! < flame
PARTIBUBBLE = 48, //! < bubble PARTIBUBBLE = 48, //! < bubble
PARTIFLIC = 49, //! < circles in the water PARTIFLIC = 49, //! < circles in the water
PARTIEJECT = 50, //! < ejection from the reactor PARTIEJECT = 50, //! < ejection from the reactor
PARTISCRAPS = 51, //! < waste from the reactor PARTISCRAPS = 51, //! < waste from the reactor
PARTITOTO = 52, //! < reactor of tot PARTITOTO = 52, //! < Robby's reactor
PARTIERROR = 53, //! < toto says no PARTIERROR = 53, //! < Robby says no
PARTIWARNING = 54, //! < foo says blah PARTIWARNING = 54, //! < Robby says blah
PARTIINFO = 54, //! < toto says yes PARTIINFO = 54, //! < Robby says yes
PARTIQUARTZ = 55, //! < reflection crystal PARTIQUARTZ = 55, //! < reflection crystal
PARTISPHERE0 = 56, //! < explosion sphere PARTISPHERE0 = 56, //! < explosion sphere
PARTISPHERE1 = 57, //! < energy sphere PARTISPHERE1 = 57, //! < energy sphere
@ -117,9 +115,6 @@ enum ParticleType
PARTISPHERE4 = 60, //! < information sphere (emit) PARTISPHERE4 = 60, //! < information sphere (emit)
PARTISPHERE5 = 61, //! < botanical sphere (gravity root) PARTISPHERE5 = 61, //! < botanical sphere (gravity root)
PARTISPHERE6 = 62, //! < information sphere (receive) PARTISPHERE6 = 62, //! < information sphere (receive)
PARTISPHERE7 = 63, //! < sphere
PARTISPHERE8 = 64, //! < sphere
PARTISPHERE9 = 65, //! < sphere
PARTIGUNDEL = 66, //! < bullet destroyed by shield PARTIGUNDEL = 66, //! < bullet destroyed by shield
PARTIPART = 67, //! < object part PARTIPART = 67, //! < object part
PARTITRACK1 = 68, //! < drag 1 PARTITRACK1 = 68, //! < drag 1
@ -133,15 +128,7 @@ enum ParticleType
PARTITRACK9 = 76, //! < drag 9 PARTITRACK9 = 76, //! < drag 9
PARTITRACK10 = 77, //! < drag 10 PARTITRACK10 = 77, //! < drag 10
PARTITRACK11 = 78, //! < drag 11 PARTITRACK11 = 78, //! < drag 11
PARTITRACK12 = 79, //! < drag 12 PARTITRACK12 = 79, //! < drag 12 (TODO: unused?)
PARTITRACK13 = 80, //! < drag 13
PARTITRACK14 = 81, //! < drag 14
PARTITRACK15 = 82, //! < drag 15
PARTITRACK16 = 83, //! < drag 16
PARTITRACK17 = 84, //! < drag 17
PARTITRACK18 = 85, //! < drag 18
PARTITRACK19 = 86, //! < drag 19
PARTITRACK20 = 87, //! < drag 20
PARTIGLINTb = 88, //! < blue reflection PARTIGLINTb = 88, //! < blue reflection
PARTIGLINTr = 89, //! < red reflection PARTIGLINTr = 89, //! < red reflection
PARTILENS1 = 90, //! < brilliance 1 (orange) PARTILENS1 = 90, //! < brilliance 1 (orange)
@ -155,10 +142,6 @@ enum ParticleType
PARTIRECOVER = 98, //! < blue ball recycler PARTIRECOVER = 98, //! < blue ball recycler
PARTIROOT = 100, //! < gravity root smoke PARTIROOT = 100, //! < gravity root smoke
PARTIPLOUF0 = 101, //! < splash PARTIPLOUF0 = 101, //! < splash
PARTIPLOUF1 = 102, //! < splash
PARTIPLOUF2 = 103, //! < splash
PARTIPLOUF3 = 104, //! < splash
PARTIPLOUF4 = 105, //! < splash
PARTIDROP = 106, //! < drop PARTIDROP = 106, //! < drop
PARTIFOG0 = 107, //! < fog 0 PARTIFOG0 = 107, //! < fog 0
PARTIFOG1 = 108, //! < fog 1 PARTIFOG1 = 108, //! < fog 1
@ -168,12 +151,9 @@ enum ParticleType
PARTIFOG5 = 112, //! < fog 5 PARTIFOG5 = 112, //! < fog 5
PARTIFOG6 = 113, //! < fog 6 PARTIFOG6 = 113, //! < fog 6
PARTIFOG7 = 114, //! < fog 7 PARTIFOG7 = 114, //! < fog 7
PARTIFOG8 = 115, //! < fog 8
PARTIFOG9 = 116, //! < fog 9
PARTILIMIT1 = 117, //! < shows the limits 1 PARTILIMIT1 = 117, //! < shows the limits 1
PARTILIMIT2 = 118, //! < shows the limits 2 PARTILIMIT2 = 118, //! < shows the limits 2
PARTILIMIT3 = 119, //! < shows the limits 3 PARTILIMIT3 = 119, //! < shows the limits 3
PARTILIMIT4 = 120, //! < shows the limits 4
PARTIWATER = 121, //! < drop of water PARTIWATER = 121, //! < drop of water
PARTIEXPLOG1 = 122, //! < ball explosion 1 PARTIEXPLOG1 = 122, //! < ball explosion 1
PARTIEXPLOG2 = 123, //! < ball explosion 2 PARTIEXPLOG2 = 123, //! < ball explosion 2
@ -196,8 +176,6 @@ enum ParticleType
PARTITRACE15 = 155, //! < trace PARTITRACE15 = 155, //! < trace
PARTITRACE16 = 156, //! < trace PARTITRACE16 = 156, //! < trace
PARTITRACE17 = 157, //! < trace PARTITRACE17 = 157, //! < trace
PARTITRACE18 = 158, //! < trace
PARTITRACE19 = 159, //! < trace
}; };
enum ParticlePhase enum ParticlePhase
@ -397,4 +375,3 @@ protected:
} // namespace Gfx } // namespace Gfx