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

Some work on lightning for stick mans and fighters.

Browse Source
This commit is contained in:
savask 2011-10-15 23:20:54 +07:00 committed by Simon Robertshaw
parent a075fd5a9a
commit 5652ecc5c2
3 changed files with 6 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/elements/figh.c
View File

@ -45,17 +45,9 @@ int update_FIGH(UPDATE_FUNC_ARGS)
case 1: case 1:
if ((pow(tarx-x, 2) + pow(tary-y, 2))<600) if ((pow(tarx-x, 2) + pow(tary-y, 2))<600)
{ {
if (figh[2] == PT_FIRE) if (figh[2] == PT_FIRE || figh[2] == PT_LIGH)
figh[0] = (int)figh[0] | 0x08; figh[0] = (int)figh[0] | 0x08;
} }
if ((pow(tarx-x, 2) + pow(tary-y, 2))<300)
{
if (figh[2] == PT_FIRE)
figh[0] = 0x08;
else
figh[0] = 0;
}
else else
if (tarx<x) if (tarx<x)
{ {
@ -75,6 +67,8 @@ int update_FIGH(UPDATE_FUNC_ARGS)
break; break;
} }
figh[1] = figh[0];
run_stickman(figh, UPDATE_FUNC_SUBCALL_ARGS); run_stickman(figh, UPDATE_FUNC_SUBCALL_ARGS);
return 0; return 0;
} }

4
src/main.c
View File

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

2
src/powder.c
View File

@ -16,7 +16,7 @@ int lighting_recreate = 0;
float player[29]; float player[29];
float player2[29]; float player2[29];
float fighters[256][28]; //255 is the maximum number of fighters float fighters[256][29]; //255 is the maximum number of fighters
unsigned char fighcount = 0; //Contains the number of fighters unsigned char fighcount = 0; //Contains the number of fighters
particle *parts; particle *parts;