diff options
| author | jacksonmj <mj-pt@jacksonmj.co.uk> | 2011-02-22 15:18:04 (GMT) |
|---|---|---|
| committer | jacksonmj <mj-pt@jacksonmj.co.uk> | 2011-02-22 15:18:04 (GMT) |
| commit | c9725c60047869fb0d645eb9e8cc259748cc9c0e (patch) | |
| tree | 813862fe030dd2184092ab482aeb1112172d13cd /src/graphics.c | |
| parent | ac7eda80a545ba8c0cbab80236df88570e1d33ad (diff) | |
| parent | a84234dcd4e5a3dfb4a62d73ff07df1e01bed086 (diff) | |
| download | powder-c9725c60047869fb0d645eb9e8cc259748cc9c0e.zip powder-c9725c60047869fb0d645eb9e8cc259748cc9c0e.tar.gz | |
Merge branch 'upstream' into dev
Conflicts:
src/main.c
Diffstat (limited to 'src/graphics.c')
| -rw-r--r-- | src/graphics.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/graphics.c b/src/graphics.c index a3cbf87..ea8d0d5 100644 --- a/src/graphics.c +++ b/src/graphics.c @@ -448,6 +448,8 @@ void draw_tool(pixel *vid_buf, int b, int sl, int sr, unsigned pc, unsigned iswa int draw_tool_xy(pixel *vid_buf, int x, int y, int b, unsigned pc) { int i, j, c; + if (x > XRES-26 || x < 0) + return 26; if (b>=UI_WALLSTART) { b = b-100; |