summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorPhilip <philip@philip-linuxlaptop.(none)>2010-11-03 01:39:06 (GMT)
committer Philip <philip@philip-linuxlaptop.(none)>2010-11-03 01:39:06 (GMT)
commit6c747bb3501e1e52d83dfa3979975f41f38d1c7c (patch)
tree878d4106077aca5e0e48c706b823cfbaaf81c90a /src
parent4e46f51bcf8d47fec91e80ededb618b5e220a516 (diff)
downloadpowder-6c747bb3501e1e52d83dfa3979975f41f38d1c7c.zip
powder-6c747bb3501e1e52d83dfa3979975f41f38d1c7c.tar.gz
Fix for ctrl-shift-alt click crash incase someone did it for some reason.
Diffstat (limited to 'src')
-rw-r--r--src/main.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/main.c b/src/main.c
index 59d2600..bf320cc 100644
--- a/src/main.c
+++ b/src/main.c
@@ -1848,7 +1848,7 @@ int main(int argc, char *argv[])
lb = b;
lm = 2;
}
- else if((sdl_mod & (KMOD_LCTRL|KMOD_RCTRL)) && (sdl_mod & (KMOD_LSHIFT|KMOD_RSHIFT)))
+ else if((sdl_mod & (KMOD_LCTRL|KMOD_RCTRL)) && (sdl_mod & (KMOD_LSHIFT|KMOD_RSHIFT)) && !sdl_mod & (KMOD_LALT))
{
if(c!=125&&c!=SPC_AIR&&c!=SPC_HEAT&&c!=SPC_COOL&&c!=SPC_VACUUM)
flood_parts(x, y, c, -1, -1);
@@ -1857,7 +1857,7 @@ int main(int argc, char *argv[])
lb = 0;
lm = 0;
}
- else if(((sdl_mod & (KMOD_LALT||KMOD_RALT)) && !sdl_mod & (KMOD_LALT)) || b==SDL_BUTTON_MIDDLE)
+ else if(((sdl_mod & (KMOD_LALT||KMOD_RALT)) && !sdl_mod & (KMOD_SHIFT)) || b==SDL_BUTTON_MIDDLE)
{
if(y>0 && y<sdl_scale*YRES && x>0 && x<sdl_scale*XRES)
{