- Added extra states to dehsupp for the MBF additions.

SVN r1734 (trunk)
This commit is contained in:
Randy Heit 2009-07-23 06:25:47 +00:00
parent bc3448e958
commit 4134bc3c64
3 changed files with 45 additions and 5 deletions

View file

@ -1,6 +1,7 @@
July 22, 2009 July 22, 2009
- Added extra states to dehsupp for the MBF additions.
- Removed specific Button_Speed handling from the controllers' AddAxes() - Removed specific Button_Speed handling from the controllers' AddAxes()
methods. Analog axes now respond Button_Speed and cl_run in exactly the methods. Analog axes now respond to Button_Speed and cl_run in exactly the
same way as digital buttons do. same way as digital buttons do.
- Changed rounding slightly for analog axis -> integer in G_BuildTiccmd(). - Changed rounding slightly for analog axis -> integer in G_BuildTiccmd().
- Fixed: FXInputController::ProcessThumbstick() was slightly off when it - Fixed: FXInputController::ProcessThumbstick() was slightly off when it

View file

@ -608,19 +608,19 @@ void G_BuildTiccmd (ticcmd_t *cmd)
if (joyaxes[JOYAXIS_Pitch] != 0) if (joyaxes[JOYAXIS_Pitch] != 0)
{ {
G_AddViewPitch(int(joyaxes[JOYAXIS_Pitch] * 2048)); G_AddViewPitch(joyint(joyaxes[JOYAXIS_Pitch] * 2048));
LocalKeyboardTurner = true; LocalKeyboardTurner = true;
} }
if (joyaxes[JOYAXIS_Yaw] != 0) if (joyaxes[JOYAXIS_Yaw] != 0)
{ {
G_AddViewAngle(int(-1280 * joyaxes[JOYAXIS_Yaw])); G_AddViewAngle(joyint(-1280 * joyaxes[JOYAXIS_Yaw]));
LocalKeyboardTurner = true; LocalKeyboardTurner = true;
} }
side -= joyint(sidemove[speed] * joyaxes[JOYAXIS_Side]); side -= joyint(sidemove[speed] * joyaxes[JOYAXIS_Side]);
forward += joyint(joyaxes[JOYAXIS_Forward] * forwardmove[speed]); forward += joyint(joyaxes[JOYAXIS_Forward] * forwardmove[speed]);
fly += joyint(joyaxes[JOYAXIS_Up] * 2048); fly += joyint(joyaxes[JOYAXIS_Up] * 2048);
Printf("%d %d %.9f %.9f\n", forward, side, joyaxes[JOYAXIS_Forward], joyaxes[JOYAXIS_Side]);
// Handle mice. // Handle mice.
if (!Button_Mlook.bDown && !freelook) if (!Button_Mlook.bDown && !freelook)
{ {

View file

@ -143,7 +143,46 @@ ActionList
SpawnSound, SpawnFly, SpawnFly, SpawnFly, Fire, SpawnSound, SpawnFly, SpawnFly, SpawnFly, Fire,
Fire, Fire, Fire, Fire, Fire, Fire, Fire, Fire, Fire, Fire, Fire, Fire, Fire, Fire,
NULL, NULL, BrainExplode, NULL, NULL, NULL, NULL, NULL, NULL, BrainExplode, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, Scream, NULL, Explode NULL, NULL, NULL, Scream, NULL, Explode,
// 156 NULLs so we can get to MBF-specific entries
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL,
// Now, these are all new to MBF.
Die, Scream, Detonate, NULL, Look, Look,
Chase, Chase, Chase, Chase, Chase, Chase, Chase, Chase,
FaceTarget, FaceTarget, SargAttack, NULL, Pain, NULL, Scream,
NULL, Fall, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, BFGsound,
NULL/*FireOldBFG*/, NULL/*FireOldBFG*/, NULL/*FireOldBFG*/, NULL/*FireOldBFG*/, NULL/*FireOldBFG*/, NULL/*FireOldBFG*/, NULL/*FireOldBFG*/, NULL/*FireOldBFG*/,
NULL/*FireOldBFG*/, NULL/*FireOldBFG*/, NULL/*FireOldBFG*/, NULL/*FireOldBFG*/, NULL/*FireOldBFG*/, NULL/*FireOldBFG*/, NULL/*FireOldBFG*/, NULL/*FireOldBFG*/,
NULL/*FireOldBFG*/, NULL/*FireOldBFG*/, NULL/*FireOldBFG*/, NULL/*FireOldBFG*/, NULL/*FireOldBFG*/, NULL/*FireOldBFG*/, NULL/*FireOldBFG*/, NULL/*FireOldBFG*/,
NULL/*FireOldBFG*/, NULL/*FireOldBFG*/, NULL/*FireOldBFG*/, NULL/*FireOldBFG*/, NULL/*FireOldBFG*/, NULL/*FireOldBFG*/, NULL/*FireOldBFG*/, NULL/*FireOldBFG*/,
NULL/*FireOldBFG*/, NULL/*FireOldBFG*/, NULL/*FireOldBFG*/, NULL/*FireOldBFG*/, NULL/*FireOldBFG*/, NULL/*FireOldBFG*/, NULL/*FireOldBFG*/, NULL/*FireOldBFG*/,
Light0, ReFire, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL,
Look, Chase, Chase, Chase, CHase, FaceTarget,
NULL/*BetaSkullAttack*/, NULL, NULL, Pain, NULL,
NULL, NULL, NULL, NULL, Scream, NULL, Fall, Stop,
Mushroom
}; };
// DeHackEd made the erroneous assumption that if a state didn't appear in // DeHackEd made the erroneous assumption that if a state didn't appear in