diff options
| author | Simon Robertshaw <simon@hardwired.org.uk> | 2012-05-12 12:21:04 (GMT) |
|---|---|---|
| committer | Simon Robertshaw <simon@hardwired.org.uk> | 2012-05-12 12:21:04 (GMT) |
| commit | 16d3895e9c054e908ca8b230719f4294e824a4a2 (patch) | |
| tree | 8246b0ebc3b94ed05427b8ffa5ea1e1764c7a37a /src/simulation/elements | |
| parent | 1c993435efc7fe6702d21c892e1d4dd8347d2e7f (diff) | |
| download | powder-16d3895e9c054e908ca8b230719f4294e824a4a2.zip powder-16d3895e9c054e908ca8b230719f4294e824a4a2.tar.gz | |
Redo Wall IDs
Diffstat (limited to 'src/simulation/elements')
| -rw-r--r-- | src/simulation/elements/BOMB.cpp | 4 | ||||
| -rw-r--r-- | src/simulation/elements/SPRK.cpp | 4 | ||||
| -rw-r--r-- | src/simulation/elements/STKM.cpp | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/src/simulation/elements/BOMB.cpp b/src/simulation/elements/BOMB.cpp index ca3be8d..b21be19 100644 --- a/src/simulation/elements/BOMB.cpp +++ b/src/simulation/elements/BOMB.cpp @@ -102,8 +102,8 @@ int Element_BOMB::update(UPDATE_FUNC_ARGS) parts[nb].temp = MAX_TEMP; } } - //create_parts(x, y, 9, 9, PT_BOMB); - //create_parts(x, y, 8, 8, PT_NONE); + //CreateParts(x, y, 9, 9, PT_BOMB); + //CreateParts(x, y, 8, 8, PT_NONE); sim->kill_part(i); return 1; } diff --git a/src/simulation/elements/SPRK.cpp b/src/simulation/elements/SPRK.cpp index 95f928b..feb825b 100644 --- a/src/simulation/elements/SPRK.cpp +++ b/src/simulation/elements/SPRK.cpp @@ -83,7 +83,7 @@ int Element_SPRK::update(UPDATE_FUNC_ARGS) nearp = sim->nearest_part(i, PT_ETRD, -1); if (nearp!=-1 && sim->parts_avg(i, nearp, PT_INSL)!=PT_INSL) { - sim->create_line(x, y, (int)(parts[nearp].x+0.5f), (int)(parts[nearp].y+0.5f), 0, 0, PT_PLSM, 0); + sim->CreateLine(x, y, (int)(parts[nearp].x+0.5f), (int)(parts[nearp].y+0.5f), 0, 0, PT_PLSM, 0); sim->part_change_type(i,x,y,ct); ct = parts[i].ctype = PT_NONE; parts[i].life = 20; @@ -243,7 +243,7 @@ int Element_SPRK::update(UPDATE_FUNC_ARGS) else if (rt==PT_INST) { if (parts[r>>8].life==0 && parts[i].life<4) { - sim->flood_parts(x+rx,y+ry,PT_SPRK,PT_INST,-1, 0);//spark the wire + sim->FloodParts(x+rx,y+ry,PT_SPRK,PT_INST,-1, 0);//spark the wire } } else if (parts[r>>8].life==0 && parts[i].life<4) { diff --git a/src/simulation/elements/STKM.cpp b/src/simulation/elements/STKM.cpp index e554892..772a3e5 100644 --- a/src/simulation/elements/STKM.cpp +++ b/src/simulation/elements/STKM.cpp @@ -304,7 +304,7 @@ int Element_STKM::run_stickman(playerst* playerp, UPDATE_FUNC_ARGS) { { int np = -1; if (playerp->elem == SPC_AIR) - sim->create_parts(rx + 3*((((int)playerp->pcomm)&0x02) == 0x02) - 3*((((int)playerp->pcomm)&0x01) == 0x01), ry, 4, 4, SPC_AIR, 0); + sim->CreateParts(rx + 3*((((int)playerp->pcomm)&0x02) == 0x02) - 3*((((int)playerp->pcomm)&0x01) == 0x01), ry, 4, 4, SPC_AIR, 0); else if (playerp->elem==PT_LIGH && playerp->frames<30)//limit lightning creation rate np = -1; else |