mirrors/hyperrogue
1
0
Fork 0
mirror of https://github.com/zenorogue/hyperrogue.git synced 2024-11-23 21:07:17 +00:00
Code Issues Releases Wiki Activity

handlePanning handled keys even if smooth_scrolling was on

Browse Source
This commit is contained in:
Zeno Rogue 2020-04-29 15:09:46 +02:00
parent bbdebb14ef
commit 52bd8f12f6
1 changed files with 14 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
control.cpp
View File

@ -388,18 +388,21 @@ EX void handlePanning(int sym, int uni) {
rug::using_rugview urv; rug::using_rugview urv;
#if !ISPANDORA #if !ISPANDORA
if(sym == SDLK_END) full_forward_camera(-0.2*shiftmul); if(!smooth_scrolling) {
if(sym == SDLK_HOME) full_forward_camera(0.2*shiftmul); if(sym == SDLK_END) full_forward_camera(-0.2*shiftmul);
if(sym == SDLK_RIGHT) full_rotate_camera(0, -0.2*shiftmul); if(sym == SDLK_HOME) full_forward_camera(0.2*shiftmul);
if(sym == SDLK_LEFT) full_rotate_camera(0, 0.2*shiftmul); if(sym == SDLK_RIGHT) full_rotate_camera(0, -0.2*shiftmul);
if(sym == SDLK_UP) full_rotate_camera(1, 0.2*shiftmul); if(sym == SDLK_LEFT) full_rotate_camera(0, 0.2*shiftmul);
if(sym == SDLK_DOWN) full_rotate_camera(1, -0.2*shiftmul); if(sym == SDLK_UP) full_rotate_camera(1, 0.2*shiftmul);
if(sym == SDLK_DOWN) full_rotate_camera(1, -0.2*shiftmul);
}
#endif #endif
if(sym == SDLK_PAGEUP) full_rotate_view(1, M_PI/cgi.S21/2*shiftmul); if(!smooth_scrolling) {
if(sym == SDLK_PAGEDOWN) full_rotate_view(-1, -M_PI/cgi.S21/2*shiftmul); if(sym == SDLK_PAGEUP) full_rotate_view(1, M_PI/cgi.S21/2*shiftmul);
if(sym == SDLK_PAGEDOWN) full_rotate_view(-1, -M_PI/cgi.S21/2*shiftmul);
if(sym == SDLK_PAGEUP || sym == SDLK_PAGEDOWN) if(sym == SDLK_PAGEUP || sym == SDLK_PAGEDOWN)
if(isGravityLand(cwt.at->land) && !rug::rug_control()) playermoved = false; if(isGravityLand(cwt.at->land) && !rug::rug_control()) playermoved = false;
}
if(sym == PSEUDOKEY_WHEELUP && GDIM == 2) { if(sym == PSEUDOKEY_WHEELUP && GDIM == 2) {
ld jx = (mousex - current_display->xcenter - .0) / current_display->radius / 10; ld jx = (mousex - current_display->xcenter - .0) / current_display->radius / 10;