From 7fc8d5f388039da885b3432cdfe7d5b7f4ace07c Mon Sep 17 00:00:00 2001 From: Simon Robertshaw Date: Mon, 20 Aug 2012 13:41:03 +0100 Subject: [PATCH] Add missing legacy update function --- src/simulation/Simulation.cpp | 4 +- src/simulation/elements/Element.cpp | 117 ++++++++++++++++++++++++++++ src/simulation/elements/Element.h | 1 + 3 files changed, 120 insertions(+), 2 deletions(-) diff --git a/src/simulation/Simulation.cpp b/src/simulation/Simulation.cpp index ba248939a..d9da20630 100644 --- a/src/simulation/Simulation.cpp +++ b/src/simulation/Simulation.cpp @@ -3851,8 +3851,8 @@ void Simulation::update_particles_i(int start, int inc) y = (int)(parts[i].y+0.5f); } #endif - //if (legacy_enable)//if heat sim is off - //update_legacy_all(this, i,x,y,surround_space,nt, parts, pmap); //TODO:pop + if(legacy_enable)//if heat sim is off + Element::legacyUpdate(this, i,x,y,surround_space,nt, parts, pmap); killed: if (parts[i].type == PT_NONE)//if its dead, skip to next particle diff --git a/src/simulation/elements/Element.cpp b/src/simulation/elements/Element.cpp index ff2918abf..4ec33a6d1 100644 --- a/src/simulation/elements/Element.cpp +++ b/src/simulation/elements/Element.cpp @@ -48,6 +48,123 @@ Element::Element(): { } +int Element::legacyUpdate(UPDATE_FUNC_ARGS) { + int r, rx, ry, rt; + int t = parts[i].type; + if (t==PT_WTRV) { + for (rx=-2; rx<3; rx++) + for (ry=-2; ry<3; ry++) + if (x+rx>=0 && y+ry>0 && + x+rx(rand()%1000)) + { + sim->part_change_type(i,x,y,PT_WATR); + sim->part_change_type(r>>8,x+rx,y+ry,PT_WATR); + } + if (((r&0xFF)==PT_ICEI || (r&0xFF)==PT_SNOW) && 1>(rand()%1000)) + { + sim->part_change_type(i,x,y,PT_WATR); + if (1>(rand()%1000)) + sim->part_change_type(r>>8,x+rx,y+ry,PT_WATR); + } + } + } + else if (t==PT_WATR) { + for (rx=-2; rx<3; rx++) + for (ry=-2; ry<3; ry++) + if (x+rx>=0 && y+ry>0 && + x+rx(rand()%10)) + { + sim->part_change_type(i,x,y,PT_WTRV); + } + } + } + else if (t==PT_SLTW) { + for (rx=-2; rx<3; rx++) + for (ry=-2; ry<3; ry++) + if (x+rx>=0 && y+ry>0 && + x+rx(rand()%10)) + { + if (rand()%4==0) sim->part_change_type(i,x,y,PT_SALT); + else sim->part_change_type(i,x,y,PT_WTRV); + } + } + } + else if (t==PT_DSTW) { + for (rx=-2; rx<3; rx++) + for (ry=-2; ry<3; ry++) + if (x+rx>=0 && y+ry>0 && + x+rx(rand()%10)) + { + sim->part_change_type(i,x,y,PT_WTRV); + } + } + } + else if (t==PT_ICEI) { + for (rx=-2; rx<3; rx++) + for (ry=-2; ry<3; ry++) + if (x+rx>=0 && y+ry>0 && x+rx(rand()%1000)) + { + sim->part_change_type(i,x,y,PT_ICEI); + sim->part_change_type(r>>8,x+rx,y+ry,PT_ICEI); + } + } + } + else if (t==PT_SNOW) { + for (rx=-2; rx<3; rx++) + for (ry=-2; ry<3; ry++) + if (x+rx>=0 && y+ry>0 && x+rx(rand()%1000)) + { + sim->part_change_type(i,x,y,PT_ICEI); + sim->part_change_type(r>>8,x+rx,y+ry,PT_ICEI); + } + if (((r&0xFF)==PT_WATR || (r&0xFF)==PT_DSTW) && 15>(rand()%1000)) + sim->part_change_type(i,x,y,PT_WATR); + } + } + if (t==PT_WTRV && sim->pv[y/CELL][x/CELL]>4.0f) + sim->part_change_type(i,x,y,PT_DSTW); + if (t==PT_OIL && sim->pv[y/CELL][x/CELL]<-6.0f) + sim->part_change_type(i,x,y,PT_GAS); + if (t==PT_GAS && sim->pv[y/CELL][x/CELL]>6.0f) + sim->part_change_type(i,x,y,PT_OIL); + if (t==PT_DESL && sim->pv[y/CELL][x/CELL]>12.0f) + { + sim->part_change_type(i,x,y,PT_FIRE); + parts[i].life = rand()%50+120; + } + return 0; +} + int Element::defaultGraphics(GRAPHICS_FUNC_ARGS) { int t = cpart->type; diff --git a/src/simulation/elements/Element.h b/src/simulation/elements/Element.h index 65e389890..72b6c2b01 100644 --- a/src/simulation/elements/Element.h +++ b/src/simulation/elements/Element.h @@ -53,6 +53,7 @@ public: Element(); virtual ~Element() {} static int defaultGraphics(GRAPHICS_FUNC_ARGS); + static int legacyUpdate(UPDATE_FUNC_ARGS); }; #endif