diff options
| author | jacob1 <jfu614@gmail.com> | 2013-03-06 17:05:59 (GMT) |
|---|---|---|
| committer | jacob1 <jfu614@gmail.com> | 2013-03-06 17:05:59 (GMT) |
| commit | 037618e6f8e6a37574f7ef8ffd90e490fb0ea137 (patch) | |
| tree | d80246d31a26aee7735a566bccc8ce9e8e4e305d /src/simulation/Simulation.cpp | |
| parent | ad951eb9af20cd1a784fab39c41ade1c19dff2ca (diff) | |
| download | powder-037618e6f8e6a37574f7ef8ffd90e490fb0ea137.zip powder-037618e6f8e6a37574f7ef8ffd90e490fb0ea137.tar.gz | |
remove auto generated comments from all files, fix some missing tabs, remove unused variables from config.h
Diffstat (limited to 'src/simulation/Simulation.cpp')
| -rw-r--r-- | src/simulation/Simulation.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/simulation/Simulation.cpp b/src/simulation/Simulation.cpp index 44932b5..b6f4f84 100644 --- a/src/simulation/Simulation.cpp +++ b/src/simulation/Simulation.cpp @@ -2847,18 +2847,18 @@ int Simulation::create_part(int p, int x, int y, int tv) ) { parts[pmap[y][x]>>8].ctype = t; - if (t == PT_LIFE && v < NGOLALT && drawOn != PT_STOR) parts[pmap[y][x]>>8].tmp = v; + if (t == PT_LIFE && v < NGOL && drawOn != PT_STOR) parts[pmap[y][x]>>8].tmp = v; } else if ((drawOn == PT_DTEC || (drawOn == PT_PSTN && t != PT_FRME)) && drawOn != t) { parts[pmap[y][x]>>8].ctype = t; - if (drawOn == PT_DTEC && t==PT_LIFE && v<NGOLALT) + if (drawOn == PT_DTEC && t==PT_LIFE && v<NGOL) parts[pmap[y][x]>>8].tmp = v; } else if (drawOn == PT_CRAY && drawOn != t && drawOn != PT_PSCN && drawOn != PT_INST && drawOn != PT_METL) { parts[pmap[y][x]>>8].ctype = t; - if (t==PT_LIFE && v<NGOLALT) + if (t==PT_LIFE && v<NGOL) parts[pmap[y][x]>>8].tmp2 = v; parts[pmap[y][x]>>8].temp = elements[t].Temperature; } @@ -2959,7 +2959,7 @@ int Simulation::create_part(int p, int x, int y, int tv) parts[i].tmp = 50; break; case PT_LIFE: - if (v<NGOLALT) + if (v<NGOL) { parts[i].tmp = grule[v+1][9] - 1; parts[i].ctype = v; @@ -3553,7 +3553,7 @@ void Simulation::update_particles_i(int start, int inc) if (parts[r>>8].type==PT_LIFE) { golnum = parts[r>>8].ctype+1; - if (golnum<=0 || golnum>NGOLALT) { + if (golnum<=0 || golnum>NGOL) { kill_part(r>>8); continue; } |