summaryrefslogtreecommitdiff
path: root/src/elements
diff options
context:
space:
mode:
authorsavask <savask@yandex.ru>2011-10-15 16:20:54 (GMT)
committer Simon Robertshaw <simon@hardwired.org.uk>2011-10-26 14:35:00 (GMT)
commit5652ecc5c20a6cce0745b20587ff4dfec8103ff3 (patch)
tree5e36837f002d518e669de5f0f3e61bbbae20c42d /src/elements
parenta075fd5a9a8e0fd78c7a80b51d95e2190bddda91 (diff)
downloadpowder-5652ecc5c20a6cce0745b20587ff4dfec8103ff3.zip
powder-5652ecc5c20a6cce0745b20587ff4dfec8103ff3.tar.gz
Some work on lightning for stick mans and fighters.
Diffstat (limited to 'src/elements')
-rw-r--r--src/elements/figh.c12
1 files changed, 3 insertions, 9 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;
}