mirror of
https://github.com/zenorogue/hyperrogue.git
synced 2025-12-20 04:48:06 +00:00
getcshift changes are now handled uniformly
This commit is contained in:
11
control.cpp
11
control.cpp
@@ -950,9 +950,6 @@ EX void mainloopiter() {
|
|||||||
rctrlclick = keystate[SDL_SCANCODE_RCTRL];
|
rctrlclick = keystate[SDL_SCANCODE_RCTRL];
|
||||||
|
|
||||||
hiliteclick = keystate[SDL_SCANCODE_LALT] | keystate[SDL_SCANCODE_RALT];
|
hiliteclick = keystate[SDL_SCANCODE_LALT] | keystate[SDL_SCANCODE_RALT];
|
||||||
if(keystate[SDL_SCANCODE_LSHIFT] || keystate[SDL_SCANCODE_RSHIFT]) getcshift = -1;
|
|
||||||
if(keystate[SDL_SCANCODE_LCTRL] || keystate[SDL_SCANCODE_RCTRL]) getcshift /= 10;
|
|
||||||
if(keystate[SDL_SCANCODE_LALT] || keystate[SDL_SCANCODE_RALT]) getcshift *= 10;
|
|
||||||
|
|
||||||
#else
|
#else
|
||||||
pandora_rightclick = keystate[SDLK_RCTRL];
|
pandora_rightclick = keystate[SDLK_RCTRL];
|
||||||
@@ -965,15 +962,15 @@ EX void mainloopiter() {
|
|||||||
rctrlclick = keystate[SDLK_RCTRL];
|
rctrlclick = keystate[SDLK_RCTRL];
|
||||||
|
|
||||||
hiliteclick = keystate[SDLK_LALT] | keystate[SDLK_RALT];
|
hiliteclick = keystate[SDLK_LALT] | keystate[SDLK_RALT];
|
||||||
if(keystate[SDLK_LSHIFT] || keystate[SDLK_RSHIFT]) getcshift = -1;
|
|
||||||
if(keystate[SDLK_LCTRL] || keystate[SDLK_RCTRL]) getcshift /= 10;
|
|
||||||
if(keystate[SDLK_LALT] || keystate[SDLK_RALT]) getcshift *= 10;
|
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
anyshiftclick = lshiftclick | rshiftclick;
|
anyshiftclick = lshiftclick | rshiftclick;
|
||||||
anyctrlclick = lctrlclick | rctrlclick;
|
anyctrlclick = lctrlclick | rctrlclick;
|
||||||
|
|
||||||
|
if(anyshiftclick) getcshift = -1;
|
||||||
|
if(anyctrlclick) getcshift /= 10;
|
||||||
|
if(hiliteclick) getcshift *= 10;
|
||||||
|
|
||||||
forcetarget = anyshiftclick;
|
forcetarget = anyshiftclick;
|
||||||
|
|
||||||
didsomething = false;
|
didsomething = false;
|
||||||
|
|||||||
Reference in New Issue
Block a user