summaryrefslogtreecommitdiff
path: root/src/elements/stkm2.c
diff options
context:
space:
mode:
authorSimon Robertshaw <simon@hardwired.org.uk>2011-10-26 16:10:21 (GMT)
committer Simon Robertshaw <simon@hardwired.org.uk>2011-10-26 16:10:21 (GMT)
commite2c9882692fabcd22a7d022ebd21fd3b36ad84b0 (patch)
tree0afb6c4c35985625484d87adcdda40004910a3ff /src/elements/stkm2.c
parent4742c1bcd9103e93751b67a831403a66dc411804 (diff)
parent60de1cf5754d8132a7bf5b6868df34babe66397b (diff)
downloadpowder-e2c9882692fabcd22a7d022ebd21fd3b36ad84b0.zip
powder-e2c9882692fabcd22a7d022ebd21fd3b36ad84b0.tar.gz
Merge latest FIGH additions
Diffstat (limited to 'src/elements/stkm2.c')
-rw-r--r--src/elements/stkm2.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/elements/stkm2.c b/src/elements/stkm2.c
index 7ada3cb..f43262c 100644
--- a/src/elements/stkm2.c
+++ b/src/elements/stkm2.c
@@ -1,25 +1,25 @@
#include <element.h>
int update_SPAWN2(UPDATE_FUNC_ARGS) {
- if (!player2[27])
+ if (!player2.spwn)
create_part(-1, x, y, PT_STKM2);
return 0;
}
int update_STKM2(UPDATE_FUNC_ARGS) {
- run_stickman(player2, UPDATE_FUNC_SUBCALL_ARGS);
+ run_stickman(&player2, UPDATE_FUNC_SUBCALL_ARGS);
return 0;
}
int graphics_STKM2(GRAPHICS_FUNC_ARGS)
{
*pixel_mode = PSPEC_STICKMAN;
- if ((int)player2[2]<PT_NUM)
+ if ((int)player2.elem<PT_NUM)
{
- *colr = PIXR(ptypes[(int)player2[2]].pcolors);
- *colg = PIXG(ptypes[(int)player2[2]].pcolors);
- *colb = PIXB(ptypes[(int)player2[2]].pcolors);
+ *colr = PIXR(ptypes[player2.elem].pcolors);
+ *colg = PIXG(ptypes[player2.elem].pcolors);
+ *colb = PIXB(ptypes[player2.elem].pcolors);
}
else
{