diff options
| author | jacksonmj <mj-pt@jacksonmj.co.uk> | 2011-07-06 00:15:11 (GMT) |
|---|---|---|
| committer | Simon Robertshaw <simon@hardwired.org.uk> | 2011-07-06 09:44:56 (GMT) |
| commit | 8754bb0bf6effef6ff11d23e5087f4b6ef618496 (patch) | |
| tree | 903f9ec39d9e51df8f6830ee7e9caa9f108e7d4e /src/graphics.c | |
| parent | 5dbb0dc475fc8af3f799c9020d2efaaafe088caa (diff) | |
| download | powder-8754bb0bf6effef6ff11d23e5087f4b6ef618496.zip powder-8754bb0bf6effef6ff11d23e5087f4b6ef618496.tar.gz | |
Crashes when drawing stickman at the edge of the screen
Diffstat (limited to 'src/graphics.c')
| -rw-r--r-- | src/graphics.c | 37 |
1 files changed, 18 insertions, 19 deletions
diff --git a/src/graphics.c b/src/graphics.c index 00616a5..8bdd6fa 100644 --- a/src/graphics.c +++ b/src/graphics.c @@ -1496,7 +1496,8 @@ void draw_line(pixel *vid, int x1, int y1, int x2, int y2, int r, int g, int b, e = (dy<<2)-dx; for (i=0; i<=dx; i++) { - vid[x+y*a] =PIXRGB(r, g, b); + if (x>=0 && y>=0 && x<a && y<YRES+MENUSIZE) + vid[x+y*a] =PIXRGB(r, g, b); if (e>=0) { if (check==1) @@ -1701,7 +1702,7 @@ void draw_parts(pixel *vid) if (cmode!=CM_HEAT) { - if (t==PT_STKM) //Just draw head here + if (t==PT_STKM) { char buff[20]; //Buffer for HP pixel pc; @@ -1714,14 +1715,13 @@ void draw_parts(pixel *vid) if ((int)player[2]<PT_NUM) pc = ptypes[(int)player[2]].pcolors; else pc = PIXPACK(0xFFFFFF); - for (r=-2; r<=1; r++) //Here I use r variable not as I should, but I think you will excuse me :-p - { - s = XRES+BARSIZE; - vid[(ny-2)*s+nx+r] = pc; - vid[(ny+2)*s+nx+r+1] = pc; - vid[(ny+r+1)*s+nx-2] = pc; - vid[(ny+r)*s+nx+2] = pc; - } + s = XRES+BARSIZE; + //head + draw_line(vid , nx-2, ny+2, nx+2, ny+2, PIXR(pc), PIXG(pc), PIXB(pc), s); + draw_line(vid , nx-2, ny-2, nx+2, ny-2, PIXR(pc), PIXG(pc), PIXB(pc), s); + draw_line(vid , nx-2, ny-2, nx-2, ny+2, PIXR(pc), PIXG(pc), PIXB(pc), s); + draw_line(vid , nx+2, ny-2, nx+2, ny+2, PIXR(pc), PIXG(pc), PIXB(pc), s); + //legs draw_line(vid , nx, ny+3, player[3], player[4], 255, 255, 255, s); draw_line(vid , player[3], player[4], player[7], player[8], 255, 255, 255, s); draw_line(vid , nx, ny+3, player[11], player[12], 255, 255, 255, s); @@ -1729,7 +1729,7 @@ void draw_parts(pixel *vid) isplayer = 1; //It's a secret. Tssss... } - else if (t==PT_STKM2) //Just draw head here + else if (t==PT_STKM2) { char buff[20]; //Buffer for HP pixel pc; @@ -1742,14 +1742,13 @@ void draw_parts(pixel *vid) if ((int)player2[2]<PT_NUM) pc = ptypes[(int)player2[2]].pcolors; else pc = PIXPACK(0xFFFFFF); - for (r=-2; r<=1; r++) //Here I use r variable not as I should, but I think you will excuse me :-p - { - s = XRES+BARSIZE; - vid[(ny-2)*s+nx+r] = pc; - vid[(ny+2)*s+nx+r+1] = pc; - vid[(ny+r+1)*s+nx-2] = pc; - vid[(ny+r)*s+nx+2] = pc; - } + s = XRES+BARSIZE; + //head + draw_line(vid , nx-2, ny+2, nx+2, ny+2, PIXR(pc), PIXG(pc), PIXB(pc), s); + draw_line(vid , nx-2, ny-2, nx+2, ny-2, PIXR(pc), PIXG(pc), PIXB(pc), s); + draw_line(vid , nx-2, ny-2, nx-2, ny+2, PIXR(pc), PIXG(pc), PIXB(pc), s); + draw_line(vid , nx+2, ny-2, nx+2, ny+2, PIXR(pc), PIXG(pc), PIXB(pc), s); + //legs draw_line(vid , nx, ny+3, player2[3], player2[4], 100, 100, 255, s); draw_line(vid , player2[3], player2[4], player2[7], player2[8], 100, 100, 255, s); draw_line(vid , nx, ny+3, player2[11], player2[12], 100, 100, 255, s); |