diff options
| author | jacksonmj <mj-pt@jacksonmj.co.uk> | 2011-06-24 22:20:01 (GMT) |
|---|---|---|
| committer | Simon Robertshaw <simon@hardwired.org.uk> | 2011-06-25 15:06:44 (GMT) |
| commit | d515575612ef26e183d5fcf0ab4a04c38cb9a26e (patch) | |
| tree | 740e15e34efc808a22663bd5ebf47b46e0ec548e /src/elements | |
| parent | 1a17e35c6fc19ff448186a32dc219beb06749898 (diff) | |
| download | powder-d515575612ef26e183d5fcf0ab4a04c38cb9a26e.zip powder-d515575612ef26e183d5fcf0ab4a04c38cb9a26e.tar.gz | |
Allow changing of stkm spawn element by setting ctype
Diffstat (limited to 'src/elements')
| -rw-r--r-- | src/elements/stkm.c | 5 | ||||
| -rw-r--r-- | src/elements/stkm2.c | 5 |
2 files changed, 10 insertions, 0 deletions
diff --git a/src/elements/stkm.c b/src/elements/stkm.c index 55fc225..47e24a2 100644 --- a/src/elements/stkm.c +++ b/src/elements/stkm.c @@ -15,6 +15,10 @@ int update_STKM(UPDATE_FUNC_ARGS) { int r, rx, ry; float pp, d; float dt = 0.9;///(FPSB*FPSB); //Delta time in square + + if ((parts[i].ctype>0 && parts[i].ctype<PT_NUM && ptypes[parts[i].ctype].falldown>0) || parts[i].ctype==SPC_AIR || parts[i].ctype == PT_NEUT || parts[i].ctype == PT_PHOT) + player[2] = parts[i].ctype; + //Tempirature handling if (parts[i].temp<243) parts[i].life -= 1; @@ -420,5 +424,6 @@ int update_STKM(UPDATE_FUNC_ARGS) { parts[i].life -= 1; isplayer = 1; + parts[i].ctype = player[2]; return 0; } diff --git a/src/elements/stkm2.c b/src/elements/stkm2.c index 02ed09f..14f8c2c 100644 --- a/src/elements/stkm2.c +++ b/src/elements/stkm2.c @@ -15,6 +15,10 @@ int update_STKM2(UPDATE_FUNC_ARGS) { int r, rx, ry; float pp, d; float dt = 0.9;///(FPSB*FPSB); //Delta time in square + + if ((parts[i].ctype>0 && parts[i].ctype<PT_NUM && ptypes[parts[i].ctype].falldown>0) || parts[i].ctype==SPC_AIR || parts[i].ctype == PT_NEUT || parts[i].ctype == PT_PHOT) + player2[2] = parts[i].ctype; + //Tempirature handling if (parts[i].temp<243) parts[i].life -= 1; @@ -420,6 +424,7 @@ int update_STKM2(UPDATE_FUNC_ARGS) { parts[i].life -= 1; isplayer2 = 1; + parts[i].ctype = player2[2]; return 0; } |