mirrors/hyperrogue
1
0
Fork 0
mirror of https://github.com/zenorogue/hyperrogue.git synced 2025-12-22 13:42:01 +00:00
Code Issues Releases Wiki Activity

viewctr is no more... major reduction of redundancy/complexity

Browse Source
This commit is contained in:
Zeno Rogue
2019-11-14 00:26:50 +01:00
parent 74a139ca3e
commit ef9e2236ba
27 changed files with 102 additions and 270 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
control.cpp
View File

@@ -57,7 +57,7 @@ EX movedir mousedest;
EX ld shiftmul = 1;
EX cell *mouseover, *mouseover2, *lmouseover;
EX ld modist, modist2, centdist;
EX ld modist, modist2;
EX int lastt;
@@ -431,7 +431,7 @@ EX void handleKeyNormal(int sym, int uni) {
if(DEFAULTNOR(sym)) {
gmodekeys(sym, uni);
if(uni == 'm' && canmove && (centerover == cwt ? mouseover : centerover.at))
if(uni == 'm' && canmove && (centerover == cwt.at ? mouseover : centerover))
performMarkCommand(mouseover);
}
@@ -440,11 +440,12 @@ EX void handleKeyNormal(int sym, int uni) {
if((sym == SDLK_DELETE || sym == SDLK_KP_PERIOD || sym == 'g') && uni != 'G' && uni != 'G'-64)
movepcto(MD_DROP, 1);
if(sym == 't' && uni != 'T' && uni != 'T'-64 && canmove) {
cell *target = GDIM == 3 ? mouseover : centerover;
if(playermoved && items[itStrongWind]) {
cell *c = whirlwind::jumpDestination(cwt.at);
if(c) centerover.at = c;
if(c) target = c;
}
targetRangedOrb(GDIM == 3 ? mouseover : centerover.at, roKeyboard);
targetRangedOrb(target, roKeyboard);
sym = 0; uni = 0;
}
}