diff options
| author | Simon Robertshaw <simon@hardwired.org.uk> | 2012-07-25 16:12:15 (GMT) |
|---|---|---|
| committer | Simon Robertshaw <simon@hardwired.org.uk> | 2012-07-25 16:12:15 (GMT) |
| commit | 6585a4640b9d1d24d821fb2147fe6182a709f088 (patch) | |
| tree | 4ccbd35c1776955c2933991af5181babe2332f9a /src/simulation/Simulation.cpp | |
| parent | 0afecb5b77442d770f5ebb149f574d87859ebde7 (diff) | |
| download | powder-6585a4640b9d1d24d821fb2147fe6182a709f088.zip powder-6585a4640b9d1d24d821fb2147fe6182a709f088.tar.gz | |
TPT: Replace all explosion sparks with new element (EMBR) 1d5b081942
Diffstat (limited to 'src/simulation/Simulation.cpp')
| -rw-r--r-- | src/simulation/Simulation.cpp | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/src/simulation/Simulation.cpp b/src/simulation/Simulation.cpp index ab81912..8581347 100644 --- a/src/simulation/Simulation.cpp +++ b/src/simulation/Simulation.cpp @@ -1899,6 +1899,7 @@ void Simulation::init_can_move() can_move[PT_ANAR][PT_WHOL] = 1; can_move[PT_ANAR][PT_NWHL] = 1; can_move[PT_THDR][PT_THDR] = 2; + can_move[PT_EMBR][PT_EMBR] = 2; } /* @@ -1969,9 +1970,6 @@ int Simulation::try_move(int i, int x, int y, int nx, int ny) e = eval_move(parts[i].type, nx, ny, &r); - if ((r&0xFF)==PT_BOMB && parts[i].type==PT_BOMB && parts[i].tmp == 1) - e = 2; - /* half-silvered mirror */ if (!e && parts[i].type==PT_PHOT && (((r&0xFF)==PT_BMTL && rand()<RAND_MAX/2) || @@ -2748,6 +2746,9 @@ int Simulation::create_part(int p, int x, int y, int tv)//the function for creat parts[i].life = 1000; parts[i].tmp = 244; break; + case PT_EMBR: + parts[i].life = 50; + break; case PT_STKM: if (player.spwn==0) { @@ -4242,7 +4243,7 @@ void Simulation::update_particles()//doesn't update the particles themselves, bu // To make particles collide correctly when inside these elements, these elements must not overwrite an existing pmap entry from particles inside them if (!pmap[y][x] || (t!=PT_INVIS && t!= PT_FILT)) pmap[y][x] = t|(i<<8); - if (t!=PT_THDR) + if (t!=PT_THDR && t!=PT_EMBR) pmap_count[y][x]++; } } |