diff --git a/src/elements/stkm.c b/src/elements/stkm.c index 55fc225ec..47e24a221 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].ctype0) || 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 02ed09fdb..14f8c2c53 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].ctype0) || 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; } diff --git a/src/main.c b/src/main.c index 7c1d372ca..bb3e56f3c 100644 --- a/src/main.c +++ b/src/main.c @@ -3470,14 +3470,14 @@ int main(int argc, char *argv[]) //Setting an element for the stick man if (isplayer==0) { - if (ptypes[sr].falldown>0 || sr == PT_NEUT || sr == PT_PHOT) + if ((sr0) || sr==SPC_AIR || sr == PT_NEUT || sr == PT_PHOT) player[2] = sr; else player[2] = PT_DUST; } if (isplayer2==0) { - if (ptypes[sr].falldown>0 || sr == PT_NEUT || sr == PT_PHOT) + if ((sr0) || sr==SPC_AIR || sr == PT_NEUT || sr == PT_PHOT) player2[2] = sr; else player2[2] = PT_DUST;