diff options
| author | Simon Robertshaw <simon@Simons-Mac-Pro.local> | 2012-04-30 20:49:40 (GMT) |
|---|---|---|
| committer | Simon Robertshaw <simon@Simons-Mac-Pro.local> | 2012-04-30 20:49:40 (GMT) |
| commit | 211770e8189b426287adad3d924c20cac203fbd1 (patch) | |
| tree | 51b335ff8e73a4bbfb017a0de4dc7c2f68be05dd /includes | |
| parent | 8397b6e51aa817f2b33347bc801fdaee0b4d2700 (diff) | |
| parent | 433c1881bc37ea257999b88eee920c19a92798c5 (diff) | |
| download | powder-211770e8189b426287adad3d924c20cac203fbd1.zip powder-211770e8189b426287adad3d924c20cac203fbd1.tar.gz | |
Merge branch 'master' of github.com:FacialTurd/The-Powder-Toy
Diffstat (limited to 'includes')
| -rw-r--r-- | includes/defines.h | 4 | ||||
| -rw-r--r-- | includes/interface.h | 5 | ||||
| -rw-r--r-- | includes/powder.h | 2 |
3 files changed, 9 insertions, 2 deletions
diff --git a/includes/defines.h b/includes/defines.h index 74ac062..f5e5c8d 100644 --- a/includes/defines.h +++ b/includes/defines.h @@ -8,9 +8,9 @@ #endif //VersionInfoStart -#define SAVE_VERSION 76 +#define SAVE_VERSION 77 #define MINOR_VERSION 0 -#define BUILD_NUM 157 +#define BUILD_NUM 159 //VersionInfoEnd #define IDENT_VERSION "G" //Change this if you're not Simon! It should be a single letter diff --git a/includes/interface.h b/includes/interface.h index 57f75b6..858e289 100644 --- a/includes/interface.h +++ b/includes/interface.h @@ -340,5 +340,10 @@ void render_ui(pixel *vid_buf, int xcoord, int ycoord, int orientation); void simulation_ui(pixel *vid_buf); unsigned int decorations_ui(pixel *vid_buf, int *bsx, int *bsy, unsigned int savedColor); + +Uint8 mouse_get_state(int *x, int *y); + +void mouse_coords_window_to_sim(int *sim_x, int *sim_y, int window_x, int window_y); + #endif diff --git a/includes/powder.h b/includes/powder.h index ea6eb41..72d42eb 100644 --- a/includes/powder.h +++ b/includes/powder.h @@ -330,6 +330,8 @@ int graphics_DCEL(GRAPHICS_FUNC_ARGS); int graphics_GEL(GRAPHICS_FUNC_ARGS); int graphics_TRON(GRAPHICS_FUNC_ARGS); +void TRON_init_graphics(); + #define UPDATE_FUNC_ARGS int i, int x, int y, int surround_space, int nt // to call another update function with same arguments: #define UPDATE_FUNC_SUBCALL_ARGS i, x, y, surround_space, nt |