mirror of
https://github.com/DrBeef/Raze.git
synced 2024-11-16 09:21:12 +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
60 lines
2.1 KiB
C
60 lines
2.1 KiB
C
//-------------------------------------------------------------------------
|
|
/*
|
|
Copyright (C) 2010 EDuke32 developers and contributors
|
|
|
|
This file is part of EDuke32.
|
|
|
|
EDuke32 is free software; you can redistribute it and/or
|
|
modify it under the terms of the GNU General Public License version 2
|
|
as published by the Free Software Foundation.
|
|
|
|
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.
|
|
*/
|
|
//-------------------------------------------------------------------------
|
|
|
|
#ifndef __input_h__
|
|
#define __input_h__
|
|
|
|
extern int32_t I_CheckAllInput(void);
|
|
extern void I_ClearAllInput(void);
|
|
|
|
extern int32_t I_CheckInputWaiting(void);
|
|
extern int32_t I_ClearInputWaiting(void);
|
|
|
|
// Advance = Selecting a menu option || Saying "Yes" || Going forward in Help/Credits
|
|
// Return = Closing a sub-menu || Saying "No"
|
|
// Escape = Opening the menu in-game (should not be any gamefuncs)
|
|
|
|
// Joysticks have separate functions to avoid spamming duplicated "ifdef GEKKO" everywhere.
|
|
extern int32_t I_JoystickAdvanceTrigger(void);
|
|
extern int32_t I_JoystickAdvanceTriggerClear(void);
|
|
extern int32_t I_JoystickReturnTrigger(void);
|
|
extern int32_t I_JoystickReturnTriggerClear(void);
|
|
extern int32_t I_JoystickEscapeTrigger(void);
|
|
extern int32_t I_JoystickEscapeTriggerClear(void);
|
|
|
|
extern int32_t I_AdvanceTrigger(void);
|
|
extern int32_t I_AdvanceTriggerClear(void);
|
|
extern int32_t I_ReturnTrigger(void);
|
|
extern int32_t I_ReturnTriggerClear(void);
|
|
extern int32_t I_EscapeTrigger(void);
|
|
extern int32_t I_EscapeTriggerClear(void);
|
|
|
|
extern int32_t I_PanelUp(void);
|
|
extern int32_t I_PanelUpClear(void);
|
|
|
|
extern int32_t I_PanelDown(void);
|
|
extern int32_t I_PanelDownClear(void);
|
|
|
|
extern char inputloc;
|
|
extern int32_t _EnterText(int32_t small,int32_t x,int32_t y,char *t,int32_t dalen,int32_t c);
|
|
|
|
#endif
|