1
0
mirror of https://github.com/zenorogue/hyperrogue.git synced 2024-12-24 17:10:36 +00:00

click the wind icon to go; clicking the Inventory and Wind icons work in Android

This commit is contained in:
Zeno Rogue 2017-10-17 20:59:27 +02:00
parent 3bee24d3e2
commit f94bb344d5
3 changed files with 24 additions and 2 deletions

View File

@ -110,7 +110,9 @@ int main(int argc, char **argv) {
int mx = 0; int my = 0; bool _clicked = false; int mx = 0; int my = 0; bool _clicked = false;
inv::on = true;
firstland = laMinefield; firstland = laMinefield;
activateSafety(laWhirlwind);
items[itGreenStone] = 100; items[itGreenStone] = 100;
items[itDiamond] = 50; items[itDiamond] = 50;

View File

@ -260,6 +260,10 @@ void displayglyph2(int cx, int cy, int buttonsize, int i) {
mouseovers += XLAT(" (click to drop)"); mouseovers += XLAT(" (click to drop)");
getcstat = 'g'; getcstat = 'g';
} }
if(it == itStrongWind) {
mouseovers += XLAT(" (click to use)");
getcstat = 't';
}
if(it == itInventory) { if(it == itInventory) {
mouseovers += XLAT(" (click to use)"); mouseovers += XLAT(" (click to use)");
getcstat = 'i'; getcstat = 'i';

View File

@ -520,13 +520,29 @@ void handleclick(MOBPAR_FORMAL) {
} }
if(buttonclicked || mouseout()) { if(buttonclicked || mouseout()) {
bool statkeys = andmode == 0 && !shmup::on && size(screens) == 1;
if(andmode == 0 && getcstat == 'g' && !shmup::on && size(screens) == 1) { if(statkeys && getcstat == 'g') {
movepcto(MD_DROP); movepcto(MD_DROP);
getcstat = 0; getcstat = 0;
} }
else if(getcstat != SDLK_F1) { else if(statkeys && getcstat == 'i') {
if(inv::on) pushScreen(inv::show);
getcstat = 0;
}
else if(statkeys && getcstat == 't') {
if(playermoved && items[itStrongWind]) {
cell *c = whirlwind::jumpDestination(cwt.c);
if(c) centerover = c;
}
targetRangedOrb(centerover, roKeyboard);
getcstat = 0;
}
else if(getcstat != SDLK_F1 && getcstat != 'i' && getcstat != 't') {
int px = mousex < vid.xcenter ? 0 : 1; int px = mousex < vid.xcenter ? 0 : 1;
int py = mousey < vid.ycenter ? 0 : 1; int py = mousey < vid.ycenter ? 0 : 1;