diff options
| author | jacksonmj <mj-pt@jacksonmj.co.uk> | 2012-01-19 23:19:39 (GMT) |
|---|---|---|
| committer | Simon Robertshaw <simon@hardwired.org.uk> | 2012-01-25 13:33:21 (GMT) |
| commit | 44545d4c96309092d5980b5fcb8ed4187219cf8a (patch) | |
| tree | 22a8f2f9f0a48a5f7bdbfa94a4314140f631ed0c | |
| parent | 509f1d2139358b0d7c81851fc5fd3e3da7566393 (diff) | |
| download | powder-44545d4c96309092d5980b5fcb8ed4187219cf8a.zip powder-44545d4c96309092d5980b5fcb8ed4187219cf8a.tar.gz | |
Solids wall description, and check build_save was successful when saving a stamp
| -rw-r--r-- | includes/powder.h | 2 | ||||
| -rw-r--r-- | src/main.c | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/includes/powder.h b/includes/powder.h index a1bb71d..f198ad7 100644 --- a/includes/powder.h +++ b/includes/powder.h @@ -689,7 +689,7 @@ static wall_type wtypes[] = {PIXPACK(0x808080), PIXPACK(0x000000), 0, "Erases walls."}, {PIXPACK(0x808080), PIXPACK(0x000000), 3, "Wall. Indestructible. Blocks everything."}, {PIXPACK(0x3C3C3C), PIXPACK(0x000000), 1, "Wall. Indestructible. Blocks particles, allows air"}, - {PIXPACK(0x575757), PIXPACK(0x000000), 1, "Wall. Indestructible. Blocks liquids and gasses, allows solids"}, + {PIXPACK(0x575757), PIXPACK(0x000000), 1, "Wall. Indestructible. Blocks liquids and gasses, allows powders"}, {PIXPACK(0xFFFF22), PIXPACK(0x101010), 2, "Conductor, allows particles, conducts electricity"}, {PIXPACK(0x242424), PIXPACK(0x101010), 0, "E-Hole, absorbs particles, release them when powered"}, {PIXPACK(0xFFFFFF), PIXPACK(0x000000), -1, "Air, creates airflow and pressure"}, @@ -402,6 +402,8 @@ void stamp_save(int x, int y, int w, int h) int n; char fn[64], sn[16]; void *s=build_save(&n, x, y, w, h, bmap, vx, vy, pv, fvx, fvy, signs, parts); + if (!s) + return; #ifdef WIN32 _mkdir("stamps"); |