speed-dreams/speed-dreams-code
speed-dreams/speed-dreams-code
7
1
Fork 3
Code Issues 9 Pull requests Projects Releases 1 Packages Wiki Activity Actions 5

492 - Allow HBOX use with DPAD

Browse source 
I've allowed the direct selection of 'N' and 'R' when HBOX is selected,
their use is not required (you can still use the XY shifting).

git-svn-id: https://svn.code.sf.net/p/speed-dreams/code/trunk@4035 30fe4595-0a0c-4342-8851-515496e4dcbd

Former-commit-id: a2bbc00e65e6287f4e89d984057b6650f68268c9
Former-commit-id: 38096becc3a8e0cb7358ef6f0a251373c3be7acf
This commit is contained in:
mungewell 2011-11-02 05:14:31 +00:00
parent ff2c030ac2
commit 3e8e3ba9fd
2 changed files with 22 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
src/drivers/human/human.cpp
View file

@ -1340,6 +1340,26 @@ drive_mt(int index, tCarElt* car, tSituation *s)
/* Extended 'N' area when using clutch to allow 'jumping' gears */
if (ay0 < 0.33 && ay0 > -0.33 && ax0 > -0.5 && ax0 < 0.5 && HCtx[idx]->autoClutch == 0)
car->_gearCmd = 0;
/* Neutral gear command */
if ((cmd[CMD_GEAR_N].type == GFCTRL_TYPE_JOY_BUT && joyInfo->edgeup[cmd[CMD_GEAR_N].val])
|| (cmd[CMD_GEAR_N].type == GFCTRL_TYPE_MOUSE_BUT && mouseInfo->edgeup[cmd[CMD_GEAR_N].val])
|| (cmd[CMD_GEAR_N].type == GFCTRL_TYPE_KEYBOARD && keyInfo[lookUpKeyMap(cmd[CMD_GEAR_N].val)].edgeUp)
|| (cmd[CMD_GEAR_N].type == GFCTRL_TYPE_JOY_ATOB && cmd[CMD_GEAR_N].deadZone == 1))
{
car->_gearCmd = 0;
}
/* Reverse gear command */
if ((cmd[CMD_GEAR_R].type == GFCTRL_TYPE_JOY_BUT && joyInfo->edgeup[cmd[CMD_GEAR_R].val])
|| (cmd[CMD_GEAR_R].type == GFCTRL_TYPE_MOUSE_BUT && mouseInfo->edgeup[cmd[CMD_GEAR_R].val])
|| (cmd[CMD_GEAR_R].type == GFCTRL_TYPE_KEYBOARD && keyInfo[lookUpKeyMap(cmd[CMD_GEAR_R].val)].edgeUp)
|| (cmd[CMD_GEAR_R].type == GFCTRL_TYPE_JOY_ATOB && cmd[CMD_GEAR_R].deadZone == 1))
{
/* Only allow Reverse to be selected at low speed (~40kmph) or from neutral */
if (car->_speed_x < 10 || car->_gear == 0)
car->_gearCmd = -1;
}
}
if (HCtx[idx]->autoClutch && car->_clutchCmd == 0.0f)

4
src/modules/userinterface/legacymenu/confscreens/controlconfig.cpp
View file

@ -95,8 +95,8 @@ static tCmdDispInfo CmdDispInfo[] = {
{ GEAR_MODE_AUTO | GEAR_MODE_SEQ | GEAR_MODE_GRID | GEAR_MODE_HBOX }, // ASR_CMD,
{ GEAR_MODE_AUTO | GEAR_MODE_SEQ | GEAR_MODE_GRID | GEAR_MODE_HBOX }, // SPDLIM_CMD
{ GEAR_MODE_AUTO | GEAR_MODE_SEQ | GEAR_MODE_GRID | GEAR_MODE_HBOX }, // LIGHT1_CMD
{ GEAR_MODE_AUTO | GEAR_MODE_SEQ | GEAR_MODE_GRID }, // GEAR_R,
{ GEAR_MODE_AUTO | GEAR_MODE_SEQ | GEAR_MODE_GRID }, // GEAR_N,
{ GEAR_MODE_AUTO | GEAR_MODE_SEQ | GEAR_MODE_GRID | GEAR_MODE_HBOX }, // GEAR_R,
{ GEAR_MODE_AUTO | GEAR_MODE_SEQ | GEAR_MODE_GRID | GEAR_MODE_HBOX }, // GEAR_N,
{ GEAR_MODE_AUTO | GEAR_MODE_SEQ }, // DN_SHFT,
{ GEAR_MODE_AUTO | GEAR_MODE_SEQ }, // UP_SHFT,
{ GEAR_MODE_GRID }, // GEAR_1,