Rtch/Lephisto
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[Change] Seems to make more sense to drag map with left OR right mouse button.

Browse Source
This commit is contained in:
Allanis 2013-03-21 01:11:59 +00:00
parent 339662e3c5
commit 0f6ff44a93
1 changed files with 15 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
src/map.c
View File

@ -220,34 +220,30 @@ static void map_mouse(SDL_Event* event, double mx, double my) {
switch(event->type) { switch(event->type) {
case SDL_MOUSEBUTTONDOWN: case SDL_MOUSEBUTTONDOWN:
// Selecting star system. // 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; x = systems_stack[i].pos.x * map_zoom;
y = systems_stack[i].pos.y * map_zoom; y = systems_stack[i].pos.y * map_zoom;
if((pow2(mx-x)+pow2(my-y)) < t) { if((pow2(mx-x)+pow2(my-y)) < t) {
map_selected = i; map_selected = i;
for(j = 0; j < cur_system->njumps; j++) for(j = 0; j < cur_system->njumps; j++) {
if(i == cur_system->jumps[j]) { if(i == cur_system->jumps[j]) {
planet_target = -1; // Override planet target. planet_target = -1; // Override planet_target.
hyperspace_target = j; hyperspace_target = j;
break; break;
}
} }
map_update(); map_update();
break; break;
} }
}
} }
// Start dragging. map_drag = 1;
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;
break; break;
case SDL_MOUSEBUTTONUP:
if(map_drag) map_drag = 0;
break;
case SDL_MOUSEMOTION: case SDL_MOUSEMOTION:
if(map_drag) { if(map_drag) {
// Axis is inverted. // Axis is inverted.