diff options
| author | Simon <simon@hardwired.org.uk> | 2011-02-21 16:10:05 (GMT) |
|---|---|---|
| committer | Simon <simon@hardwired.org.uk> | 2011-02-21 16:10:05 (GMT) |
| commit | 064579c9e42ef8743ac6c3b08e4250c118fbef3a (patch) | |
| tree | 025c2a323465ef6c747b42ba48ae488ce1645b83 /src/interface.c | |
| parent | 9002a87d6128927e14f88cb09ff241b004cb0bf8 (diff) | |
| parent | 6f2965d0d069e8586d9ca32d042ee6dd094cb0f0 (diff) | |
| download | powder-064579c9e42ef8743ac6c3b08e4250c118fbef3a.zip powder-064579c9e42ef8743ac6c3b08e4250c118fbef3a.tar.gz | |
Merge branch 'master' of github.com:FacialTurd/The-Powder-Toy
Diffstat (limited to 'src/interface.c')
| -rw-r--r-- | src/interface.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/src/interface.c b/src/interface.c index 703ac06..2aef363 100644 --- a/src/interface.c +++ b/src/interface.c @@ -60,8 +60,6 @@ char search_expr[256] = ""; char *tag_names[TAG_MAX]; int tag_votes[TAG_MAX]; -int Z_keysym = 'z'; - int zoom_en = 0; int zoom_x=(XRES-ZSIZE_D)/2, zoom_y=(YRES-ZSIZE_D)/2; int zoom_wx=0, zoom_wy=0; @@ -1763,10 +1761,9 @@ int sdl_poll(void) sdl_ascii=event.key.keysym.unicode; if (event.key.keysym.sym == SDLK_CAPSLOCK) sdl_caps = 1; - if (event.key.keysym.unicode=='z' || event.key.keysym.unicode=='Z') + if (event.key.keysym.sym=='z') { sdl_zoom_trig = 1; - Z_keysym = event.key.keysym.sym; } if ( event.key.keysym.sym == SDLK_PLUS) { @@ -1816,7 +1813,7 @@ int sdl_poll(void) case SDL_KEYUP: if (event.key.keysym.sym == SDLK_CAPSLOCK) sdl_caps = 0; - if (event.key.keysym.sym == Z_keysym) + if (event.key.keysym.sym == 'z') sdl_zoom_trig = 0; if (event.key.keysym.sym == SDLK_RIGHT || event.key.keysym.sym == SDLK_LEFT) { @@ -3953,6 +3950,7 @@ char *console_ui(pixel *vid_buf,char error[255]) { //TODO: error messages, show } } } + console_mode = 0; return NULL; } |