diff options
| author | Jacob1 <jfu614@gmail.com> | 2012-03-14 23:26:08 (GMT) |
|---|---|---|
| committer | Jacob1 <jfu614@gmail.com> | 2012-03-14 23:26:08 (GMT) |
| commit | 4f176ba7c39e31a3d98f969cc4bc4d50221085a3 (patch) | |
| tree | 5326215ea86d0e5b086da573074cdcc1e49e04fa /src | |
| parent | 08253244692bf81e96d74e185a7fe4fffdf88323 (diff) | |
| download | powder-4f176ba7c39e31a3d98f969cc4bc4d50221085a3.zip powder-4f176ba7c39e31a3d98f969cc4bc4d50221085a3.tar.gz | |
cursor changes to correct shape as soon as you click element/wall
Diffstat (limited to 'src')
| -rw-r--r-- | src/graphics.c | 4 | ||||
| -rw-r--r-- | src/interface.c | 6 | ||||
| -rw-r--r-- | src/main.c | 2 |
3 files changed, 6 insertions, 6 deletions
diff --git a/src/graphics.c b/src/graphics.c index 754b8de..bff4f08 100644 --- a/src/graphics.c +++ b/src/graphics.c @@ -3614,7 +3614,7 @@ void render_cursor(pixel *vid, int x, int y, int t, int rx, int ry) { #ifdef OGLR int i; - if (t<PT_NUM||(t&0xFF)==PT_LIFE||t==SPC_AIR||t==SPC_HEAT||t==SPC_COOL||t==SPC_VACUUM||t==SPC_WIND||t==SPC_PGRV||t==SPC_NGRV) + if (t<PT_NUM||(t&0xFF)==PT_LIFE||t==SPC_AIR||t==SPC_HEAT||t==SPC_COOL||t==SPC_VACUUM||t==SPC_WIND||t==SPC_PGRV||t==SPC_NGRV||t==SPC_PROP) { glBindFramebuffer(GL_DRAW_FRAMEBUFFER, partsFbo); glEnable(GL_COLOR_LOGIC_OP); @@ -3654,7 +3654,7 @@ void render_cursor(pixel *vid, int x, int y, int t, int rx, int ry) } #else int i,j,c; - if (t<PT_NUM||(t&0xFF)==PT_LIFE||t==SPC_AIR||t==SPC_HEAT||t==SPC_COOL||t==SPC_VACUUM||t==SPC_WIND||t==SPC_PGRV||t==SPC_NGRV) + if (t<PT_NUM||(t&0xFF)==PT_LIFE||t==SPC_AIR||t==SPC_HEAT||t==SPC_COOL||t==SPC_VACUUM||t==SPC_WIND||t==SPC_PGRV||t==SPC_NGRV||t==SPC_PROP) { if (rx<=0) for (j = y - ry; j <= y + ry; j++) diff --git a/src/interface.c b/src/interface.c index 364fc00..4badd0c 100644 --- a/src/interface.c +++ b/src/interface.c @@ -2219,7 +2219,7 @@ void menu_ui(pixel *vid_buf, int i, int *sl, int *sr) } */ //current menu function -void menu_ui_v3(pixel *vid_buf, int i, int *sl, int *sr, int *dae, int b, int bq, int mx, int my) +void menu_ui_v3(pixel *vid_buf, int i, int *sl, int *sr, int *su, int *dae, int b, int bq, int mx, int my) { int h,x,y,n=0,height,width,sy,rows=0,xoff=0,fwidth; SEC = SEC2; @@ -2458,7 +2458,7 @@ void menu_ui_v3(pixel *vid_buf, int i, int *sl, int *sr, int *dae, int b, int bq SEC2 = -1; } else { - *sl = h; + *sl = *su = h; *dae = 51; } } @@ -2478,7 +2478,7 @@ void menu_ui_v3(pixel *vid_buf, int i, int *sl, int *sr, int *dae, int b, int bq SEC2 = -1; } else { - *sr = h; + *sr = *su = h; *dae = 51; } } @@ -1761,7 +1761,7 @@ int main(int argc, char *argv[]) active_menu = i; } } - menu_ui_v3(vid_buf, active_menu, &sl, &sr, &dae, b, bq, x, y); //draw the elements in the current menu + menu_ui_v3(vid_buf, active_menu, &sl, &sr, &su, &dae, b, bq, x, y); //draw the elements in the current menu if (zoom_en && x>=sdl_scale*zoom_wx && y>=sdl_scale*zoom_wy //change mouse position while it is in a zoom window && x<sdl_scale*(zoom_wx+ZFACTOR*ZSIZE) && y<sdl_scale*(zoom_wy+ZFACTOR*ZSIZE)) |