Framehold: Add corresponding hotkeys and fix spurious autohold signal
This commit is contained in:
parent
622e9fde75
commit
d5187c8c85
2 changed files with 6 additions and 1 deletions
|
@ -222,6 +222,12 @@ namespace
|
||||||
our_commands.insert(new button_action(x.str(), j, k, y.str()));
|
our_commands.insert(new button_action(x.str(), j, k, y.str()));
|
||||||
if(j == 0)
|
if(j == 0)
|
||||||
our_icommands.insert(new inverse_key(x.str(), expx.str()));
|
our_icommands.insert(new inverse_key(x.str(), expx.str()));
|
||||||
|
if(j == 2)
|
||||||
|
our_icommands.insert(new inverse_key(x.str(), expx.str() +
|
||||||
|
" (hold)"));
|
||||||
|
if(j == 3)
|
||||||
|
our_icommands.insert(new inverse_key(x.str(), expx.str() +
|
||||||
|
" (typed)"));
|
||||||
}
|
}
|
||||||
for(unsigned k = 0; k < 8; ++k) {
|
for(unsigned k = 0; k < 8; ++k) {
|
||||||
stringfmt x, expx;
|
stringfmt x, expx;
|
||||||
|
|
|
@ -854,7 +854,6 @@ void controller_state::reset_framehold() throw()
|
||||||
void controller_state::framehold(unsigned pcid, unsigned pbid, bool newstate) throw()
|
void controller_state::framehold(unsigned pcid, unsigned pbid, bool newstate) throw()
|
||||||
{
|
{
|
||||||
_framehold.axis(pcid, pbid, newstate ? 1 : 0);
|
_framehold.axis(pcid, pbid, newstate ? 1 : 0);
|
||||||
information_dispatch::do_autohold_update(pcid, pbid, newstate);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
bool controller_state::framehold(unsigned pcid, unsigned pbid) throw()
|
bool controller_state::framehold(unsigned pcid, unsigned pbid) throw()
|
||||||
|
|
Loading…
Add table
Reference in a new issue