matthew/The-Powder-Toy
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Allow changing of stkm spawn element by setting ctype

Browse Source
This commit is contained in:
jacksonmj 2011-06-24 23:20:01 +01:00 committed by Simon Robertshaw
parent 1a17e35c6f
commit d515575612
3 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/elements/stkm.c
View File

@ -15,6 +15,10 @@ int update_STKM(UPDATE_FUNC_ARGS) {
int r, rx, ry; int r, rx, ry;
float pp, d; float pp, d;
float dt = 0.9;///(FPSB*FPSB); //Delta time in square 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 //Tempirature handling
if (parts[i].temp<243) if (parts[i].temp<243)
parts[i].life -= 1; parts[i].life -= 1;
@ -420,5 +424,6 @@ int update_STKM(UPDATE_FUNC_ARGS) {
parts[i].life -= 1; parts[i].life -= 1;
isplayer = 1; isplayer = 1;
parts[i].ctype = player[2];
return 0; return 0;
} }

5
src/elements/stkm2.c
View File

@ -15,6 +15,10 @@ int update_STKM2(UPDATE_FUNC_ARGS) {
int r, rx, ry; int r, rx, ry;
float pp, d; float pp, d;
float dt = 0.9;///(FPSB*FPSB); //Delta time in square 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 //Tempirature handling
if (parts[i].temp<243) if (parts[i].temp<243)
parts[i].life -= 1; parts[i].life -= 1;
@ -420,6 +424,7 @@ int update_STKM2(UPDATE_FUNC_ARGS) {
parts[i].life -= 1; parts[i].life -= 1;
isplayer2 = 1; isplayer2 = 1;
parts[i].ctype = player2[2];
return 0; return 0;
} }

4
src/main.c
View File

@ -3470,14 +3470,14 @@ int main(int argc, char *argv[])
//Setting an element for the stick man //Setting an element for the stick man
if (isplayer==0) if (isplayer==0)
{ {
if (ptypes[sr].falldown>0 || sr == PT_NEUT || sr == PT_PHOT) if ((sr<PT_NUM && ptypes[sr].falldown>0) || sr==SPC_AIR || sr == PT_NEUT || sr == PT_PHOT)
player[2] = sr; player[2] = sr;
else else
player[2] = PT_DUST; player[2] = PT_DUST;
} }
if (isplayer2==0) if (isplayer2==0)
{ {
if (ptypes[sr].falldown>0 || sr == PT_NEUT || sr == PT_PHOT) if ((sr<PT_NUM && ptypes[sr].falldown>0) || sr==SPC_AIR || sr == PT_NEUT || sr == PT_PHOT)
player2[2] = sr; player2[2] = sr;
else else
player2[2] = PT_DUST; player2[2] = PT_DUST;