diff options
| author | jacksonmj <jacksonmj@jacksonmj.none> | 2011-01-11 13:44:52 (GMT) |
|---|---|---|
| committer | jacksonmj <jacksonmj@jacksonmj.none> | 2011-01-11 13:44:52 (GMT) |
| commit | 4006bdf4c22564e916092d6d63ae63d1fa6bc5b5 (patch) | |
| tree | 5cbe9ad22685a055f4d7849bd52afa0f9ab87f8d /src/elements/stkm2.c | |
| parent | cf1ef725847a5dc5c9e796a10ff840f65dc1e885 (diff) | |
| parent | b3735bb84b5d53014e7e20085007ef380cc7a3c1 (diff) | |
| download | powder-4006bdf4c22564e916092d6d63ae63d1fa6bc5b5.zip powder-4006bdf4c22564e916092d6d63ae63d1fa6bc5b5.tar.gz | |
Merge branch 'upstream' into dev
Diffstat (limited to 'src/elements/stkm2.c')
| -rw-r--r-- | src/elements/stkm2.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/src/elements/stkm2.c b/src/elements/stkm2.c index b0a2be3..7c02043 100644 --- a/src/elements/stkm2.c +++ b/src/elements/stkm2.c @@ -20,6 +20,11 @@ int update_STKM2(UPDATE_FUNC_ARGS) { if ((parts[i].temp<309.6f) && (parts[i].temp>=243)) parts[i].temp += 1; + if (isplayer2) { //Already a stickman2 in the simulation + death2 = 1; + parts[i].type = PT_NONE; + } + //Death if (parts[i].life<1 || death2 || (pv[y/CELL][x/CELL]>=4.5f && player2[2] != SPC_AIR) ) //If his HP is less that 0 or there is very big wind... { |