summaryrefslogtreecommitdiff
path: root/src/simulation/elements/LCRY.cpp
diff options
context:
space:
mode:
authorcracker64 <cracker642@gmail.com>2013-03-01 05:41:53 (GMT)
committer cracker64 <cracker642@gmail.com>2013-03-01 05:41:53 (GMT)
commit0d70547cf059b5bd0a7a4a0acd9251fb94c6115e (patch)
tree99a0b212eeecee83662d963da052b439375acbf3 /src/simulation/elements/LCRY.cpp
parent5873d6958641af21b92fcb039d26c336331f19e7 (diff)
downloadpowder-0d70547cf059b5bd0a7a4a0acd9251fb94c6115e.zip
powder-0d70547cf059b5bd0a7a4a0acd9251fb94c6115e.tar.gz
More fixes to fix fixes and new fixes to fix stuff.
Diffstat (limited to 'src/simulation/elements/LCRY.cpp')
-rw-r--r--src/simulation/elements/LCRY.cpp19
1 files changed, 6 insertions, 13 deletions
diff --git a/src/simulation/elements/LCRY.cpp b/src/simulation/elements/LCRY.cpp
index 2ca5c28..8bcf4d0 100644
--- a/src/simulation/elements/LCRY.cpp
+++ b/src/simulation/elements/LCRY.cpp
@@ -53,13 +53,7 @@ int Element_LCRY::update(UPDATE_FUNC_ARGS)
int r, rx, ry, check, setto;
switch (parts[i].tmp)
{
- case 0:
- check=3;
- setto=1;
- break;
case 1:
- check=3;
- setto=1;
if(parts[i].life<=0)
parts[i].tmp = 0;
else
@@ -69,14 +63,11 @@ int Element_LCRY::update(UPDATE_FUNC_ARGS)
parts[i].life = 0;
parts[i].tmp2 = parts[i].life;
}
- break;
- case 3:
- check=0;
- setto=2;
+ case 0:
+ check=3;
+ setto=1;
break;
case 2:
- check=0;
- setto=2;
if(parts[i].life>=10)
parts[i].tmp = 3;
else
@@ -86,8 +77,10 @@ int Element_LCRY::update(UPDATE_FUNC_ARGS)
parts[i].life = 10;
parts[i].tmp2 = parts[i].life;
}
+ case 3:
+ check=0;
+ setto=2;
break;
-
default:
return 0;
}