diff options
| author | jacksonmj <mj-pt@jacksonmj.co.uk> | 2011-08-20 13:56:04 (GMT) |
|---|---|---|
| committer | Simon Robertshaw <simon@hardwired.org.uk> | 2011-08-20 18:37:25 (GMT) |
| commit | 20aba663cdb52070e2c07f94d687885e45cf6fc0 (patch) | |
| tree | 55b8aa013305b2eb398479157196afc3abae9a4d /src | |
| parent | 27a95c7684de3cb568e27193eec7fdffd2a7f23b (diff) | |
| download | powder-20aba663cdb52070e2c07f94d687885e45cf6fc0.zip powder-20aba663cdb52070e2c07f94d687885e45cf6fc0.tar.gz | |
Fix STKM_init_legs and leg/head colours in prerender_save
Diffstat (limited to 'src')
| -rw-r--r-- | src/elements/stkm.c | 38 | ||||
| -rw-r--r-- | src/graphics.c | 16 |
2 files changed, 27 insertions, 27 deletions
diff --git a/src/elements/stkm.c b/src/elements/stkm.c index 4b43f57..b45e137 100644 --- a/src/elements/stkm.c +++ b/src/elements/stkm.c @@ -415,23 +415,23 @@ void STKM_init_legs(float* playerp, int i) x = (int)(parts[i].x+0.5f); y = (int)(parts[i].y+0.5f); - player[3] = x-1; - player[4] = y+6; - player[5] = x-1; - player[6] = y+6; - - player[7] = x-3; - player[8] = y+12; - player[9] = x-3; - player[10] = y+12; - - player[11] = x+1; - player[12] = y+6; - player[13] = x+1; - player[14] = y+6; - - player[15] = x+3; - player[16] = y+12; - player[17] = x+3; - player[18] = y+12; + playerp[3] = x-1; + playerp[4] = y+6; + playerp[5] = x-1; + playerp[6] = y+6; + + playerp[7] = x-3; + playerp[8] = y+12; + playerp[9] = x-3; + playerp[10] = y+12; + + playerp[11] = x+1; + playerp[12] = y+6; + playerp[13] = x+1; + playerp[14] = y+6; + + playerp[15] = x+3; + playerp[16] = y+12; + playerp[17] = x+3; + playerp[18] = y+12; } diff --git a/src/graphics.c b/src/graphics.c index fb354d7..3ea811f 100644 --- a/src/graphics.c +++ b/src/graphics.c @@ -4453,22 +4453,22 @@ pixel *prerender_save(void *save, int size, int *width, int *height) if (j==PT_STKM) lc = PIXRGB(255, 255, 255); else lc = PIXRGB(100, 100, 255); //only need to check upper bound of y coord - lower bounds and x<w are checked in draw_line - draw_line(fb , x-2, y-2, x+2, y-2, PIXR(lc), PIXG(lc), PIXB(lc), w); + draw_line(fb , x-2, y-2, x+2, y-2, PIXR(hc), PIXG(hc), PIXB(hc), w); if (y+2<h) { - draw_line(fb , x-2, y+2, x+2, y+2, PIXR(lc), PIXG(lc), PIXB(lc), w); - draw_line(fb , x-2, y-2, x-2, y+2, PIXR(lc), PIXG(lc), PIXB(lc), w); - draw_line(fb , x+2, y-2, x+2, y+2, PIXR(lc), PIXG(lc), PIXB(lc), w); + draw_line(fb , x-2, y+2, x+2, y+2, PIXR(hc), PIXG(hc), PIXB(hc), w); + draw_line(fb , x-2, y-2, x-2, y+2, PIXR(hc), PIXG(hc), PIXB(hc), w); + draw_line(fb , x+2, y-2, x+2, y+2, PIXR(hc), PIXG(hc), PIXB(hc), w); } if (y+6<h) { - draw_line(fb , x, y+3, x-1, y+6, PIXR(hc), PIXG(hc), PIXB(hc), w); - draw_line(fb , x, y+3, x+1, y+6, PIXR(hc), PIXG(hc), PIXB(hc), w); + draw_line(fb , x, y+3, x-1, y+6, PIXR(lc), PIXG(lc), PIXB(lc), w); + draw_line(fb , x, y+3, x+1, y+6, PIXR(lc), PIXG(lc), PIXB(lc), w); } if (y+12<h) { - draw_line(fb , x-1, y+6, x-3, y+12, PIXR(hc), PIXG(hc), PIXB(hc), w); - draw_line(fb , x+1, y+6, x+3, y+12, PIXR(hc), PIXG(hc), PIXB(hc), w); + draw_line(fb , x-1, y+6, x-3, y+12, PIXR(lc), PIXG(lc), PIXB(lc), w); + draw_line(fb , x+1, y+6, x+3, y+12, PIXR(lc), PIXG(lc), PIXB(lc), w); } } else |