matthew/The-Powder-Toy
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix CFLM making VIBR unable to explode

Browse Source
This commit is contained in:
jacob1 2013-05-17 12:44:18 -04:00
parent f35f221554
commit cbd402d8cb
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.gitignore vendored
View File

@ -48,6 +48,10 @@ Makefile.me
*.settings *.settings
*.cbp *.cbp
*.layout *.layout
*.config
*.creator
*.files
*.includes
config.log config.log
*.sconsign.dblite *.sconsign.dblite
*.sconf_temp *.sconf_temp

2
src/simulation/elements/VIBR.cpp
View File

@ -157,7 +157,7 @@ int Element_VIBR::update(UPDATE_FUNC_ARGS) {
{ {
if (!parts[r>>8].life) if (!parts[r>>8].life)
parts[r>>8].tmp += 45; parts[r>>8].tmp += 45;
else if (parts[i].tmp2 && rand()%2) else if (parts[i].tmp2 && parts[i].life > 75 && rand()%2)
{ {
parts[r>>8].tmp2 = 1; parts[r>>8].tmp2 = 1;
parts[i].tmp = 0; parts[i].tmp = 0;