mirror of
https://github.com/DrBeef/Raze.git
synced 2024-11-16 17:31:27 +00:00
d3a3c74112
New Wii control defaults for the Wii Remote + Nunchuk and the Classic Controller. This includes new code added just so that the Home key brings up the menu in-game, reducing the need for a USB keyboard. On the technical side, raw joystick access (comparable to what is available for keyboard and mouse) is now present in jmact, on the game side. (added: joystick.[ch]) Using this new raw joystick access, I replaced tueidj's hack to map A and B to LMB/RMB and D-Pad Up/Down to the scrollwheel. I made the menus more friendly to mouse and joystick browsing by adding and unifying checks and clears for various buttons and gamefuncs. In fact, the majority of the time spent on this commit was tracking down problems that appeared with the factoring and trying to understand the menu system and the way input checks are precariously executed. In addition, "Press any key or button to continue" now truly means what it says. As a result of incorporating proper raw access into control.c instead of it directly accessing the implementaiton, the program *may* no longer be affected by joystick input when it is out of focus. This follows the pattern set by the mouse, and I think this is a positive change. A small bonus: In the classic/old keyboard preset, the key for Show_Console has been changed from '`' to 'C' because '`' is taken by Quick_Kick. git-svn-id: https://svn.eduke32.com/eduke32@2728 1a8010ca-5511-0410-912e-c29ae57300e0
102 lines
2.5 KiB
C
102 lines
2.5 KiB
C
/*
|
|
* joystick.c
|
|
* MACT library -to- Build Port Joystick Glue
|
|
*
|
|
* by Hendricks266
|
|
*
|
|
* We needed raw joystick access for the Wii port.
|
|
* We only had raw mouse and keyboard access.
|
|
* I made raw joystick access.
|
|
*
|
|
*/
|
|
//-------------------------------------------------------------------------
|
|
/*
|
|
Duke Nukem Copyright (C) 1996, 2003 3D Realms Entertainment
|
|
|
|
This file is part of Duke Nukem 3D version 1.5 - Atomic Edition
|
|
|
|
Duke Nukem 3D is free software; you can redistribute it and/or
|
|
modify it under the terms of the GNU General Public License
|
|
as published by the Free Software Foundation; either version 2
|
|
of the License, or (at your option) any later version.
|
|
|
|
This program is distributed in the hope that it will be useful,
|
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
|
|
|
|
See the GNU General Public License for more details.
|
|
|
|
You should have received a copy of the GNU General Public License
|
|
along with this program; if not, write to the Free Software
|
|
Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
|
|
*/
|
|
//-------------------------------------------------------------------------
|
|
|
|
#include "compat.h"
|
|
|
|
#include "joystick.h"
|
|
#include "baselayer.h"
|
|
|
|
int32_t JOYSTICK_GetButtons(void)
|
|
{
|
|
int32_t buttons;
|
|
|
|
readjoybstatus(&buttons);
|
|
|
|
return buttons;
|
|
}
|
|
int32_t JOYSTICK_ClearButton(int32_t b)
|
|
{
|
|
return (joyb &= ~b);
|
|
}
|
|
void JOYSTICK_ClearAllButtons(void)
|
|
{
|
|
joyb = 0;
|
|
}
|
|
|
|
int32_t JOYSTICK_GetHat(int32_t h)
|
|
{
|
|
if (h>=0 && h<joynumhats)
|
|
{
|
|
if (joyhat[h] == -1)
|
|
return (HAT_CENTERED);
|
|
else
|
|
{
|
|
static const int32_t hatstate[] = { HAT_UP, HAT_RIGHTUP, HAT_RIGHT, HAT_RIGHTDOWN, HAT_DOWN, HAT_LEFTDOWN, HAT_LEFT, HAT_LEFTUP };
|
|
int32_t val;
|
|
|
|
// thanks SDL for this much more sensible method
|
|
val = ((joyhat[0] + 4500 / 2) % 36000) / 4500;
|
|
if (val < 8)
|
|
return hatstate[val];
|
|
}
|
|
}
|
|
return 0;
|
|
}
|
|
void JOYSTICK_ClearHat(int32_t h)
|
|
{
|
|
if (h>=0 && h<joynumhats)
|
|
joyhat[h] = -1;
|
|
}
|
|
void JOYSTICK_ClearAllHats(void)
|
|
{
|
|
int32_t h;
|
|
for (h=0; h<joynumhats; ++h)
|
|
joyhat[h] = -1;
|
|
}
|
|
|
|
int32_t JOYSTICK_GetAxis(int32_t a)
|
|
{
|
|
return ((a>=0 && a<joynumaxes)?joyaxis[a]:0);
|
|
}
|
|
void JOYSTICK_ClearAxis(int32_t a)
|
|
{
|
|
if (a>=0 && a<joynumaxes)
|
|
joyaxis[a] = 0;
|
|
}
|
|
void JOYSTICK_ClearAllAxes(void)
|
|
{
|
|
int32_t a;
|
|
for (a=0; a<joynumaxes; ++a)
|
|
joyaxis[a] = 0;
|
|
}
|