mirrors/hyperrogue
1
0
Fork 0
mirror of https://github.com/zenorogue/hyperrogue.git synced 2025-01-23 15:36:59 +00:00
Code Issues Releases Wiki Activity

rug::mouse_control_rug flag

Browse Source
This commit is contained in:
Zeno Rogue 2020-09-15 19:12:54 +02:00
parent 40b91f6d36
commit a215ab462a
2 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
control.cpp
View File

@ -623,6 +623,11 @@ int lastframe;
EX int sc_ticks; EX int sc_ticks;
EX bool mouseaiming(bool shmupon) {
return
(GDIM == 3 && !shmupon) || (rug::rugged && (lctrlclick ^ rug::mouse_control_rug));
}
EX void mainloopiter() { EX void mainloopiter() {
DEBB(DF_GRAPH, ("main loop\n")); DEBB(DF_GRAPH, ("main loop\n"));
@ -659,7 +664,7 @@ EX void mainloopiter() {
mousepan = cmode & sm::NORMAL; mousepan = cmode & sm::NORMAL;
if((cmode & (sm::DRAW | sm::MAP)) && !hiliteclick) mousepan = true; if((cmode & (sm::DRAW | sm::MAP)) && !hiliteclick) mousepan = true;
mousepan = mousepan && (GDIM == 3 || (rug::rugged && lctrlclick)) && mouseaim_sensitivity; mousepan = mousepan && mouseaiming(false) && mouseaim_sensitivity;
if(mousepan != oldmousepan) { if(mousepan != oldmousepan) {
oldmousepan = mousepan; oldmousepan = mousepan;
#if CAP_MOUSEGRAB #if CAP_MOUSEGRAB
@ -748,7 +753,7 @@ EX void mainloopiter() {
SDL_Event ev; SDL_Event ev;
DEBB(DF_GRAPH, ("polling for events\n")); DEBB(DF_GRAPH, ("polling for events\n"));
if((GDIM == 3 && !shmup::on) || (lctrlclick && rug::rugged)) { if(mouseaiming(shmup::on)) {
#if CAP_MOUSEGRAB #if CAP_MOUSEGRAB
rug::using_rugview urv; rug::using_rugview urv;
dynamicval<bool> ds(didsomething, didsomething); dynamicval<bool> ds(didsomething, didsomething);

2
rug.cpp
View File

@ -19,6 +19,8 @@ EX bool rug_failure = false;
EX namespace rug { EX namespace rug {
EX bool mouse_control_rug = false;
EX transmatrix rugView; EX transmatrix rugView;
EX ld lwidth = 2; EX ld lwidth = 2;