From f4f6d2c02813a33bf9a5953a36927ba99fbe73eb Mon Sep 17 00:00:00 2001 From: Zeno Rogue Date: Sat, 1 Jun 2019 17:09:14 +0200 Subject: [PATCH] rogueviz:: highlighting correctly --- rogueviz.cpp | 1 + shmup.cpp | 11 ++++++----- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/rogueviz.cpp b/rogueviz.cpp index fa24f318..ed9de984 100644 --- a/rogueviz.cpp +++ b/rogueviz.cpp @@ -209,6 +209,7 @@ void createViz(int id, cell *c, transmatrix at) { vd.m->type = moRogueviz; vd.m->base = c; vd.m->at = at; + vd.m->isVirtual = false; } void notimpl() { diff --git a/shmup.cpp b/shmup.cpp index 2a432c2d..3437a290 100644 --- a/shmup.cpp +++ b/shmup.cpp @@ -3284,8 +3284,12 @@ void turn(int delta) { })) return; if(callhandlers(false, hooks_turn, delta)) return; - if(!shmup::on) return; - + + lmousetarget = NULL; + if(mousetarget && !mousetarget->isVirtual && intval(mouseh, mousetarget->pat*C0) < 0.1) + lmousetarget = mousetarget; + + if(!shmup::on) return; if(!(cmode & sm::NORMAL)) { #if CAP_RACING if(racing::on) { @@ -3299,9 +3303,6 @@ void turn(int delta) { timetowait = 0; passive_switch = (gold() & 1) ? moSwitch1 : moSwitch2; - lmousetarget = NULL; - if(mousetarget && !mousetarget->isVirtual && intval(mouseh, mousetarget->pat*C0) < 0.1) - lmousetarget = mousetarget; if(delta > 1000) delta = 1000;