diff options
| author | savask <savask@yandex.ru> | 2011-10-15 16:20:54 (GMT) |
|---|---|---|
| committer | Simon Robertshaw <simon@hardwired.org.uk> | 2011-10-26 14:35:00 (GMT) |
| commit | 5652ecc5c20a6cce0745b20587ff4dfec8103ff3 (patch) | |
| tree | 5e36837f002d518e669de5f0f3e61bbbae20c42d /src | |
| parent | a075fd5a9a8e0fd78c7a80b51d95e2190bddda91 (diff) | |
| download | powder-5652ecc5c20a6cce0745b20587ff4dfec8103ff3.zip powder-5652ecc5c20a6cce0745b20587ff4dfec8103ff3.tar.gz | |
Some work on lightning for stick mans and fighters.
Diffstat (limited to 'src')
| -rw-r--r-- | src/elements/figh.c | 12 | ||||
| -rw-r--r-- | src/main.c | 4 | ||||
| -rw-r--r-- | src/powder.c | 2 |
3 files changed, 6 insertions, 12 deletions
diff --git a/src/elements/figh.c b/src/elements/figh.c index abed674..74dcf14 100644 --- a/src/elements/figh.c +++ b/src/elements/figh.c @@ -45,17 +45,9 @@ int update_FIGH(UPDATE_FUNC_ARGS) case 1: 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; } - - if ((pow(tarx-x, 2) + pow(tary-y, 2))<300) - { - if (figh[2] == PT_FIRE) - figh[0] = 0x08; - else - figh[0] = 0; - } else if (tarx<x) { @@ -75,6 +67,8 @@ int update_FIGH(UPDATE_FUNC_ARGS) break; } + figh[1] = figh[0]; + run_stickman(figh, UPDATE_FUNC_SUBCALL_ARGS); return 0; } @@ -3625,14 +3625,14 @@ int main(int argc, char *argv[]) //Setting an element for the stick man 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; else player[2] = PT_DUST; } 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; else player2[2] = PT_DUST; diff --git a/src/powder.c b/src/powder.c index 41f9196..5e828ec 100644 --- a/src/powder.c +++ b/src/powder.c @@ -16,7 +16,7 @@ int lighting_recreate = 0; float player[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 particle *parts; |