diff options
| author | Simon Robertshaw <simon@hardwired.org.uk> | 2012-06-17 21:34:17 (GMT) |
|---|---|---|
| committer | Simon Robertshaw <simon@hardwired.org.uk> | 2012-06-17 21:34:17 (GMT) |
| commit | 4b073de82a77db344b728434ee9ed18f69a06b4e (patch) | |
| tree | 17a4f27f3c8f12a10f12d79442bb76e18e7f40ed /src/elements/stkm.c | |
| parent | 36de2f19f57ff056166ae268404f1f3851ea3077 (diff) | |
| download | powder-4b073de82a77db344b728434ee9ed18f69a06b4e.zip powder-4b073de82a77db344b728434ee9ed18f69a06b4e.tar.gz | |
Revert "Moved soap and stick men graphics things to special functions."
This reverts commit 7f5408f196002476c4765f1cae833e1441e4b276.
Conflicts:
includes/powder.h
Diffstat (limited to 'src/elements/stkm.c')
| -rw-r--r-- | src/elements/stkm.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/elements/stkm.c b/src/elements/stkm.c index 43182dc..d0bd14a 100644 --- a/src/elements/stkm.c +++ b/src/elements/stkm.c @@ -32,6 +32,7 @@ int update_STKM(UPDATE_FUNC_ARGS) int graphics_STKM(GRAPHICS_FUNC_ARGS) { + *pixel_mode = PSPEC_STICKMAN; if ((int)player.elem<PT_NUM) { *colr = PIXR(ptypes[player.elem].pcolors); @@ -42,8 +43,7 @@ int graphics_STKM(GRAPHICS_FUNC_ARGS) { *colr = *colg = *colb = 255; } - graphics_stickmen(GRAPHICS_FUNC_SUBCALL_ARGS); - return 0; + return 1; } int run_stickman(playerst* playerp, UPDATE_FUNC_ARGS) { @@ -57,7 +57,7 @@ int run_stickman(playerst* playerp, UPDATE_FUNC_ARGS) { playerp->elem = parts[i].ctype; playerp->frames++; - //Temperature handling + //Tempirature handling if (parts[i].temp<243) parts[i].life -= 1; if ((parts[i].temp<309.6f) && (parts[i].temp>=243)) |