From 0f6ff44a933706fdfba8915836669fdc2ca61a00 Mon Sep 17 00:00:00 2001 From: Allanis Date: Thu, 21 Mar 2013 01:11:59 +0000 Subject: [PATCH] [Change] Seems to make more sense to drag map with left OR right mouse button. --- src/map.c | 34 +++++++++++++++------------------- 1 file changed, 15 insertions(+), 19 deletions(-) diff --git a/src/map.c b/src/map.c index b90a91b..1d64c12 100644 --- a/src/map.c +++ b/src/map.c @@ -220,34 +220,30 @@ static void map_mouse(SDL_Event* event, double mx, double my) { switch(event->type) { case SDL_MOUSEBUTTONDOWN: // Selecting star system. - if(event->button.button == SDL_BUTTON_LEFT) { - for(i = 0; i < systems_nstack; i++) { + for(i = 0; i < systems_nstack; i++) { x = systems_stack[i].pos.x * map_zoom; y = systems_stack[i].pos.y * map_zoom; if((pow2(mx-x)+pow2(my-y)) < t) { - map_selected = i; - for(j = 0; j < cur_system->njumps; j++) - if(i == cur_system->jumps[j]) { - planet_target = -1; // Override planet target. - hyperspace_target = j; - break; + map_selected = i; + for(j = 0; j < cur_system->njumps; j++) { + if(i == cur_system->jumps[j]) { + planet_target = -1; // Override planet_target. + hyperspace_target = j; + break; + } } - map_update(); - break; + map_update(); + break; } - } } - // Start dragging. - else if(event->button.button == SDL_BUTTON_RIGHT) - map_drag = 1; - break; - - case SDL_MOUSEBUTTONUP: - if((event->button.button == SDL_BUTTON_RIGHT) && map_drag) - map_drag = 0; + map_drag = 1; break; + case SDL_MOUSEBUTTONUP: + if(map_drag) map_drag = 0; + break; + case SDL_MOUSEMOTION: if(map_drag) { // Axis is inverted.