summaryrefslogtreecommitdiff
path: root/src/simulation/elements/CBNW.cpp
diff options
context:
space:
mode:
authorjacob1 <jfu614@gmail.com>2013-05-20 15:26:51 (GMT)
committer jacob1 <jfu614@gmail.com>2013-05-20 15:26:51 (GMT)
commit826b966668fe37d836de91cf29a6db0d1afee1f4 (patch)
treef617c944418a227769408b75b075d334df93417c /src/simulation/elements/CBNW.cpp
parent77bf649fb4482c86ac1fd9b3233f062b53226007 (diff)
downloadpowder-826b966668fe37d836de91cf29a6db0d1afee1f4.zip
powder-826b966668fe37d836de91cf29a6db0d1afee1f4.tar.gz
reduce rand() chances to 5x the old values in elements that were changed to 3x3 loop checks instead of 5x5. Also some other fixes I found when looking at what had been changed.
Diffstat (limited to 'src/simulation/elements/CBNW.cpp')
-rw-r--r--src/simulation/elements/CBNW.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/simulation/elements/CBNW.cpp b/src/simulation/elements/CBNW.cpp
index 3f07730..ed01cf5 100644
--- a/src/simulation/elements/CBNW.cpp
+++ b/src/simulation/elements/CBNW.cpp
@@ -96,7 +96,7 @@ int Element_CBNW::update(UPDATE_FUNC_ARGS)
//Start explode
parts[i].tmp = rand()%25;//(rand()%100)+50;
}
- else if((sim->elements[r&0xFF].Properties&TYPE_SOLID) && (r&0xFF)!=PT_DMND && (r&0xFF)!=PT_GLAS && parts[i].tmp == 0 && (2-sim->pv[y/CELL][x/CELL])>(rand()%13333))
+ else if((sim->elements[r&0xFF].Properties&TYPE_SOLID) && (r&0xFF)!=PT_DMND && (r&0xFF)!=PT_GLAS && parts[i].tmp == 0 && (2-sim->pv[y/CELL][x/CELL])>(rand()%6667))
{
sim->part_change_type(i,x,y,PT_CO2);
parts[i].ctype = 5;
@@ -131,7 +131,7 @@ int Element_CBNW::update(UPDATE_FUNC_ARGS)
}
else if ((r&0xFF)==PT_FIRE && parts[r>>8].ctype!=PT_WATR){
sim->kill_part(r>>8);
- if(1>(rand()%50)){
+ if(!(rand()%50)){
sim->kill_part(i);
return 1;
}