diff options
| author | Simon Robertshaw <simon@hardwired.org.uk> | 2011-09-30 12:57:32 (GMT) |
|---|---|---|
| committer | Simon Robertshaw <simon@hardwired.org.uk> | 2011-09-30 12:57:32 (GMT) |
| commit | f5a9f43b77e8ff5f2db8c8c63b5d2a3e190041e4 (patch) | |
| tree | db2a0676fe085bb8272fa3398997c74c7bccdf7b /includes | |
| parent | 1759d0bd46f6b31e1c47bd2d8165bf5d6f292597 (diff) | |
| download | powder-f5a9f43b77e8ff5f2db8c8c63b5d2a3e190041e4.zip powder-f5a9f43b77e8ff5f2db8c8c63b5d2a3e190041e4.tar.gz | |
Added extra functions to FILT (determined by tmp, modes are convert, filter and add, convert is default). Added property edit tool, changes the properties of materials
Diffstat (limited to 'includes')
| -rw-r--r-- | includes/interface.h | 2 | ||||
| -rw-r--r-- | includes/powder.h | 7 |
2 files changed, 7 insertions, 2 deletions
diff --git a/includes/interface.h b/includes/interface.h index 18ce8b7..5d59dcf 100644 --- a/includes/interface.h +++ b/includes/interface.h @@ -205,6 +205,8 @@ extern int drawgrav_enable; void menu_count(void); +void prop_edit_ui(pixel *vid_buf, int x, int y); + void get_sign_pos(int i, int *x0, int *y0, int *w, int *h); void add_sign_ui(pixel *vid_buf, int mx, int my); diff --git a/includes/powder.h b/includes/powder.h index fb6499f..a7cf5fd 100644 --- a/includes/powder.h +++ b/includes/powder.h @@ -25,7 +25,7 @@ #define UI_WALLSTART 222 #define UI_ACTUALSTART 122 -#define UI_WALLCOUNT 24 +#define UI_WALLCOUNT 25 #define WL_WALLELEC 122 #define WL_EWALL 123 @@ -50,6 +50,7 @@ #define SPC_WIND 241 #define SPC_PGRV 243 #define SPC_NGRV 244 +#define SPC_PROP 246 #define WL_ALLOWGAS 140 #define WL_GRAV 142 @@ -956,7 +957,7 @@ static wall_type wtypes[] = {PIXPACK(0x0000BB), PIXPACK(0x000000), -1, "Postive gravity tool."}, {PIXPACK(0x000099), PIXPACK(0x000000), -1, "Negative gravity tool."}, {PIXPACK(0xFFAA00), PIXPACK(0xAA5500), 4, "Energy wall, allows only energy type particles to pass"}, - + {PIXPACK(0xFFAA00), PIXPACK(0xAA5500), -1, "Property edit tool"}, }; #define CHANNELS ((int)(MAX_TEMP-73)/100+2) @@ -1003,6 +1004,8 @@ static void create_gain_photon(int pp); void kill_part(int i); +int flood_prop(int x, int y, size_t propoffset, void * propvalue, int proptype); + void detach(int i); void part_change_type(int i, int x, int y, int t); |