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/pipe.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/pipe.c')
| -rw-r--r-- | src/elements/pipe.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/elements/pipe.c b/src/elements/pipe.c index 9d7a4b1..aa6e16b 100644 --- a/src/elements/pipe.c +++ b/src/elements/pipe.c @@ -292,11 +292,11 @@ int graphics_PIPE(GRAPHICS_FUNC_ARGS) *colb = PIXR(ptypes[t].pcolors); if (ptypes[t].graphics_func) { - (*(ptypes[t].graphics_func))(&tpart, nx, ny, pixel_mode, cola, colr, colg, colb, firea, firer, fireg, fireb, vid); + (*(ptypes[t].graphics_func))(&tpart, nx, ny, pixel_mode, cola, colr, colg, colb, firea, firer, fireg, fireb); } else { - graphics_DEFAULT(&tpart, nx, ny, pixel_mode, cola, colr, colg, colb, firea, firer, fireg, fireb, vid); + graphics_DEFAULT(&tpart, nx, ny, pixel_mode, cola, colr, colg, colb, firea, firer, fireg, fireb); } } //*colr = PIXR(ptypes[cpart->tmp&0xFF].pcolors); |